diff --git a/Manifest.files.gz b/Manifest.files.gz
index b0aa61b02ee8..f754d4d7182e 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 936082c2b7a0..04b11764166a 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/openntpd/metadata.xml b/acct-group/openntpd/metadata.xml
index 4fb2c3dd4699..9c1fc34df050 100644
--- a/acct-group/openntpd/metadata.xml
+++ b/acct-group/openntpd/metadata.xml
@@ -5,10 +5,6 @@
henson@acm.org
Paul B. Henson
-
- junghans@gentoo.org
- Christoph Junghans (proxy)
-
proxy-maint@gentoo.org
Proxy Maintainers
diff --git a/acct-group/sabnzbd/Manifest b/acct-group/sabnzbd/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/gnome-extra/nautilus-actions/metadata.xml b/acct-group/sabnzbd/metadata.xml
similarity index 55%
rename from gnome-extra/nautilus-actions/metadata.xml
rename to acct-group/sabnzbd/metadata.xml
index 39980802b1da..a32d600f949d 100644
--- a/gnome-extra/nautilus-actions/metadata.xml
+++ b/acct-group/sabnzbd/metadata.xml
@@ -1,8 +1,8 @@
-
- gnome@gentoo.org
- Gentoo GNOME Desktop
-
+
+ whissi@gentoo.org
+ Thomas Deutschmann
+
diff --git a/acct-group/sabnzbd/sabnzbd-0.ebuild b/acct-group/sabnzbd/sabnzbd-0.ebuild
new file mode 100644
index 000000000000..4f1a3726241b
--- /dev/null
+++ b/acct-group/sabnzbd/sabnzbd-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="SABnzbd program group"
+
+ACCT_GROUP_ID=397
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 27080a32931b..7fed0fd65de6 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/openntpd/metadata.xml b/acct-user/openntpd/metadata.xml
index 4fb2c3dd4699..9c1fc34df050 100644
--- a/acct-user/openntpd/metadata.xml
+++ b/acct-user/openntpd/metadata.xml
@@ -5,10 +5,6 @@
henson@acm.org
Paul B. Henson
-
- junghans@gentoo.org
- Christoph Junghans (proxy)
-
proxy-maint@gentoo.org
Proxy Maintainers
diff --git a/acct-user/sabnzbd/Manifest b/acct-user/sabnzbd/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/net-misc/ipx-utils/metadata.xml b/acct-user/sabnzbd/metadata.xml
similarity index 55%
rename from net-misc/ipx-utils/metadata.xml
rename to acct-user/sabnzbd/metadata.xml
index 6f49eba8f496..a32d600f949d 100644
--- a/net-misc/ipx-utils/metadata.xml
+++ b/acct-user/sabnzbd/metadata.xml
@@ -1,5 +1,8 @@
-
+
+ whissi@gentoo.org
+ Thomas Deutschmann
+
diff --git a/acct-user/sabnzbd/sabnzbd-0.ebuild b/acct-user/sabnzbd/sabnzbd-0.ebuild
new file mode 100644
index 000000000000..ee5b6e7c09f5
--- /dev/null
+++ b/acct-user/sabnzbd/sabnzbd-0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="SABnzbd program user"
+
+ACCT_USER_ID=397
+ACCT_USER_HOME="/var/lib/${PN}"
+ACCT_USER_HOME_PERMS=0770
+ACCT_USER_GROUPS=( sabnzbd )
+
+acct-user_add_deps
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 648bca8a0334..256bb6871786 100644
Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ
diff --git a/app-accessibility/caribou/caribou-0.4.21-r1.ebuild b/app-accessibility/caribou/caribou-0.4.21-r1.ebuild
index a6ab60c8d630..cb451983b1c1 100644
--- a/app-accessibility/caribou/caribou-0.4.21-r1.ebuild
+++ b/app-accessibility/caribou/caribou-0.4.21-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Caribou"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 4221ca3f15ef..f42a0c30f0e1 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest
index fb28fcb43e1a..61cb79594261 100644
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@@ -34,6 +34,7 @@ DIST filebeat-7.3.2.tar.gz 49977990 BLAKE2B 6219a382b415572fdea2ff4b0aa3f02b3c1e
DIST filebeat-7.5.2.tar.gz 64360149 BLAKE2B 2bcbe19b9354c7039c652e6edd4b2cac688b136188f55caaf070dc9d60bd775eb2f0a4016725bf48baa5d26a056f74226d6bec09d1909fcbaf36ad2703d06f2e SHA512 8911e05b489e07f4ec6ee6397e916186ad618bfe97c43c509d564a828a1938eeea6c57cf66f2e93216b5d6b3958e0450d3aab24b65ef7209f0040f66ee36e74a
DIST filebeat-7.6.1.tar.gz 77795975 BLAKE2B 2ca420b339b96baefff5042dba456fe1086dfdc5ccc1503609ff1989d79952709347662be60b18591e2b1a9f6557bfb942429b9aa6412dc02072331c8918c95c SHA512 c4f8daff002fe393b95f00b47df1ecb5566a69a9345bbbe1caceffecd8d413e3e9886f30cd4f2914579526db3de92c036c78fb37d703d447567fe921275b5fac
DIST filebeat-7.7.0.tar.gz 90104462 BLAKE2B d044ec00bcae08745d012e49fc3cf9369b201da68ee2bfca2ce7f91ecd74c78e7c48d2045e539b6752c164e4c3f6cba38a00f1ee7a82493e008f6be49581b5d5 SHA512 1e0c7cc77b90cb3764d62db23a5a66ac3214c97a2f305c46f568ccc91a21f247c9e42c91a0771c9fc7500f6d0769e3d224b81a2c76399fd2bc6edd5afa1cb367
+DIST filebeat-7.8.0.tar.gz 95390157 BLAKE2B 47f321e4515a0b6346c210eafc5dfe21e9c5d6ba896e19d1fa73758822a6c5a2d029030ce8a2f81d1516bc884167f77ceb671d78f991e3c055444c7417e0819b SHA512 a17b39b590d6bc7e23b74a63f4cc3dcb5defe26dbe1af1cc5dc007bcfc5b316a6b562889be572d2f9f0669db19e58b8920e06faad3c1280a8c0045481776afc1
DIST github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.mod 372 BLAKE2B 80a7e0aac984acb79239b3309290cd8ef1eeca8d9f53b3c91628cbe6dd112706d2313c47e33ac52ea9e8a6417289dacae8e2e72a03e679836d3ed89cb86c0aee SHA512 6db1a52bbab1332ab7e761532cb110394afa1dd69cc5f7443c3fb733c7d95fa712cf6bf8a78fc3f51d89b2d368a248e532bab06bc93e2e663b8f836c91aef0de
DIST github.com%2F!azure%2Fazure-amqp-common-go%2Fv3%2F@v%2Fv3.0.0.zip 29788 BLAKE2B c1e493471bca24ac64c8119e624ea077a74678a492b036deb907ede12b5e93c3ef699820cb2ec9468a98d00e83d84c6bb45cf274b4812a0f319a0248610a4d2c SHA512 a412fbe597ab0c47223d733303ed2277656fe35866f52e4ed1f25cc03b691f15f5592cb07b3c5fb39d4cb98c6d73dbc8e1e7869cea17241a33dfc29db0a1d121
DIST github.com%2F!azure%2Fazure-event-hubs-go%2Fv3%2F@v%2Fv3.1.2.mod 916 BLAKE2B eda68c483b29b920a2a3efafcf5b36b7d4f1c01bc5f55fefafc3ff9805cbf62a9a83a9d8f870319776a53f55d21efd52de8174ecb45c1c648e65d5e187be21fa SHA512 6fd1c6d13559028e1fac3c9cd3de1a914e5cd0607519de8b71e622b187168c377dc8bcc3de87c4905f0a7ed846b123885fc2dd9b8a4a6d9a49f7781a61ef53bb
@@ -105,6 +106,7 @@ DIST github.com%2Faerospike%2Faerospike-client-go%2F@v%2Fv1.27.1-0.2017061217410
DIST github.com%2Faerospike%2Faerospike-client-go%2F@v%2Fv1.27.1-0.20170612174108-0f3b54da6bdc.zip 405931 BLAKE2B 462e19a9ef38bce32dadaef71455a82e5cb9bc314228816eb9a0abf2425bd0d450ac2aa152bc57b38aa79d76f0af46790c677043aaca66bbcba02f71d9c782f1 SHA512 adb130c27400012529b74ec93e7d615458eb2df28e9c7507eb6f05969288674a59b5d07edbb51729d304a8016e8054709a16d2663eff4c582f4c05d9ec50a623
DIST github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.mod 39 BLAKE2B 040b84d78188cff54576ac29dc39bcb557c56bcbcdbf6767a3321163859ae29dddca6e8b3294490238eaca9da7281e6b48ebcc6045a38c5f31795d0a831103f1 SHA512 4d33264b51c07e85a857699f5dc7b1b8a45cf1a330d8bc333525cd22513c4aaa9ddb44530e2f3e47192b21c72ddbffe465c31672a4bb441b863d90020a631a4e
DIST github.com%2Fakavel%2Frsrc%2F@v%2Fv0.8.0.zip 15095 BLAKE2B 94141df8d22f3961f193f9c107624666dee96f267a7e0c5bbbe70426433ed86dd9a617184e5ee31e668aed94f5f011a6529ec9a45b065a86bba84c2e81ce5490 SHA512 4b7371bb63b8b32da05ff5c5c2aa6e584f9c406164177b5ccad8165b8f3a4972683a4c0756bdb591d28f6b61f22784a391f443503fc3d8e108f92b8c4b6ce0be
+DIST github.com%2Falcortesm%2Ftgz%2F@v%2Fv0.0.0-20161220082320-9c5fe88206d7.mod 32 BLAKE2B 9bf3bf45ceb1891fcb6ecbd977b3968e249d293377508fc645c3fac44f8ebfa0e6aac924836fadc02888ac771c7d641472c2022a31f3c3b068ba94b0dc0e27cb SHA512 678d2ba568fcff09b59e5110b204af334fa1a8357e14194b88d67bc982d4eb3d9c26000fb6f2d51e2a2ce2424681c7ff203b98a5cd3d0fdcb32145a5f05b49e6
DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
@@ -113,7 +115,12 @@ DIST github.com%2Fandrewkroh%2Fgoja%2F@v%2Fv0.0.0-20190128172624-dd2ac4456e20.mo
DIST github.com%2Fandrewkroh%2Fgoja%2F@v%2Fv0.0.0-20190128172624-dd2ac4456e20.zip 210208 BLAKE2B 9dd3f1a962f3216de6aabe6aa39f74cb817454344918afab9c01c9a0ead3f5721dfbe787ee4b65a7080f2adf0cb9cd82bd688de529fe0708600dc34a71f8480f SHA512 2db3f933081369e6273660658dba52a9e374feb0c0bf8a2052915a76875ade611cc146dff4255e8ecbb55f5982a3fa8a1eb601784dfcc816c86bda590340f328
DIST github.com%2Fandrewkroh%2Fsys%2F@v%2Fv0.0.0-20151128191922-287798fe3e43.mod 33 BLAKE2B 70b2db5f3e0c688d0365d6e7d53e7fbbcc3a2d79975554baa7b9b32690702ae6c2445999cdf2b7a3f0b833169a3812c4b8096f02795f935c81b8f964f4e34361 SHA512 ea84f042de76554155eb9ffd145c2a631c5b1cc2ada0bf13ec0441a1a78d9fd7a10f17d5d4c5b42a9a118d7dbe4212da3405ea07a3dbfef841ebc41dbabf5389
DIST github.com%2Fandrewkroh%2Fsys%2F@v%2Fv0.0.0-20151128191922-287798fe3e43.zip 787949 BLAKE2B b3538ab585c5be437f5e4f20bc632b3d89e2a52b9d6aa3a8252518f8089a6d7ccfef00884b28a53ba39b9e058c3d5e35a731d29681b693431e0f86c2076120c4 SHA512 7b2ae93cd883fdd716aa7eeda35df51d624da4c0f06036b48d9e2afe4f6e1e48b0ed60c85d3c6c0350b8d3844ab9357be41c13ef08b052a8018c61cbbf5db145
+DIST github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.mod 35 BLAKE2B f41c90b71b4b9e1876a13df9703b57f52ec6d7fd4258a7c44bca15c12310b512e400b32715180bfbe4726887aa7284fa21832ca9f9eb1dd759ee7d0c627307ac SHA512 5a93ead508f4f5e229e5d0e59dc820840819d9b32158ddecf2d6dae7ee96ce92af6bd80d18a98e437cbdda5de6df6cac03f7b535017fa92ef868dcccbc6e1f27
DIST github.com%2Fantihax%2Foptional%2F@v%2Fv0.0.0-20180407024304-ca021399b1a6.mod 35 BLAKE2B 42febcb2e06c46797f14a850943d1df3c0e15630f376b8f1c860cf4e26ae4e2acbb38947f1348f501665f719943510aa2c0ad091f336e635430408794e61feed SHA512 c3d0bc6de3cac8395d0a231f041437b4caf00a4678270ae447b2e76bba3a588a6913cc1df6ba438bf6dd361b48860c365e9d32af55575208bd0f4b705b0504f6
+DIST github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20200326173327-a4c66dc863bb.mod 31 BLAKE2B 8ba7e45848280b2365b9c8fafcffd70ac32c1c22bca0d2bccb965b98f1aba961faba0824e33941ba06e7330a7e89d6804860ce16e0c0d6dcff77ad4d9f8e68b6 SHA512 f82c53780113048de082df94ef28072fbd86dadd4531270567ee8cbf31295b2590973c83992c2271df2cc1abe0cad808e4d8c5f7857e3dfc94768db69327d2c4
+DIST github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20200326173327-a4c66dc863bb.zip 5551171 BLAKE2B 3a6ad27fe06908c831aabe57acc34e25cf2fb85750011d93ea2c77e78c6968c99aa5abc51e373a11ddfd27aae31073463f6c1ca576dc7e39c24bccdd4c06d32c SHA512 92662212b13315cb47d541e2f522c159829a31cf1a81070c9aa7c1a27b238a9cd2481306275267260b19a81a664ec7ce62ed79c21d24455abaf8da1d164b8037
+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%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.mod 34 BLAKE2B 2ee2c993fac070e463df0896b1eb4c2160acf22c1f404b58a17024f8b5f2630d2cd1ad6526c611de0b651cd0c7f0f687398fabea864e7e7b0cebeeb7676579e9 SHA512 75898dfee327b793e7f253f5555409433214a7fb0336f3c33122ae5b2ef66e22ac44970202f67ed5d94f2dc02701b8a0f62cd1d80f543d93d347d83ec26da8c8
DIST github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.zip 14665 BLAKE2B c20de14ba0c48501dee0f4fc7d4c74ce6eb893ffae015dddc34c266c0dad3b89b7bbaf7b3dad87b7f732d6d4ac28e4edbf4b391a2450399257fed73085811c86 SHA512 4e5e94555ba2ec98840e46d482e453e25311ffecc4a745d3afef3a619e9700ece8c72f27e75b7e3017333516af1f373858a56775ef8b599737956170cb9de85c
DIST github.com%2Faws%2Faws-lambda-go%2F@v%2Fv1.6.0.mod 36 BLAKE2B 00f87545f415969bb9c1dd290c293ab915421893bed1fd436be0e53e5acbde8618bbc30bf9954e5da491d127a9d492366413c2313be5d69aba09dcfe6efd90e7 SHA512 c6875fe8335e4bc9eafa2dbd4317455093ee3e7faa6392303e95545bc5118ba37a1088c253503514aa990c0f70a8f995a546416f86555e8d03496a64a0a96b85
@@ -173,6 +180,9 @@ DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.mod 91 BLAKE2B fad305
DIST github.com%2Fcoreos%2Fgo-systemd%2Fv22%2F@v%2Fv22.0.0.zip 114418 BLAKE2B 43e288a393932b03a27d91cd456cbef42c2611751d40e8a8e6c14d2b80f65990711a5be7d75e1f62b1eaef3d9eb8c9bcf3f51eb14a2436ca1dcb15b3b3a2ef16 SHA512 9df60d53633425f32d5bf594dd579ce61bee549c2672da2f7da39437031a8b0d27b7d3448adc6f9b20b230f48c355242ce8b01b0c5be25612165c53c73e10735
DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180108230652-97fdf19511ea.zip 57784 BLAKE2B 1f6e54681c062413577ca873cbbc251c2bb9df4de6339e1154d6b34aa146136ff9464629e419bea7f75afd9feb8b50bddee965160560b25dc5b4041e9d30072e SHA512 4e0f838a7752838dcdac70a96235bae7aee51242022ec2c27be99f4af7657ff5afda5b710be81e25539d2712e5644211689b556e9d8971897ab9f8bf1d3845dc
+DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod 29 BLAKE2B 6d29d882c7c8c863cc1cfa01de2e2347b09e8cf4470c0bae2737f7436ce6d6ab34eb6714eba9f869974c1c8d7a332bfb90ac842b9fb7a07bd1a4c8b0e460eefe SHA512 a41a722efe7f634eebd689a9793f9ee3a89924e6c7917008c6661761c8829d6a897dc71c496f761068c36c590a800f06bbefa4ac59f7761cc0ee2cc68ac5c14c
+DIST github.com%2Fcucumber%2Fgodog%2F@v%2Fv0.8.1.mod 42 BLAKE2B 09381800dfdb8d9ee9032e2eb53d51bdef9c0bc48fbed60431654485afc510f1af8282d675101a49fca885004998003d73545269a4d12ab14fe1338d49a976c6 SHA512 4118f2e16a9e96f4d68e003b92189b9b17f58fc57700a98fe0feaeb893f406100c5574aca23d40a579d95a67b59e2cd6dfdb4883fde356a868e6bca640961376
+DIST github.com%2Fcucumber%2Fgodog%2F@v%2Fv0.8.1.zip 624543 BLAKE2B b0d72f4b9e0eec70803fb534f2fa5e1044f89a5d97cea40ac6aa9398b74992cad76bce4c8153a1d0226fcc8fb6fd85fe7d8e098e611073daf3e7ac27e4b5a60e SHA512 149aa16651deba1db2399a721d726ac46160715ed3b940599e36ce7e6950a794b83127c05e20f1247714bcf9ead573b3813bcab06e5cb77a417bfca6930fae2e
DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv0.0.0-20151105211317-5215b55f46b2.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
@@ -181,6 +191,8 @@ DIST github.com%2Fdavecgh%2Fgo-xdr%2F@v%2Fv0.0.0-20161123171359-e6a2ba005892.mod
DIST github.com%2Fdavecgh%2Fgo-xdr%2F@v%2Fv0.0.0-20161123171359-e6a2ba005892.zip 70819 BLAKE2B fd5ae4da731b41134f50866b12577544634694ad45abbbc92c23d59eacfce23b0dc64fbe1284218fe15013e1fb7d4adbc8b30ebe325ddb01f40209e63e1d7f41 SHA512 2db3f8cb2b13ba66a1ffec69ec6d5c774eeae09bf562f3e4eb7264ddd7ea5e37cfbd3521a911a4efe6a6defc0db58c0802b375b091b9f9dcbba27ff9c4c87558
DIST github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20181014144952-4e0d7dc8888f.mod 40 BLAKE2B c010929388412995c2f94b2d5ccaa676a243b890bf41ef59250366dd3d7eca00b03ef6525ecd25a6a402da7acfef0c6b5875e4558a68a08066bb4e1cb65f3646 SHA512 b8dd88219c0e6b606247d416c25ac01e3592a162322610ae4a93423f2d83854c108d78a810e546232cbaea6be0f48618ca2f55d890b6a79aada85d9c9df92322
DIST github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20181014144952-4e0d7dc8888f.zip 528684 BLAKE2B d611ba9fab72a4c04b49f464ccd43a4622d79b746d5da3a15d44c545c4f7b25d217c7fab09812de87d1efcc43be50faeef2db7e89d60aef517d90c1ff844f1b4 SHA512 646dd4628e8d3c6ab3e716d160b611c3d82d508330792b994d28d5909d2449f537ba45c5ce728c1a94335593d47581f8fedf6fbeafe3f4f20b7a802da1d2f798
+DIST github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20200206145737-bbfc9a55622e.mod 182 BLAKE2B 27d2e8f155923769d6df395281d9d2967f2bee262faff767c586e851c1595d8c74db1f890809bce63cd9544c4dfcdbda89e518a25e1a8925ff78607940e2a374 SHA512 14925087284b332c5458fa81d0e92f2a33b4a59e98b93dc6c99e0943f03c13165e8dbe1a27fe5a4d78b62b3b3bdc84d634bc31f346a70301cdf7da7463c85f92
+DIST github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20200206145737-bbfc9a55622e.zip 570947 BLAKE2B 77503e5f0f669cc6b53ea75a0c227c125022c30af4cfd86389f4381a9cfbc3b15cca21ebf633218e4261ba0d8ad8c26735afcbb5eb57cc8380aebf7d4b0ec69a SHA512 f7c4bc9355f36826d1b0c384e20238c9c461933b4eae6455b1828687eb62137d98969998d181046e36bd348690e7df22633413a294aea73af0420bd242c0f93e
DIST github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.1.mod 40 BLAKE2B 3090a8e1737078a28e24c1a01f78a18ca2ab94c0cd297a9ab04f970ffe05a6db291561b893c345c1d4f023a0743adf0a769f58365251ec94e3925da9187aaf62 SHA512 de55ba427379e57d671a31a72b9295e8e7fbe3bc0b80d05e63ccd31c1fd7030e74fd39fb0347d87f10f19bed208df6317714b0d1028057fa40e633820d49a03a
DIST github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.2-0.20190607222403-0c15cf42f9a2.mod 40 BLAKE2B 3090a8e1737078a28e24c1a01f78a18ca2ab94c0cd297a9ab04f970ffe05a6db291561b893c345c1d4f023a0743adf0a769f58365251ec94e3925da9187aaf62 SHA512 de55ba427379e57d671a31a72b9295e8e7fbe3bc0b80d05e63ccd31c1fd7030e74fd39fb0347d87f10f19bed208df6317714b0d1028057fa40e633820d49a03a
DIST github.com%2Fdevigned%2Ftab%2F@v%2Fv0.1.2-0.20190607222403-0c15cf42f9a2.zip 6710 BLAKE2B 25a6519442463637a3592d4d45b9c7f691e51c4217662ae3c2789933dbf98a5a957b2d59b77e59b99f82cf494e753ce2b521ded79f17abfe061ef74bf64038ea SHA512 544cb0f6502ce883beb548f412c6b79394a84961a4d0faeb563438e32c3c4121fe623ae24b81109714eb58fb2f29fce90c20d227a03bb67396dc05fe927cf5d5
@@ -205,12 +217,15 @@ DIST github.com%2Fdocker%2Fgo-metrics%2F@v%2Fv0.0.1.zip 24020 BLAKE2B 0fd01cf85e
DIST github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.mod 34 BLAKE2B 37c07a43d4e36f25bb5bbc10a863a717fa114a5eb980f17942f5bc5b1d1a4f58de5301ce871ec5d41f5dae3f05edd7c03a5c9246317ebf089c1cff27d6634aa1 SHA512 53dd482245593fe74b94c319cf4f3079b47313a22aaa69ba023b9e60e8b5dc81177ecfac49e0cbd9b1eb6706f654f387301ceb00313f8cbe530b4dc24eaefe97
DIST github.com%2Fdocker%2Fgo-units%2F@v%2Fv0.4.0.zip 14089 BLAKE2B a825c998f5a7e6432a9d23f49fdf9d8559b8664ce6508468540530efe9585a98400bd38681a24b5a8b2d10b13c4ad91216f6c71153e8c597e3d2e8c8472622e9 SHA512 294682c312e079f96ac920c3f4e3dde7211e36622a378f54f32483e032f4df6f54a1f7314df7c73e2b7391bc559003ffe2bdb97380e4507aba7620ea4123d872
DIST github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod 36 BLAKE2B d46b14a3eed14f8d5886e333deada157d9484ad3bab124d3d57d9fd6a39242c2272417df8bb31e08361f2be8b11dda9e96600aa800879f393c8753330eac4e68 SHA512 7ffd6ce59d5c5fffc6ee8e8f48e1e7114628ee2631abbb1a3591b794c23b2ce6dab10f67b8b76bf82c73e1cd8614313b2bb1152b829a8875425f1a603ee394d4
+DIST github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.zip 44017 BLAKE2B 598c6308995ba7e6874f08c56f5453d4f3b68146ee29fcf7677571cc07d39a8bd4b78fe2d7d706e57571f00807476be399b08104a0a8bc3b75cc8da6528747f0 SHA512 bad8443888a33c8ba1a18cf07b09d7401067b6924a2a076a00efcdf959a5d720c2040d011d0ba6d6f0b0844b9605928d9798e57a0ac39bf08c0856cccac317cc
DIST github.com%2Fdop251%2Fgoja_nodejs%2F@v%2Fv0.0.0-20171011081505-adff31b136e6.mod 37 BLAKE2B 5403fe298a2290c20eb96a74f7f31398914773e73c700c8ed6458945b40e3df4711e8d2001df29d68e322cb5fbec4f566a6b4eb35aaec777468a09618578f6bb SHA512 baa4ebf37e9f35c1923c10fcb703bea1f4b992d92a567b7df8d185bf763d6947640dac436f0763e8f35c3a8e3e5c7a5cc1249986bab0ffd570011d4466dd78db
DIST github.com%2Fdop251%2Fgoja_nodejs%2F@v%2Fv0.0.0-20171011081505-adff31b136e6.zip 9815 BLAKE2B d263cd677b17ac795fb6be116c662d36c44474029c96a2efdb17b2107c292f7f2240b2565f45ce1a92d1dfbf14bbf9ee5686ae1634b4b1839ce22ad2617e69e1 SHA512 651db3bc9d472dbe6814b7a94d564440ee43f6eb3cf72f94bcf7df266d998bebe334eeb3ec84ebb429825ade32f41f670da144e070fa4b2f9d265c4299f9c8d4
DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.zip 26646 BLAKE2B 408dfc541d7bd0692010d6071f96db972dbf84b0e9dfe552db221cdcc4011f023dcfc12e7c9657696c9ad204c6587404f793b4785beb78d53462764a2da96c5b SHA512 fb53c8511a1538397edace6101699904f19e63b82143b56754ef2a62d457fd34f6bfa907d379964c427ad8b7d38fa9ad186bc66d4a103c7f118b8734324593ce
DIST github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.mod 40 BLAKE2B 9300f3006801602e05416487e6021123ff345e36835b5f4841158bc87556afa086470218c3f2178d125baae065c1af3cb27e210a50173a5bc9a469c592758eb6 SHA512 fb616884898669f21d53576f0fb70c8babc38bb98da066a2cb77fa85ceab6bcc8775feea3d3bcec19ea3b25544c776b8d55ad82f8876da5d0ed5176768da735f
DIST github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.zip 17986 BLAKE2B dd2bcaa3f080dc5ed1b1da8d1f2ab7573577e5dce76e23d323310419bb0e3128003715bb023c4c4533e8e3297b795b30a95801cc68129f19844f433026ff8433 SHA512 64d611c7646011f9ad2f9ac423a9ba8154d9e6713611dff5481cf585c18c0a2bde3f32b26ce8647134f2e8338c08fe32b0dce4f3ff591a8a2b2601e29ea1f00d
+DIST github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.2.0.mod 40 BLAKE2B 9300f3006801602e05416487e6021123ff345e36835b5f4841158bc87556afa086470218c3f2178d125baae065c1af3cb27e210a50173a5bc9a469c592758eb6 SHA512 fb616884898669f21d53576f0fb70c8babc38bb98da066a2cb77fa85ceab6bcc8775feea3d3bcec19ea3b25544c776b8d55ad82f8876da5d0ed5176768da735f
+DIST github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.2.0.zip 18643 BLAKE2B 193af083e7191c5003e7668f0f35ce83b40e04642f02337ff5194a60b654d0e9f0776355ced676f8c6482a2b006026380a989e9724b2c7d8a965c863daae8798 SHA512 a5093016b6559c7297cbbca1abd3b7e50ff34a9f57ddbc383a0141a04943a5e4784a54e44d0e722fe2ac011cb9d8bd4aa954b758ff1951fc99a8b7c5ad2a36a0
DIST github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod 43 BLAKE2B 500b3a85f43db1d61f037f437b3290888204aef8b80aabf42d70c37607fdac86e8b1f7f4e41ad3709ad7015a78b934ed7d6d254522eb3e2baba4ae24619ea4d2 SHA512 da87f8eea5497796badaa6bdd1c67ae04e75deb7595f10739f30f20364f22e588a449aacf603f2c8d738b365ac14211c7cfe8e1bfb91f220f5c9d547007ad453
DIST github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.zip 19526 BLAKE2B 87715fa440e98bd4c44516e419c0f0495da8fbad415c59361ac53008553c4ab16aaaf37581edaa6a50fa443b9ee28cb426f7e58a921f3a3490fabfa4248245fb SHA512 e8756683977e2dceeaeb1bfb63ec8fe4c7083cc1c7b242d59080a3078cfa5aa73d43f203470b140c1714a30a97dc843adf723243a072b7529c22e1fd72d7ac69
DIST github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod 32 BLAKE2B 51c322074fb7a69418dcdfd2e54b187fbfe541c21a979c8bf8b155a6264cc670eeaa95c2949f2b760b187fa582e86688a045f3f022cb45f053a58e00ec2c0c60 SHA512 bc43f85d5a21cbdf4b3821e707c845d08f8a6d8f2c6ef0f6ec76f7711c53bb4407f2a356c79bbbda438fe138a3cf74a4b279e8757cec7aa134a93f2173b931a0
@@ -239,6 +254,7 @@ DIST github.com%2Felastic%2Fgo-seccomp-bpf%2F@v%2Fv1.1.0.mod 295 BLAKE2B e58f21b
DIST github.com%2Felastic%2Fgo-seccomp-bpf%2F@v%2Fv1.1.0.zip 48037 BLAKE2B 33ca7e5932ccdad787d4d8b70f04a289fa7c8fdf16629160a40ad4088c89ab35c0fc4dd0f6a890071b356193e6f7916e1ce698beacd92f18849e50eae91e5428 SHA512 2e587f18759ff5e785b3c4012f2db90477c3d6d789dccb7b87e8d4f7b1db97817e90c77f7381ae4b4d5809bf7d697afc44f89c9779ed343f96deb133c0c2d049
DIST github.com%2Felastic%2Fgo-structform%2F@v%2Fv0.0.6.mod 49 BLAKE2B 352236127621622e9d98caaa768f688fdd50df5cbfc0b741a438a243aedc8288646a555ca20a6edf5ee56c74b3bd4d14b8e7fadfa68bc74df6afc05d89ae2a4b SHA512 5f32bedf6d5cd474f6de1ab798de83b37ceaf38f2e6895b80f057d0ece97a8ed4690e813b3bc8b2c0fa64e8db2672caa49ebd30be2ba4f0cab3fe007475be7dc
DIST github.com%2Felastic%2Fgo-structform%2F@v%2Fv0.0.6.zip 458731 BLAKE2B 879eabc0e78a111301c7906f6f7b1b2f6476800e2a53732cdb51aea2c82603e7793c7fdf25b6b8440045c9e11502754923100439955716ab22eed13a62044d58 SHA512 ee6d0839f8b55dc99069948506600855b108514fd119fea4c43412139508cb814344948a9a212ebcd87c961d85e665990348607c4c75ecbd6feee236d94f3ad6
+DIST github.com%2Felastic%2Fgo-sysinfo%2F@v%2Fv1.1.1.mod 400 BLAKE2B adfe5b388979c259bc50763c3221a7a2d5b19c828869be74f7b12f410e975e7359f804a9f0718f58c2be7731ccfa4d434ed0c099af4789ccfd435e9beff8fe7a SHA512 fc6b82929472a56b3fd5fce7f67b39a7d222949adc570cab9ad2c1e5715cee3ebc03d86fd8ecddcbf066cd3b2822c19b32dbfe373e93365f098fad17bdae2cac
DIST github.com%2Felastic%2Fgo-sysinfo%2F@v%2Fv1.3.0.mod 400 BLAKE2B adfe5b388979c259bc50763c3221a7a2d5b19c828869be74f7b12f410e975e7359f804a9f0718f58c2be7731ccfa4d434ed0c099af4789ccfd435e9beff8fe7a SHA512 fc6b82929472a56b3fd5fce7f67b39a7d222949adc570cab9ad2c1e5715cee3ebc03d86fd8ecddcbf066cd3b2822c19b32dbfe373e93365f098fad17bdae2cac
DIST github.com%2Felastic%2Fgo-sysinfo%2F@v%2Fv1.3.0.zip 118316 BLAKE2B ec39114ee964eca4fbe1b062de585fefe8875b6c8c1033f1b2c69e626512b984ee413bd9195d589e70bb3a34a3f6d71613690e2792a5b3b5e093d64a8b03246f SHA512 205d9622a2ce33844050d31ae81493766c30629cefe2d353abe84e13cf19e00606bec153e97eeb6bbff1ebf11873236ffd52ae31dcf4232e50a1320c2cba5e76
DIST github.com%2Felastic%2Fgo-txfile%2F@v%2Fv0.0.7.mod 594 BLAKE2B 95c97799b1cb834b083daba37e0a06f3ff042e1be89b42e91d425b399615dec702b431b7b27253237c9934600991bb698f4554b61914dbd734480d83c09d7717 SHA512 2f7c2f22f8ed0282a9abaf27212cbe9175059dc2950b329b607ad4ca804f460abe211f5df2a8fe2766b9e44ac4d35d6dd95376c667c6dcb10deb571542c8a62c
@@ -254,22 +270,31 @@ DIST github.com%2Felastic%2Fgosigar%2F@v%2Fv0.10.5.mod 34 BLAKE2B 1e42e1bc3a6b6e
DIST github.com%2Felastic%2Fgosigar%2F@v%2Fv0.10.5.zip 107227 BLAKE2B 5e29f9ff6b523ac999a74aa4fe0952495a3a63edeb5894783b08056b16bbedcd122ff36f8658d5277711cc45dfb35481b8d3566d7fe4a864c9bc698e7e60c4f4 SHA512 65ebdd1324286abe1dd0dea6e8ca594b7a4ae3114e1847821dc0af545848c3de7c7d2140ff1f62cdaa40a3cb367297e7467b53faf319af58a9773c1600bfb8ed
DIST github.com%2Felastic%2Fsarama%2F@v%2Fv0.0.0-20191122160421-355d120d0970.mod 1188 BLAKE2B bd52cd2d49c856181228f7d2500d6457befd145e5f5e69d1ee4e939c07cd436d4e94b1d6d7ec2cf7f371683daa69f89e06afd70f3a7d8205141cc934b61a695d SHA512 7afc6074fc64dd861b1fed922c2a89b7b75fd35a3b6af51c073152aa4097782f47f6b2c986b9e92e55c30e7bbff68ac176d478a6b1743df6e54b68c3715e7c7b
DIST github.com%2Felastic%2Fsarama%2F@v%2Fv0.0.0-20191122160421-355d120d0970.zip 368799 BLAKE2B c5b3fe0346ad2c2978f13c5db9de073a91e70c7ea66e6c848946b6a9642e23668ce1d3de7f816de4d4f81d436ef7dfa2f84fae05d3258d727fbe678f8b779fe3 SHA512 f59e798714e5e5f02e50d44f6728b3bf464ff77704c5b67f8b704f11318d29ea5c883c78f5909e65a907ab23d036e2d64a63e6369d5dbaed565f27d8fae04517
+DIST github.com%2Felastic%2Fsarama%2F@v%2Fv1.24.1-elastic.0.20200519143807-cbc80333a91e.mod 1375 BLAKE2B 2078c8e8bb7e18fc469ef77acbfefbd44e6d76c492bd18a8008adf28c5d1fae9cc60d4fc8503a7d66b16a74299e56f673ed6701b34d7a9840afa2fa61be0d2c6 SHA512 31a41e1f8a619aa9dd438be4dcc185d75984a1dd6d7efc5bfd37bf74f63be6a6fb2ca3b4d584bb66f343ca1693b59a2156745689fee29588395ab369fbe32391
+DIST github.com%2Felastic%2Fsarama%2F@v%2Fv1.24.1-elastic.0.20200519143807-cbc80333a91e.zip 396086 BLAKE2B 3f0aac8224ab251f34b857800f8ab4f764f480b11cfb7a3a7acdf4d6e30c0a70ba4547c773116fa7acda3fce2bb8ec603391d24d19ce62a12dc5f19559c274f1 SHA512 adf9a9fd4ec8ddb449be16161176501260ba8e6c9b34d3b41768520258d07b5fd0b76b4f8d17f32076b9a4b252de4f40e3f3dc71155378092c8f216d4ab0131a
DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.mod 34 BLAKE2B f28e4e0816416341c47f1050c45c142e5f54ea8461f335b1303def3516a3642a4cf29341cb16aa3fe7a8f78439732058a3712b3831dc35b2db3bbfdc8289ba2d SHA512 df974cf26d8392df0aa30b39a28ad4b6fa2c128cc6e4be98e91aad8f997e76f98d16a5c19cb3aaa510f659ed8c02b05e7d93888648f30c701fa02e63707075be
+DIST github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20170405201442-c4fc26588b6e.zip 123357 BLAKE2B f90cde27ee435ad6c035c1f5d5e5269730bf04c3328ac75e05f10d4023455e73b1a6bee17685393bfd32ca14e4887eadfba2d882bd0d84ad7a3a9575f7b31dfa SHA512 18c021a4cff23572c12fab0f163cd775c9cc046d5216e37d18ac461ea113e1032d504c8877c240bb3d1461665f926dca9b42015991688fe99389a55e2e2ae797
DIST github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod 38 BLAKE2B 10c510e0332f88b1c489b5787540e7db93d5babe8fddd2d1603991bd08408a590d133646697604ee008f8a16f1cc384d8223d07e74d5da7e2242434accd1bb9f SHA512 d4d6319d58284419a3bfbe6eef0623570cacf0cd75a192cf5ce49846d75f02dee4188a68b9c62a6c38864503a7884e08d03a44a35296d1a077ea46ad5d68c820
+DIST github.com%2Femirpasic%2Fgods%2F@v%2Fv1.12.0.mod 33 BLAKE2B bf061bb336cde22e7cbf1abc36be47d4d272c0e454ac2cb60c55e33976167d75571cc490dd73761e31e597f2a8daa8244ea4d05a55120f6038dd2abcd1bd4cd4 SHA512 ff65ee51114426fd17d1a36b6e7fa5b37d9ec0cec79b6eee9041f3506373582ef0208f33131ab27e0c4d20a13fc9657e55921a704ce5df1ed3bb7ba8f28a9e76
DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58
DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod 49 BLAKE2B d910253a9c976078b790d134a9d75e53cbde427e7733ab9e09c9060b312a5749aa083fc48263501e3339a580cc409b5859dafb820a4465827e7fba4eaca31ecd SHA512 755a3d173d43e70ca40fde2d5ce16c405365da90ff595003ef64598c9b9734b7200fe07a16fd555e4209f83e5e17561d18227c46a5f25a41976ff7ac024cb9aa
DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv0.0.0-20190203023257-5858425f7550.mod 37 BLAKE2B cc30b89e62bb3a524aa3d6c55c472d2b157d3cd3b06d63b8f68c5ec035b6281dfef631064cd836f696317bd0ab517eeff464fedcf629491ed87b748281f9508b SHA512 f3ebd49ed1f05193a2999ce7178a9bbee1d1feae8b13c612a8a57d5c836eed66307271d9dd21de79800bbe9773364e826502287c366c4d3e2ef16d4a346378a0
DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod 37 BLAKE2B cc30b89e62bb3a524aa3d6c55c472d2b157d3cd3b06d63b8f68c5ec035b6281dfef631064cd836f696317bd0ab517eeff464fedcf629491ed87b748281f9508b SHA512 f3ebd49ed1f05193a2999ce7178a9bbee1d1feae8b13c612a8a57d5c836eed66307271d9dd21de79800bbe9773364e826502287c366c4d3e2ef16d4a346378a0
+DIST github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.zip 17890 BLAKE2B 78d64a15d328529200d05e6830ae69d4976e1d61df1f335e18e32614b64727b88f008e0369292b15ba633c0d3e687f6baf4520667f22cb9baf8f3140ff9274c9 SHA512 c83ecf63153e35f4fcdf9a35528a3dc2205ead882053682e2ce8d35f1c57bbf60aed92277b2e599bc25da96c1ec3563d7f20505aaa17e78ae5e484b20c921164
DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.5.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.5.0.zip 11358 BLAKE2B 665fb79fe378c76e77d98909a3a0c66ce797c79658f4137a1d903d10bf5a9712b6e2a379337196fdddae3fa5ee72488853c8c5f7394ddb98db9bc14dc42ba44b SHA512 74d67dabde4401ad848eea4dcb16862a136f500c887eb2d785f358d1befdecb38efbd901e2becd6302852477156cd26f1cbd06f9d7aa757e81af934d1c5ffbfd
+DIST github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod 33 BLAKE2B 2c279a40bce4e61e5aad9d25a1c374b6c154586c296cfdfd56f52435c7739c8d9a8958e19d6da8026c2a03b728e0cb9bb512d5c094aa6111f9b10af24ab894ee SHA512 2bb0f125a91c8f92dc1cb5ec16441b27027585606a3862c216434b76324f3069941055c4bdc98372547543b095a4014155446de1be98264842504450121c941c
DIST github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.mod 36 BLAKE2B 0b3e2e38c2a6c708af475f5550f4e6b366b9218fb9e29b9ace6fd61775be5635b5dfb237170e5c4a84c82a4f62e3901ce8854cc5f9a81aeb1e2da6f788470e1a SHA512 88ca10cb6af255e2e0ff960df075cbaf39e8baeb3b65e35b9a8f48843520a4cefe410765d0890781dc0429aebaa183aeda2290fc0643b852b9ef269c009ecbd1
DIST github.com%2Ffortytw2%2Fleaktest%2F@v%2Fv1.3.0.zip 6665 BLAKE2B f9bdacdd7f4cb7149fbf6297d3ab38c3a9527e0af158b933fbc673b96c5ffb684d6511b1679e03a142e4db5dafffc7b1e2edf24ac2d0f4e8faad32041e3e1165 SHA512 77f320b3a94a6da76051d6c15a7c31bfe9dd50b463ad9a354b0ccd4e24df3ea14ce026a1f509d2125f9603ff95db4ee001f9910fd6db05c9bca7b1b15ec304f2
DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.1.mod 112 BLAKE2B d5d3a6674d915a64981d16e50519ddcb083e77a5bc0e2474fb1e2d718512edd48534c11e13c4acc7d403da5778cb6f04c275c8f208d14d54880cdceadbfff872 SHA512 b2b728fab00b8cfb86dcfb042631a37025bd981364c068990abca3ed57b3f47837ae71e568bb2a60a2c941aa2a35ff1bb24a336e786d20ff0bebb63384fee5a4
DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.4.1.zip 36823 BLAKE2B 748629d0224bc4598ca2573286d49e8623ca17a9438cb525a8d080d14cf37549943418d170dc5b107e2a39271be21e1ffe2f9224b469b3eb82574a0c64218851 SHA512 1d451dc97018060ba5fee2dc1696807fb98aee809bc8cd2994bb83a35550edae819fb46cf17ecaf89fa8a22b277ae20b35c32c779640a47679e5ec965bca007c
+DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.7.2.mod 121 BLAKE2B 023fc722091ade6051165a9058ff74674f43aeea249b530be92b7f05534f0b0e738a7dade302f6733e29315fcfd34bd0d8c7554795b524e596a408e248051d12 SHA512 151f687b4d5c2b5a8fa26134332222105f40422530e49930b4533831fd5a0133ea7a8038f2d851196dd615b658729a10ec42d0a6efb15bc3abf55903bf42bd49
+DIST github.com%2Ffrankban%2Fquicktest%2F@v%2Fv1.7.2.zip 43121 BLAKE2B ae8c0baab3324c9d60363b216e00ccd5e27b746ddd8a3b1b231f9f018dce8f3bacf5c2f9a8f1a3db97fce8db290d05f7c397141d278d585e0e44f0bea099549d SHA512 8f4610eba24604d46bcf1f9c4c7da0723a99f37224c298022823160d14469b85a911a6d18b8f084aa2730dd100721e52a8cd6bbe0215d72843daefe0f79fb141
DIST github.com%2Fgaryburd%2Fredigo%2F@v%2Fv1.0.1-0.20160525165706-b8dc90050f24.mod 34 BLAKE2B aacafc6177e1e87c8f4a17f295900d749608f722755d31a1939d1b601e4719984c0d1299fc4de9fe74c1109852009daf4641cb5c81629788a639eeb9314867c5 SHA512 c4b5fc4230e8e9c7631f577ee15414f7a72bfe27af524fd6bfad8c38a81426411dce35a191d840a9c69eeedfeacacd3f2a108c5eec35a3e30b0a7b262b15340a
DIST github.com%2Fgaryburd%2Fredigo%2F@v%2Fv1.0.1-0.20160525165706-b8dc90050f24.zip 52308 BLAKE2B 754630f3a08998023a2b1f7b13352108e336cc50972bec1655cd04134be7f7e416e2a68e776fe527e68ba898784f478b2dea79cffab8675ce4b4be213a14234b SHA512 ce216e29595645dc18cf9d68c8720d2490bda1c51d48037f36ef7dc8debffeddf6177978409da8616cc33dae3bc1f746b5d04c6d22bc77265fc19bb376d0883e
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%2Fgliderlabs%2Fssh%2F@v%2Fv0.2.2.mod 33 BLAKE2B 18725478b6c6a565e4adc96f4edf09f8369553b8b6523f36f8e4733ae64eb9a859af67e14646e61d2faf5cfd651ada0a6bb2bae455ba6bb4570c92696b31f23c SHA512 e6592e0b4e0c9f344378efbc06365296f5978e173421824512ce6f8921212691aad2f35e73ff4562c72014897a4992b7b3e56e3c424a82159747f1fe328eaf50
DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod 48 BLAKE2B 7d441b7bef1f34bd7065c63630add910d504ba5a2897d6a0b7cf9c9456337b8e55e1ffd9e12cb3fb8c7f021e51cc045ea41cdf62f2c33555f4b61aeda07c332b SHA512 06dd140361d7cc1af9e37de85402631a5310d34198e20d6ce1521dca15d1fba1dc9e40b512a30b8e850e105e9fbcfe0691b298d092eb92b79da564532dba721e
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
@@ -329,6 +354,8 @@ DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod 34 BLAKE2B a4239cba934b6e8
DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip 465217 BLAKE2B 4caaf832a22faf1c45e04bebf35d29b38bfab18a490ad1fd7b2c6cd85ae678fd3991505f68e526f9f2205cf919374b07d57f8abe95d8f74dc8263cd37a9db3dd SHA512 7fe69c066b2407e6000ae21888f6cc696e51df2342a71e196aba1a9a9ecce630bd9a4d41c58b3105002508a4d0efb9c5ae2b8a87f848b8e2c6293558b8c4b4ad
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%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.mod 35 BLAKE2B d6addf74aa6a2ad97c1792946aea166c48bbcf35fbc582a9dfeabbdba68992106b7cc7b2515ccf002f44bc74c0f0655089e3110e39fc312a683b1c364318279a SHA512 33a68d466b4aee3c41e6d70766e90fc7b7b8e904acb360d1a5e15236832ca47e5f45393a7f5c486893f6a8ca04af4ca4ced27b064c15a5189217141a325972a8
+DIST github.com%2Fgolang-sql%2Fcivil%2F@v%2Fv0.0.0-20190719163853-cb61b32ac6fe.zip 9531 BLAKE2B 17f756f40c12b6ea29962938ef18520d5ca3fc99fe6804b0edc41b63dec17b63740df8d9f1abb028c00f6b5e74b2fb6dcf5c6a09e44ef0ee1a86f2fb2e740239 SHA512 27fc4b487a652c7960ec6e691b78e80adbc3dce7590da3f4e568fae95f583e207a887aa8626ed75da7346a40d47b2bece7c3aa5fda6bc7cd4188673706f616dc
DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20160524151835-7d79101e329e.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
@@ -380,10 +407,20 @@ DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.zip 79215 BLAKE2B 25312a1d97
DIST github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20170728041850-787624de3eb7.mod 38 BLAKE2B 1ee03077667437ef310e0e9d77f917474151294d0ae6654596884b28fa847c4be1fc994e4a2dd00d4551d5a4550e14edf1757f5061c44b527cff91353944b989 SHA512 5500094712db06267cf0d437e774bb1b4df9affcebd73ac218259f089f035df59c7ef38e6f36197014acbe1c8b08806734cd27c85a4bc86cd62fd9196d7f5b3a
DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.13.0.mod 535 BLAKE2B 2be9f841d89f87d8b4d2935360953fc003863569b6caafcbfbc17fa8c3f08b480c6a565861db774a4ac3b40539c42185e00d9ab3d4611ae7a92d8bf1acc5553b SHA512 f803cd5c2d7b959df845c0c0f118573718be692698685c1e8201aaea744279aa32b4f8a930e57dbc2fcacd5872498d253849066a97dfa832a45a309569e4e992
DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.13.0.zip 606164 BLAKE2B d86b37cf29ebe06722a25ff47450f1ad2994da243216e5694632a3d0b5b74dd9b81bfb9fea9191cea02dbf4bd3baa2aa3162c7af9590526ca79e01fe193239e1 SHA512 c002521fff17e78ea18b8008f9a5553a68dec0f0df641008e5394c8e9e9f1a941b30b48f635497996acd8ec08ac74bd8b38a35e3c32cd6284de8b04cf987dd82
+DIST github.com%2Fh2non%2Ffiletype%2F@v%2Fv1.0.12.mod 42 BLAKE2B cb24fd6d3604f496403704819b10923f426c7b7733ccc97f56b653dd1bbea97d287f006a3c959695b101a477d8ad2ae119407cd81e5ee082347be8264afb7f22 SHA512 2fbb83d7183e38e99767fc49d2cb93b7c69706ec8357768eedf6571a44658b6f293dc998c26e78ebaae6310146949096bf90b3ae7c4985f5dfc2568dfcad1e66
+DIST github.com%2Fh2non%2Ffiletype%2F@v%2Fv1.0.12.zip 3646277 BLAKE2B e1e9bfd0a67e0d6bbd745446b788095877276b51ddabdb87fafe099c1ea37f966d34cc493efa60ba37ff5174c74060ac28fa1c956849efe0fbd9bb341b3a294d SHA512 afd7531c75633cb174f2c258db1e2ca20f77ce1f8c602defff9b82a83cd55694a30bbc0c69c617e95971d0ea3958697def1ee2b013fb3cde9cde035d6ac67e81
DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv0.0.0-20141028054710-7554cd9344ce.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
+DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv0.0.0-20141028054710-7554cd9344ce.zip 9313 BLAKE2B f6ca808655e43b0ac41987c47dba2172324cd11cacbecb83b9e6295db22501f42f15bf4a95b08eb8c58e6c8795a432f98e57edc7c7048acb4821ff3cc84deb88 SHA512 bed2931ae7e6ede14d744cc816ab39ffeb129a25bc6aa452b2d8db799ce39a0a81912c29ea016b3daa1a03c84fb18d7ccfdcc758dd213f6a15b344c7c8e990c2
+DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
+DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip 9306 BLAKE2B 1172cbdefac5f63dc5dc155b38f1f6e63bafdcc4a9ec057c3714a93251fa88d9cf29aae780587b13dd4eb4af10fde2dd305c4ff774bd843068726c05861ccc4a SHA512 fcecaaf6496b11fb35d01da0d3375508c978b0a319d344c61f77539be199f1f13ed892f2019d5b6d8ee1603c576064203ab87e235bab4b0bcb96d28f9e16e88d
DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv0.0.0-20161216184304-ed905158d874.mod 42 BLAKE2B adaf8e14cd6696bc97bedcada70988d2508d8bf28e94a8b528067359665aac351ec7b7f38ca1a89ceb0c18c3c7935e30af4df20102563c9372b34b0cf54d41bb SHA512 da70feb8b6a17512c3761ce6f13653ea47bfcb4af69b471a3bfde9b79901d0f24ede05c10d35f3e051df54e1e636a848be5d00194ef5e9b85bf7915d6b27dd0e
+DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv0.0.0-20161216184304-ed905158d874.zip 15518 BLAKE2B 2ca1e1de9972c287b7e49507330594e02669c67362a6415f491b8c7648c72cbd12c573c114266bf9b5016412c65740b2f5a0ef3efb85ccb6001c6f1861f05870 SHA512 0026c31a9b2edba5da0d9c0a64e5963dd931f134ae3cdf768c8f1cfd8ba15bd7446ba9f4b7ee2b9f5bdd7d1fe1a34e47cab60c001f6f2a0148f22632ad130f64
+DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod 87 BLAKE2B 34587a565b583aac6338d7d23b4e7c2ce12deb6700e00bec711d3d8d829ef1ae356eb1b28873d5bc2a0d6ed249dd6095539a1dfd8c177bec32e08d97f4003620 SHA512 d47dfa43806a386eb74b60f692b3bc580997edb9d7feff6633992a5adbf94d102a238e036d828952e204960152c62895288af6f09e2582e8b1408d259fb834c0
+DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip 14840 BLAKE2B afc6e5519fc2dc1209382c6ffb6f73d29dc97b6cfa03ef525d6095e65870a1ce25ca59d56648e24bc399f53f6879c0a3ce91e27645a48734602292c7d99bfe16 SHA512 8f86f79788cec64d9ce4f02af2ab7acd64f2014e5b592256f07563841444520bf4810a1dfa76abf04909dbe5f3298c67c0a88e636e45a181e461a2fac08d385c
DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip 7804 BLAKE2B 118a166e041d64c446114e195ab870455fb75db45554e02f0ca1b0a2ee76938022120848bcd5d3668a9711c32345db5911cc627977a602bfdcaa875be791199e SHA512 3a3e4b23b82bea9b094f407662f5c63659ae427bd0e922c37f0dcafa1e3cbb16f4117f265cacf2a0219f5240d378aad7aa4cd2f9960e07b7cc7200859b0d6699
+DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
+DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.2.zip 8042 BLAKE2B 9ea2dd58a5d47047a84965e956e0d228e0c7f836c6b0111fca63ca2313c1721341ba31e7e741febc8f5b1053298116d69d6dc96f1497b59b343da59b57f7c3f9 SHA512 1afcd111ce5ec191a932e6f51f0aa9b05ffd3320793c022cc66766bf01431ee4b9cdd3e7a0544b6b1616fabeea262f54270660fb723de8ecebc8f919e7a94e34
DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.0.0.mod 39 BLAKE2B 65fa1ffbb1bf64cb9bd4830d71ef2ac2fd2344849de31367b61b8c54cf6d2ed8193f54b32937e0f80298b1e59b08fc291d52c91955be5b1fcbfecc4851f16e5c SHA512 40ee5ae5f6991a06b8ef61f04349a5012e36932b53c678dee58d25fc1bae386d6d431de4167641721c28f686071439fb8c9c250bf9607e9743a7280244618d87
DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.0.0.zip 15217 BLAKE2B bb9f90cfea6f89716379d3b6f7b5b4558f44ae1c18c32aaf98e8a7f1752b7980f9905b2f49e03e6b12dd4b160c9e0d91a92e8c4f184e0460c320eadf130f5f58 SHA512 6b7c320dd942b6b1c7e5e627bfe2242f77f80a0166637cd965a1845ec986f5f5c726304b09d1d88cea7cb6d36644e83b2f8fe50727223e63e79ff7bdce52abae
DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
@@ -402,6 +439,7 @@ DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod 32 BLAKE2B b90f36a2d75d98a23
DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.zip 25340 BLAKE2B 3d0fcc2379f60900d4003da2a3663e77ed131986dcbe209aa13a59198f1fb8b182401c50475b4b39986ac1dee1e165f952bc7de758d141f5cbe028dabd6eca64 SHA512 4ef5c92c16747f375f83866581302be13f9425c9257eb4d73d197cd2b9332f7125b5864a1dbf423a96b1c03ef21ce32ab5cd1837760258a07052be40bd4e6399
DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip 3712 BLAKE2B f4f79741bb83862583f51f2ac5e80181eb0e9c2a4578df32f7e24eb98f4f548b99333e0e6a377e03ef701057b01e852e6b710ab885b65170c861bef556863da4 SHA512 e16bd414c1df566a12944e4a99ebd84d2103f0cb3bf8ec312e3de400f20b3eae27845db50672801c10474dbf1dc61d0c2e16e5dcd3c4447681c0b77f9114a411
+DIST github.com%2Fjbenet%2Fgo-context%2F@v%2Fv0.0.0-20150711004518-d14ea06fba99.mod 36 BLAKE2B 3face566779516d32818939bfc87f0c24ef4b03ec89330763cb2de2ab371a6a391eb5fbf24d9619a07719f160c4f6c403dd4fbe1c650764c5e0ff43a43051aa0 SHA512 fc1cd659d6210d91ef66189a759c3850b242b76267035f38959be2b2f35283b54a61334f4416b619ff017d39646433c5a13c6b181e53bdfb28fbc3f9c35f3dbd
DIST github.com%2Fjcmturner%2Fgofork%2F@v%2Fv0.0.0-20190328161633-dc7c13fece03.mod 35 BLAKE2B 152ed61bf84dd1666421e11827c23eeee0c7c50edd35851a50ce21f4fefa13660a7a6cead25a0f9d8f1b748c2c4277d21639eb781c484359aef00e77921139e0 SHA512 5e94601c72f24a3d8a115759a8fd6fd3420b662995ce94d7dbcfe4f86437bdf81a42c77c82accf7fdb926b75a5898bb34706fff864e00b38d891cdd076fc89ec
DIST github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.mod 35 BLAKE2B 152ed61bf84dd1666421e11827c23eeee0c7c50edd35851a50ce21f4fefa13660a7a6cead25a0f9d8f1b748c2c4277d21639eb781c484359aef00e77921139e0 SHA512 5e94601c72f24a3d8a115759a8fd6fd3420b662995ce94d7dbcfe4f86437bdf81a42c77c82accf7fdb926b75a5898bb34706fff864e00b38d891cdd076fc89ec
DIST github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.zip 31175 BLAKE2B 17e0ba33bedb9809d12ffefe034baf727e7c2a66aa19adeb87de3e3659c085f176fa48951f1afff4e5fe132c73d4520ac7061deb0e24d86520936e6ed6b63845 SHA512 d1717086c3d429838c88ad276d3bebda858fb4afafff46a204cf252685d9c7f1e2b15916f3cf7f8c03fd54e68d2d1c3ecb64e9d73975ebe9ae188039f0aa4570
@@ -432,12 +470,15 @@ DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod 29 BLAKE2B 8efd6f
DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip 9901 BLAKE2B 0c8cf7ad0809f65d91b9ad5b27759cfedc5efc25194f19effd4b19c35c940461a48a57636ef3c707b27ac614b693ea05830bdef6943f11993bf561ef558cb99d SHA512 08b7201a9aa3294a3fc59bec78fee09f0d1bc7507b50b1d1cb1fa29a523c6870d00b633ea9679c9c86df9841739f46e9d5d9bbf0e3ec15b8ad08e57db67eedc0
DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc
DIST github.com%2Fjustinas%2Fnosurf%2F@v%2Fv1.1.0.mod 43 BLAKE2B c46a08f2554306747a47fccf4319dd74d0e859441911fe99c0dd7c747391c7b96721e82e5b0047dbcf74c9f6544e1ce17b2d9b28c20fde0ea24d9e82a5130049 SHA512 91521b7af79fb614019b2e6add5c3dfb5560a446ae366f552d95ee1cad09b2a6f121b142fc452ff55584917479ff2949896c0a1729f3a03841a65c804e0bc3e7
+DIST github.com%2Fkevinburke%2Fssh_config%2F@v%2Fv0.0.0-20190725054713-01f96b0aa0cd.mod 40 BLAKE2B fcc716fd56980eec2613156eac1c731cd653369416946bf532a2ac27df56a894cd6dcdbaee1f55d6b9bf2b7215cf21c6beae58404e55fa71a666b9958e69f7c5 SHA512 208caa4a93b3f365428dbd324ac42ca09f073c4028e06427c75a1883100eb1de0031aed9a63eb283742efc0d64e7abe644000829e704891362f59dd32da40b45
DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod 143 BLAKE2B 128f8934f81d0e497e1258ec65129fe5d8831b66058669a5aef3fdb2fbe5f6d8ab30bfe97a1de7befadd34aafd55d6d15bb787e8948fb7718761392817203874 SHA512 c5e546822036a7114a29454e28290f8e1082392a47a101fb1d370e0969fc2c83186b4487473f903dd638abb8a763ce3180dc87993906895a2df33db7d8bc4790
DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod 98 BLAKE2B b9d3c55999054ed927f666a43066ccc6758a6c5f550651f43ad5d85b5403c882ee76ac2b2553803d71789da33c60ea41857ed545003072ab6c666dbb77118e00 SHA512 3529b37d770af511a716a612b7fd7fb6a4805d13166e3a6f9378950443f6eceb2f3d95db5a46027437ce55b36e571c75bba72a03769d21ecdc97888019d80a68
DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9
DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.8.2.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec
DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.3-0.20191122130757-c099ac9f21dd.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec
DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.3-0.20191122130757-c099ac9f21dd.zip 15268424 BLAKE2B 948489d5e2c6235370c1bdaa1e105047dcc470e316734f148e1dce6b6baca421f215495e6dfd29105f478390599d4334e8078cc2b2933a67d3871ad5ad9acdb9 SHA512 4b5265db6d4383f085a67be3422bf3f18b1703a123e0d4329e44230d73a5fdbf8f46c606cefcaab880263f95bf07b6c3830d8b82cd906516b5c0d29a7d430bad
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.8.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.9.8.zip 16194359 BLAKE2B da3b081970f666c910de17fb8f959d1c52e7d92b64973b98954b816aef77629014d00eac2a064cbd32b4d4f40581cad8ffd37861c33fa8df31348cd21b320807 SHA512 2157dbd3094aaf49f560c066c6a84314141964ca72425187ff0647f03a033b33234530027879df08055dbff9d58ae365f467f5c1572d33cf0bce1edbe3910e16
DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip 3968 BLAKE2B 223cfe3604cb674a11d4558b8f5a35e2eb41cf11d536e2e2cbdccd6a3c6bed8abf66f450774b39e7247493ea8a382906617c5f297fda02a272b18eef8dcbcf47 SHA512 16c4bf83b78541d2d684113926813ce4cc91f3f13f34dc2cf8d643661dc9f21a988b8382d2c058e138fc87c1ca197e8f694b07595959e917c82bd6ca9101a5ec
@@ -445,7 +486,10 @@ DIST github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod 28 B
DIST github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.zip 9142 BLAKE2B 0db0e9a6ba33fd156c75943cce1b95385e53593d7f6957f0e6375b38625e1ee60a86b80229ce6cf0ee33de603fb0788892d0a3c3cd20a6969c1acca2521953da SHA512 5e493f08d6a45e8e12160b8c51eb380156ba1d2382523e1be159fa16d15d7ac32c8bbf2861e74791a0fdaa06155e95ad12b5f4999515a9a69dad1384ebbdfad0
DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip 11159 BLAKE2B c176e4bc9b5534b0df153e027f22be7d28eefbea1c0adab10979f19d601b95d300c54086b5ee388f453c73b9931339b9b04208fc5e6512385b348c49faff5488 SHA512 bad73f3c47f70de55a90a977a1e2b4a68de545a8425c71533de081c7a8f71d7ab1b489001c56ba2e88dcb78c08804275f7f8128c812f50d005a074ed6dd9286f
+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%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
+DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.8.mod 72 BLAKE2B 796a88b0b7d88f469e90e59f66d12a3c515e0230eb2a7ec83f00f5266266d93eea475b752677f2ec81a7c99243a5034ec1a2e9f4e23a83b61bfe6e855246b6d3 SHA512 9c13eb40018d27bb2f5623251df11cee7b8c08eaee681b4678f854d7c023bfd3885bf04ae085183c7501e637d86386a00e3a979088aaf2c37a03f732d7655a5a
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
DIST github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.mod 46 BLAKE2B 1989fd1b186328abc02f8dcd503bf396ee63b55630d3f37f576c7e55b4c48623f62d5f2b16d047afeaa13cd423ab014f254df5f210da52535bb8818a60b375d4 SHA512 4fcffc595708aba2673e895182e695e91d6d239f8feaaaeaf15d75fcff398112af0f0d5ebdb28506d95eae30533dcbb54112ac0b0a4034ee11d7a35b78674915
@@ -479,6 +523,7 @@ DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.15.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0
DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.15.zip 210715 BLAKE2B 246ffa14da7608d3f1b0dd2969b2ac4e3f0b62fbc5060ae3e7f39d8ce5cf40d17b2c074021205513c068b33607f108f887a9cfb42b5d9f013b642e70ef85158a SHA512 c7084476120e931394480ea1ef2d4df157500e89f5e5e2fcb05329e5439bb15c99d70a2566400bb74e419984ead7197809ec6cce16c624ac42b8cfff0e222d5a
DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip 4163 BLAKE2B 7e00360086a04fb62a46ba20a10ac3460b364aa6ee09bf46f9769980c086db04aad45c4cbaa809a218f207c086876678d708a74d0a7679a48cf62b0b5edd48b7 SHA512 06bd620730c303df004e1d6a06a1aab8d83551d594c28e42f8d43613153ac28e6a5dcffaede69c84b2b49027b62581851a332f1397a2d6df9a46078510f7d1e2
+DIST github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod 40 BLAKE2B 089a3d8f85648feb04c692c4e108e1e843217ef67fb3d5c00ffec847c06eeae55a9432c206753cb220595441da76b635f33a9812ca92f04959b4e7dd08644abb SHA512 e8e4f318e3cc6d203ccc62c0b47af2aebee3fb99680cd6bd24af023442154ffa9c3d4bcf9064af5220f01d3cee71e7c600e465e3651ae0d7d15e2abee1caed27
DIST github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.mod 121 BLAKE2B 1bcc532c14adaa320767f5d35d1493bfc9a6cf1404bb1ad7c5f5c7fc940b529ec6afa0effdc757aa20640b601b11fffd9f0ca07e1b3ca2cd5128717b9fabb5ce SHA512 a0cc03f0157608eb5e9a26c6496d60446de5493c66d81b2fb7c20c6c029db2e4a9026d22c77c2906e1995d4ed2abf3b353c7bdf34cefd4e57d94499fe159efe3
DIST github.com%2Fmitchellh%2Fgox%2F@v%2Fv1.0.1.zip 23850 BLAKE2B 4cba89eb304fabbe0fb2e5108f0385b28b32e9a18daf7b766f1446a051948abaa4412bf9a17a7d6ca44d9315c47fb5c509856eaa0675263b916dd0b2accdf694 SHA512 6fb395119184b78061f3517739e05a3ecd98d8dae3f790a1e52563a3e10f9aecaa6a65dcf2fb52a8aae6ad27ad8939d2446a47ee66a866bf72a866f8eead6436
DIST github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170116052023-ab25296c0f51.mod 42 BLAKE2B 8ffe9f17b9bfd55d7f3b44a0571132809a2d18960cad73780b88d31a723fb380b82c2c3952030a0bb4802929b625583e8aec8875c36a2720c0135ed8b59fe4d1 SHA512 414c86e4d26a8cd2f215353f04ca7ba0eaa17af36e3d3708164cb3698b8d198355bc7bf57897fb9d96cfa822ed50681a18157540a752998060c1549348791755
@@ -499,6 +544,8 @@ DIST github.com%2Fmorikuni%2Faec%2F@v%2Fv1.0.0.zip 56868 BLAKE2B 7795586966a72a5
DIST github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod 36 BLAKE2B 636b2a1011ff647b1597c535916bdde712e45585b9be3e90191d474e88e293df5b30e2e15adbd2f6d631a57ac81b59b02055b439390664fbc8a8e224cfc51e39 SHA512 7873fe200c30b46285fa8a001345428db580c67cf634c1b1e4aef6a4a82d7b975545b827d00b1a3dad86b2f3f7681df739915f95144d4d3a3553f055fa70781a
DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod 39 BLAKE2B 391eaf696f1a5c764f9e156ae3f6285ae5bf8a4abf2a735fd13fd1591f3bb97737502b79df093156305503ed4b63e0d458900e61fa8717f96ee17a6d43bc2f79 SHA512 9fccb6717f5b37cff2d858cc31f7e16aed120a67498c2f0d24aa30ffac4eba2e87822b12d62f700a0c62d7561708bab2e13e35e89cf5407cfb06a0de5c70808b
DIST github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod 34 BLAKE2B 315fe4d5620c1d1c92df3fd382560ac2cf164aa17a741c1a74fc25807819de811705467227923fee7f804c6b6e96606c87b4adb11a6b722f367b543c2792cda0 SHA512 b1c163d7a6a139eeee1457fa07933f01eaf6d2ff24d10385e75f87b443a95fe1b08e9e144d3c18eb6a77d34e8521cc6dbd486fefe908e60452c5a80f654c551a
+DIST github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod 29 BLAKE2B f74d75a495f683f4e9047201721611229ecddc37ed01b5d4b5d81a06220a6385f06d0f99e514bf19cc2030fbdba6de3a08fd38b750e6651a822b10bf69c45327 SHA512 b426d975637bd2b4dddc10d7c88b70f8b946201f311859f22520d53ae0a2d9911ab358460c089771f7900d7a8740bbc0c6d3814ab8f955108fc31b7b602ab5cf
+DIST github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.zip 21676 BLAKE2B e526b9b4942340554bbdd07d83f4cb9678348c600793658644deeb1c64880d420fac1a95002cfd846e7c24d5aa5b1768b5bb1f71a1aed5e44e3755fe2a7c80c0 SHA512 6e24127bb86e9a0990567541b268c9ffb3a91d9cbb379b59b5120ed7f34d6e7f5f32b9efcbbe17553466fc07c06d34017644d7f751775b734b186af1e94d9629
DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.zip 243243 BLAKE2B ab663a1a0cbe337fee8b519154c18aeb568da73186d92e7cb122650e68aa22a728c04b91992660a8626c78be5e5550f1538611718052348a2a760ad040191ef2 SHA512 9269de68436cafd9f729f88cc0b8775ff2e94a7ac17f691c4eaf8e2645808558797937b8f1de857122daf2e31ac2a2c13d5264085360530b3ed09bba40f5081f
@@ -527,9 +574,12 @@ DIST github.com%2Fopencontainers%2Fruntime-spec%2F@v%2Fv1.0.1.mod 46 BLAKE2B b95
DIST github.com%2Fopencontainers%2Fruntime-tools%2F@v%2Fv0.0.0-20181011054405-1d69bd0f9c39.mod 47 BLAKE2B 0eda9805fe0e1acdcc1e7b2693e72e39ea416cf57a108b1847491e1f15f8a7965c8aaa77baad1ae6148f39d36b1fc5fcf159b54111bee0d20bf2fe8edfdf85e2 SHA512 4e53e67b276ea3fe8a3977bbe72758bb2f844e22cdc3e23994176821cea51b10f5e802ca3db848a8b3d00a146c133a89271ee76158c478683b393682806400de
DIST github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.mod 34 BLAKE2B 24e5a5c0bd31053b54c98d3a593c6c82cc8a0136234a90981004ca7f40e1eeca392b56d80ede7407a49f8c666cfffa4407d0ba0d7c09a42dbe8a9773f1613d0c SHA512 a0744e73669284e544d60a9b3c9449ce074cae579583410ff0879571e0cc57a7784e30938a8dc56c08b8f5b87fb0c0df3ad477b0c3543f3bd221b6f3a2f282b9
DIST github.com%2Foxtoacart%2Fbpool%2F@v%2Fv0.0.0-20150712133111-4e1c5567d7c2.zip 10165 BLAKE2B 7208b851d5b38607aaf215d3076130dda5208b8c54a7ae8ceb8232011b2c802e8d3034ace2d91c2e5f1e085068ad8dcbe53eb653674255d3a727dca92cd14dd8 SHA512 0fe3bcb22a1a3485e64df4bb6fcfe619a8544bd1e245ca755a0a4b1db2fbaa39411f4fc2e5d3373538b66eec805a3df208103ef813ebd94494dabde52d5683da
+DIST github.com%2Fpelletier%2Fgo-buffruneio%2F@v%2Fv0.2.0.mod 42 BLAKE2B 26e88451ad5d521cc8f48a08c91f2fd3fe6dc2e2ea084cb0012f25d8399f0e43329de5e96fd741255d910cf5a2146d3568718249980876c816a67f79e8b3290e SHA512 9f82f0d4d467420830ab8fb80ff97215e5fb47653b48d88304a6effdecabfc735f55dba9959319014ba943b2cbd27394ce86ebfba8a6d068c9c3d368f6b0cdfe
DIST github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod 37 BLAKE2B a52c6a0304ea7026657d40ff685f37799d37cf3b05a87b15336eb05eb8a12d8749cd73d8cc3228ba2a80ce1e489a3029617ecf301dbd51c7f5dc7630dc114801 SHA512 df531789f1495979faa830433a34e38996cd919757f0191b31b862a9e9dd48be68179e291416876cb31083dec78337abf6bee92c68cff38630aaa456cd3cf052
DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.2.6+incompatible.mod 30 BLAKE2B 007bbbe9dc603d92170e1aa89946c3df382b73e60a01f247ff3c28c56eec5c06b1f901cd3f52a81ed967949436fe0d2a7b4dc70088dbb38de97705967f127aa3 SHA512 e3f6142da79fb97efb98b7bac49f4fdcc16f2c59b40ac87ca98b633874bac81105a0bcff20045bed75d39ba3922093102f9e74462356d6dda6147f6be4d31703
DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.2.6+incompatible.zip 20567035 BLAKE2B fc4282618ff1d2d426080e969b1645fd4c8ca72464438fdd2a63feac6743ca15b0522ac6e2e069ebf5c0cbda2b43618253ecf17f271daafc61f03b2aee9f51df SHA512 7c218059eaeb85ef6313c5ea25c9c0118daae8d2795094a3046a020029aa53ce0a55b688fbc9b70999c8c1d93e1d6e11f4977b871e7b3f5cfd2b3aecbac4f97b
+DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.4.1+incompatible.mod 30 BLAKE2B 007bbbe9dc603d92170e1aa89946c3df382b73e60a01f247ff3c28c56eec5c06b1f901cd3f52a81ed967949436fe0d2a7b4dc70088dbb38de97705967f127aa3 SHA512 e3f6142da79fb97efb98b7bac49f4fdcc16f2c59b40ac87ca98b633874bac81105a0bcff20045bed75d39ba3922093102f9e74462356d6dda6147f6be4d31703
+DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.4.1+incompatible.zip 20573196 BLAKE2B e04cea4ab317118a9a854ea34a7e907f5be268ece8ce552507b18151aef74a30d2a087a48ab1657eae38f79f015542fcc3cd9cac1237d4d2b1411fe2bfa97788 SHA512 5e9b1485713572250b69adf2b826eb40ff65851914452511df818dc1785063b2816d19397bea3d4d581c966d1c0c1aad27750e0ddb4fb0affb1b43f21c76ce47
DIST github.com%2Fpierrre%2Fgotestcover%2F@v%2Fv0.0.0-20160113212533-7b94f124d338.mod 38 BLAKE2B b26ee235ee877e67b605670a1a041cad6e320058c454816089083ae602be967006955b4f38f23927a495b09d2f71f3e3796a5269ab46587e3047d8150a6f3a57 SHA512 b32caefeba4ead78cb310946d4f8bda2d76eda17913aaf8cdffaa9db41300b5741a759be069f60def0e4ab1bfb1d6505bf3ca9375e80b77897e4419a933ccb11
DIST github.com%2Fpierrre%2Fgotestcover%2F@v%2Fv0.0.0-20160113212533-7b94f124d338.zip 5506 BLAKE2B 955d71140c6a3780dff928c4f1f27ad1f016ae2e467b773b77891350212c1b2f449d8872ccb7b2503a4c02cc020f78510ad612f02c99310db0f0c36223d423c9 SHA512 2d60ab410169bccd8196b5b352240232479ebef3fad2b1565208c33873eb6633cefabc7c091816d2b228caee64cca7900a26ef9409162913e0723dbaebd44aff
DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
@@ -556,6 +606,8 @@ DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.mod 857 BLAKE2B 4c4486d3772b
DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.7.0.zip 153651 BLAKE2B ebff467e946cc220ee1bca6fb5507030a080b34be93ae6e5bcef4ef4c9069d19ceb542af6770a620bbf79b65f970898eb536d928d5140cb1de7a57c9f2cd5a57 SHA512 c90a315ff9dc3c8f4e0f1e392a2e23789417e291e5794a506b94d04c5591da529bd379158f9d4d02e9336e4c2336d0d8c68c2db59e89a7b390e11f212a92113f
DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190425082905-87a4384529e0.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.11.mod 198 BLAKE2B 9b5c175c915db6a1fdf18f440acf348e395fd2059e1f44fb1fd556e7c2c6821cfa397f88d2123f681b41fe5c5689ebc58c7c75865ef63f7f1c61fd8d323d8117 SHA512 7a54bddb87350ba24423842fcf1cd8b031be427e9f689467503d8d6a876691b209a5d2ac33d848a977d2c3890284d816fe4f2fa9391642010c96c3c0d691efcb
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.11.zip 227473 BLAKE2B bdeb96bffbcd6325a6f3fdc12aa6cdb1c4bd220f966018b44a575e4a681eeb37439cd4f1d6282abbdba527d9d7a2e2efbb4f53c52f963f5301c40ee7c1fe3b1b SHA512 bbba84a1d05a97a82543b60e3eb35e36e504c05ffa11008b9fcc9a6cd252f05bae419c8d3a18f875b136f9200de8925e18e16bd30b7f727b6c85e35d9adf9a0b
DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.3.mod 136 BLAKE2B 49b2b47ca2cb64a1522a3719c1b46dc6f44d3122d3a05ea475dab88e89336aae3f396082f4de0f89400a0e8db85208446582a226238a701fb92c155a2e85fef8 SHA512 fbbbd57eff765585e67074e5c278d7d3077289c3d13c306147d6c3efb98232ff317ad92464ba768fc3d921b4a09cb3f3ff5c5480c89a01ec821bc86e5dca82f1
DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.5.mod 136 BLAKE2B 49b2b47ca2cb64a1522a3719c1b46dc6f44d3122d3a05ea475dab88e89336aae3f396082f4de0f89400a0e8db85208446582a226238a701fb92c155a2e85fef8 SHA512 fbbbd57eff765585e67074e5c278d7d3077289c3d13c306147d6c3efb98232ff317ad92464ba768fc3d921b4a09cb3f3ff5c5480c89a01ec821bc86e5dca82f1
@@ -566,6 +618,8 @@ DIST github.com%2Fprometheus%2Fprometheus%2F@v%2Fv2.5.0+incompatible.zip 1301042
DIST github.com%2Frakyll%2Fstatik%2F@v%2Fv0.1.6.mod 32 BLAKE2B fa3ddb522edba85e62f1f7913ef7230f7f4907bc350a0ee1cc570c73954774baa539b6110941697019d13198bc8cc01a7cb833a6235c8588f86351d4c5643943 SHA512 b9df57a2659d47107fd678dc36e262bc4c796c7ddf38cc6887423a645e4feef2f9d7cbf4070e8635114b754df57c3157c6b8734dc1631af02f848e599326f194
DIST github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.mod 38 BLAKE2B 091e64943724001796bfb662a26443a681d4db705219a1d7601c350b94105caa1584c62a4befd1aa0c634268867c84bacc79e235d5a8b416f6a8aa8e12192261 SHA512 f22213d29e8a0914fc947e08d8c85dbcab835cd7587e45cf5458a1cff074359fcb187ab47bdfd933c8937e393975a29e872b744ad61295fb1dee3783877e81df
DIST github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.zip 57982 BLAKE2B 07c3ac2d98a119485695f6b96c4aae0bca36a305cd38e90f40afeae5746fcf0f78c0f389930b28184ab9ed6750746bea8939ffb8d569b0ef3552a3c3c0eada35 SHA512 0502f433987c5a02ae81f156f4b2916b6de0ac2f3e55a2117ccad7ecf94dc25a8bf952fd70bb7d37b82cc8302280c92f70b94606c8c2d125e505669a72e2e7b6
+DIST github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20190826022208-cac0b30c2563.mod 38 BLAKE2B 091e64943724001796bfb662a26443a681d4db705219a1d7601c350b94105caa1584c62a4befd1aa0c634268867c84bacc79e235d5a8b416f6a8aa8e12192261 SHA512 f22213d29e8a0914fc947e08d8c85dbcab835cd7587e45cf5458a1cff074359fcb187ab47bdfd933c8937e393975a29e872b744ad61295fb1dee3783877e81df
+DIST github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20190826022208-cac0b30c2563.zip 58836 BLAKE2B bd86e85253270f67c6e52406532482d6ff8a702fb2f8bb4ccceaa41b3e3854f65c829e225b954275dc176e632112b4ef6ae7c326bf1c40c5ea16f829b2b9c770 SHA512 25f0432ea5260dfb79909b2f522de492b726f1a7d450d5ba90f56d3abd0202b712cbede6acc628eed08d23dd5eb1741724e3920c02b3299a7378eb3df8dccbfc
DIST github.com%2Freviewdog%2Ferrorformat%2F@v%2Fv0.0.0-20200109134752-8983be9bc7dd.mod 129 BLAKE2B 89da2797324d72bea586d45da407611d9997c997dbd892f18b5cdeaf1cf2d32caa2d566e71a963284feaf1958daa9f0ee7b6598f9d2286a554dd9c3237423f1f SHA512 7dfa7e8953f8e9cda777fcdf81323f5425fc50aa33dc627e63336ea91fcccb1678a28f58507394a49ec1ac2e6b68e94bd72172a8e237a98c6a2217505dc88078
DIST github.com%2Freviewdog%2Ferrorformat%2F@v%2Fv0.0.0-20200109134752-8983be9bc7dd.zip 79853 BLAKE2B 9b134753179317e6e1b83e4b5520c62e91b28e20a1f675854ffaecc1f647a080ff46f538ba570f241b925cb00da9c4dffde7cd202e691837796dde5192551be2 SHA512 f2ba014a864e4ae627c4900cb3db756a65a83ac71c60f251ac41d760bf4b023ebc5061a53727cd4e9f99bebc860509343827905b696875dc3d7d3e2960676623
DIST github.com%2Freviewdog%2Freviewdog%2F@v%2Fv0.9.17.mod 832 BLAKE2B e1e259107572cdcc9195ebe81ad847e4d0b5195548fa26e2cd7712750048008aca4ca9ac2c2be09ff30aa3d137c4877e3151d9a261004305ece525ec172ff377 SHA512 66f2cd49acb19d048c1f007f416fd912dc372c16a6510f0521422f4ce4c6d766d357cee1bf6259cd47fd947f6c886ceb9a76cfcd0bf594d3f84abbcf4eed81b4
@@ -581,6 +635,9 @@ DIST github.com%2Fsanathkr%2Fgo-yaml%2F@v%2Fv0.0.0-20170819195128-ed9d249f429b.z
DIST github.com%2Fsanathkr%2Fyaml%2F@v%2Fv0.0.0-20170819201035-0056894fa522.mod 32 BLAKE2B ef947c59ffe55c03dabba1279013c3c5dbd92ddd3234a81d256078ead3459bba6b7779caccec4abe9f830c82e935784db7865e45a847b16670d9b19f7d4b42de SHA512 a3c0f7efb604607d6a0ca4578a673de82b43edcfaf8113ccdafdd7af464eb54c9cfe9b0d503626cde3e97a3a0db4892788570f125b0df5d8a62aa012099b4e9a
DIST github.com%2Fsanathkr%2Fyaml%2F@v%2Fv1.0.1-0.20170819201035-0056894fa522.mod 32 BLAKE2B ef947c59ffe55c03dabba1279013c3c5dbd92ddd3234a81d256078ead3459bba6b7779caccec4abe9f830c82e935784db7865e45a847b16670d9b19f7d4b42de SHA512 a3c0f7efb604607d6a0ca4578a673de82b43edcfaf8113ccdafdd7af464eb54c9cfe9b0d503626cde3e97a3a0db4892788570f125b0df5d8a62aa012099b4e9a
DIST github.com%2Fsanathkr%2Fyaml%2F@v%2Fv1.0.1-0.20170819201035-0056894fa522.zip 13891 BLAKE2B ac687dec8226be04724eb88c59291d854834902e79601e0b2c1d79f93b7531b2e3c7a7317465985e516576dc359da3b770f4f795843d5a94f9738eb3f1bd97c7 SHA512 af0684e256140fbaa73427cc3cbcc6e78d6487be5cc09299e9a199b8e1fac558de1c88218da5202b86d5e084b10075142814316b3694050c46a7240d5401ba84
+DIST github.com%2Fsanthosh-tekuri%2Fjsonschema%2F@v%2Fv1.2.4.mod 45 BLAKE2B b26b031c30538098db1e5849e987165b22e5d0103265998376b2c2d7e4bcecf49a847cc4af351009a2e25ea17a341de5f3da39cf2ef15e59911afbd0dca8ee8c SHA512 2a16dacaac95b89c853091592dca7209ec8f89a4c9eed036bc81c66c490b966a5a9971b5797bafd9c8b5970b4aed37f05cbbc7b20e5b21e8f483e0f2e9390db2
+DIST github.com%2Fsanthosh-tekuri%2Fjsonschema%2F@v%2Fv1.2.4.zip 119814 BLAKE2B 0ff2e46136165346645d60e4545d7cf42df10df31e9952553d7b6551e97a5266f7cb5278813c3b77e1a4de1d618995536128e60e52e608a6ac253d5cef772070 SHA512 8248d0ea5f4be358670e0b336d2371eda6d25b5e9336149ec19135d499e26dc5576bcf64030d12b8c07c1f7f0eaf0083b8b3275076923872af8e1b0da8befb99
+DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod 32 BLAKE2B 9c0be7f17fe7a9156f124f7f67c3e15e14719d0b271f36d5d41ccfa5ff6c1b7887e0051df6eb3b29f29b40357d8e438598088b3c4f4df28fb81f030c8efa7ff3 SHA512 8b8b8958405a188b93adcdda0634aaa2961b5b8e0d3b3e1f768fb9c49c02b73cf3bb39027431e0c1d209abea6cb72a651c5776bf26391e81f4dc18c7bafa692c
DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.19.11+incompatible.mod 34 BLAKE2B 790ec7277e4654961540dd09fcb7962328547009b0181183b7cb64972b872d30986d1e53ded5961588d89508c913b2b56dd7af3625d0e8d7be2253b6bcf59576 SHA512 a5f5d88a767a855b6ff24d7e2e0c4aeb81fb1365a7e81ed989b4c605a7a6c61dc52d7ce97fc672c21020ef56f597dce679184e5e8d3d199678487e6bebaa8127
DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv2.19.11+incompatible.zip 221848 BLAKE2B 27b3ba82670265086a538cce5cc80395360ee9fa8818ba3de5c9ed974ff7ceefde590df80cdd152485cf3a230b77d92e02a3bc67c0d785ed460eeda9283ae576 SHA512 b763ea558c2bb412a89a65502556ea7d2675c73e4e6289e3c05985e414c8a80fe2e9d25b3f99d38a0ccfd636e5cb68fac31643c56d5408dce394b7afa15c5e6e
DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.4-0.20170822132746-89742aefa4b2.mod 34 BLAKE2B 9ff118e3db6f2a49d8cef81bbb78af4ae29fbcf97955758c08c4a9a610fa66f1f6da80dec5aff3c657bbbdf1fd5330331e58dc46c2b2bb657438ec0879a3c45f SHA512 186b34d707aaf1557ddc8edaf49fbc559024f454bd560ca8451cfa555abc211cccf861aea94018363547e39140d9e507c97f7a3c87bb9f1e5d444bab4c531e36
@@ -601,33 +658,50 @@ DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1-0.20171106142849-4c012f6dcd95.mod
DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip 74638 BLAKE2B 0e9d2a40aa6e68cae69ae24f76385e840e0b53b2a4afcf89ac5ea61ee144462c113dde938c5de728c8e54e7e46dc099786ce85020bdd60859e1ac04393556246 SHA512 c33aa1ac5cf2a8441bc849a49b65a614de6c9e0c5d37a77f0b6972bdd8f25a651752743b1172e0a83fdbb384aa7e8b0685af5c5dad1bc128310c60e13cc9b56d
+DIST github.com%2Fsrc-d%2Fgcfg%2F@v%2Fv1.4.0.mod 29 BLAKE2B b5d4003e44ee3e61a72146f100f7d669aac7047b096fdaf549194cde409e0ca927af590140e4344f57e77e2db5aa16e92055e3ef2edcb73c8616ddb0edf6c62c SHA512 59c1f5827727d54b89814acef7026a976343019b58d7c673b853382e661b72231e04e251c60377f8bfbaab0bd6768cb8144dc18f1fb207b6fbfd3d5534dea160
DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.2-0.20180702103455-b8b73a35e983.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.2-0.20180702103455-b8b73a35e983.zip 43759 BLAKE2B e8e94e38cabf87136a09e900563fbf3bc35563788df16aaf34092ff94fa6f9e046a7f19dbf1d224970239ae7293c824b480569b6629446e0bccd5edc7a53639e SHA512 3f3aefa8b21ac5403b6fe6e142253383c4657bee4b57c98ec2b7a6bdf922244450a97ef0353ac60cad9ada75b612c3e135d76c3235246eaa87f30359a225c878
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod 137 BLAKE2B 47195334e42f0997d96b50b8364764426301d31cc7fbc289b89b173b877d54cc67133b07d4a21e6ecdfa2e4404a9cff32f06b53cfa9493e075ee2ff2cc46e605 SHA512 02d0b2b1df84750ad3d15f4b86b3f7989a22007e27b28e7b3a4d34b26ec7ccbaa5d48ac0032ad692bf7db150e101cabdc050b0aa1697cfb20f922c88b9f086b8
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.zip 42547 BLAKE2B af3f81b3947f0802a6542c60db0248aebac9521d75d0d991f76b5783f4eeb42f7902250cd22da1b8fcfc2f150342ffff53260276b7a6903c092febbe66f40ace SHA512 b21cdcb8683760280e515ae487e17b65b324b51dbdb36c6380ec0b272699297d388a34b1a6aac281b1aa149d85ca81640850e1fa0d84bf63f3dc67b794baa249
DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv0.0.0-20151208002404-e3a8ff8ce365.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
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.0.mod 188 BLAKE2B e47d78f037db3684a329905985b02b7ddf0a609ab4c69dd4346202ed0981712d54d0fa1b9c230b50d1857854edbbf77ee144d54b12c7c46833e6542d6034171e SHA512 70adf6a86dc6f934ee611f6aefa459f1287b7294297eb9221a747427d031b10c3e606696a656be4c2746a25480c322106099ea2bb360cbe782f4d03c85cd9fcb
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.0.zip 92066 BLAKE2B bc321a8dde64189df65fef0a931a54a1c8dce62de17b011149c1f78a3db2c6bc50e0694c4dac2bb77291dda45fdaaca68901f5a6a584cf8b78117231c2a417ae SHA512 f40c1d8fc0c0edd78abec113f71601ccbc6a320e7eceb9ded2e6a047a05c9ad54bfdd7aea3f476fb10983b92e5d0fdf3cc716b93ad5a93793f40dc3d830c8d28
DIST github.com%2Fsyndtr%2Fgocapability%2F@v%2Fv0.0.0-20170704070218-db04d3cc01c8.mod 38 BLAKE2B eafcc0e8c3633f2d4c2cb4eeb38eacdb7d029944b76da9ee611b3fd2d3b82d2adfb726405168a34f70251be920da17fdc6c70e8052720a6093c788dd724d24b3 SHA512 1efa76d27434ede74fd37d57c1673c8a60cf06248a73c425b5bd08dd068d6b50166b17a15b52d0c059218479fa3976e80e16cba08f671e9ecf7744cf5daa199c
DIST github.com%2Ftsg%2Fgo-daemon%2F@v%2Fv0.0.0-20200207173439-e704b93fd89b.mod 41 BLAKE2B 1cdef4ea755c26327e7bca09e21cec2bf3999c60d52f997fa5a907afa146535c65c921647cc777ed780e2da71c11d29156039bef93cb8480c38a2e88f5e8f6ef SHA512 395ceaf025ef072181eaee098cf6645e300752ad79623e6bfdce86380bbbddf9e1b870a10309b746bfe0dd6a6f63bdc789f482c9577019a0a124c78c73043fac
DIST github.com%2Ftsg%2Fgo-daemon%2F@v%2Fv0.0.0-20200207173439-e704b93fd89b.zip 12625 BLAKE2B c85dca7f514c95e22a23df6236b327283dd2fa11ef05b0af19c38bb4548e184313ce3389347e41d51a696d8dfc484854514ed602b1351443ebb7f4e20e6bc262 SHA512 4e492d8404e644e26bbb9e4933595f008276de306a143332c4dfd60b3d2f3fac4c725190e23673c0b995dd9fbf01d289f56cecbf56b12143205f8e9e1c8ca449
DIST github.com%2Ftsg%2Fgopacket%2F@v%2Fv0.0.0-20190320122513-dd3d0e41124a.mod 31 BLAKE2B f0a3620501ae28c986a7b1bb5ac6726a807f9b4173129036b72f1a44290fa6e5d59fc66d61d9fa554a4227a91c4d001733d341a7b2165b03a67e528c3b4af822 SHA512 ff7217008312f36684c8c655ea39e67d4efbaf44edbd73d15551649a3647a543fe4f493312c32f0e8f8a3ae9e23b3c9c0820767fa518e3a9dc2aa0cdd5930bbc
DIST github.com%2Ftsg%2Fgopacket%2F@v%2Fv0.0.0-20190320122513-dd3d0e41124a.zip 665575 BLAKE2B dbc70781128df28ae9ac6b49f9994a0835a645df593233f7dc4e6cb8be23fe055cd7f1e1466c3a2568d311ffb851ccdac63f81b6e68db8f9a9462cbd2c67a99e SHA512 8f4fea74a9b399a1eb923ed7e724381e47b529ca1c6c041143a8f3f22936ff6f80bd7e15b29c85013da37c5add084ad3af687454e92bf492047c3f4e7dcd1660
DIST github.com%2Furfave%2Fcli%2F@v%2Fv0.0.0-20171014202726-7bc6a0acffa5.mod 29 BLAKE2B 4f20ac8fb7beef2b678cff290a28c8125d368504aebfcde33e746d3ca7b9606804bd94c59c50fe328da4c1c592b8768b1aad89bc1d22ddf76cbc88d0f0f76b74 SHA512 5edcf2aac39658fc7e60d5086b066470c6d6213b66a2432bc35c6f67b8cb37a66a67fd97cdd4b8fa1b8b1bddfd544e4aa9838cec06806b89f8e1447e3c61bd2a
+DIST github.com%2Furso%2Fdiag%2F@v%2Fv0.0.0-20200125202105-ffdc32ff5518.mod 78 BLAKE2B c50261cc483c6bd82c7a8641696349b4d490c01ef2481aa0c3b5788f9b1c64ecb0c6d75af90ed99dd6e0f2f7946866c81a35731d73224218d5a8057e75864c52 SHA512 66523469a357b8bb9d8b0cda3eedfd0701cf20936974f0a4078fccf2c1eae97eebc77f591a71a2c808ddc5b265500ea77927debb1f74ffe5966eb67c98efee8d
+DIST github.com%2Furso%2Fdiag%2F@v%2Fv0.0.0-20200210123136-21b3cc8eb797.mod 78 BLAKE2B c50261cc483c6bd82c7a8641696349b4d490c01ef2481aa0c3b5788f9b1c64ecb0c6d75af90ed99dd6e0f2f7946866c81a35731d73224218d5a8057e75864c52 SHA512 66523469a357b8bb9d8b0cda3eedfd0701cf20936974f0a4078fccf2c1eae97eebc77f591a71a2c808ddc5b265500ea77927debb1f74ffe5966eb67c98efee8d
+DIST github.com%2Furso%2Fdiag%2F@v%2Fv0.0.0-20200210123136-21b3cc8eb797.zip 45499 BLAKE2B da611c24b4f8ac9b5a5dcd44a9dc6f6b7f9151792f12168f893c38b556d208e709288ef2de96dbf12679f2dd1f61dfbfb38d7d7eeec1d7950eef699af29b1dd5 SHA512 7835c8212dca285d794b1ab29970f29045c957c332ec3e0063964766ab2c42efc89a0951276a633d93773c4799012e3104f55dc8fa773244ea3b64528e8f8eaf
+DIST github.com%2Furso%2Fdiag-ecs%2F@v%2Fv0.0.0-20200210114345-ab085841dcb9.mod 306 BLAKE2B c76617f0e9ec0a42ca37b856fd579e8b6c859b70eb7a07b53332e88d1ac8e07217878826e560edf876e0554d0af92a27e2c53e21b88b80a2cca7bb10ed81a7af SHA512 ccbb2bbea15594c0001bb949e4ed5da08fb55964a0bcf6c8119175e0fa5ec02cf7ccaad8dace4d25a7bd22a7e43e168924d812faed693517d7c45f3ee0e7ea3f
+DIST github.com%2Furso%2Fdiag-ecs%2F@v%2Fv0.0.0-20200210114345-ab085841dcb9.zip 41448 BLAKE2B 0b6d97501e76d00bcde115840db1bc931192e2535f1a68d14ab68e1f9232ad9848b99f4c6cf706ae46e73739c01b70b03e4b569750f47f2230839e84f71b1373 SHA512 7a2ac4b6b52925379048afe2f72b9919be7add7ac57206fe9964e3806d269644d69235d097459c6cfdbcb46a6679b5bc967b2aef65ef37972c15df4bba18a3a7
+DIST github.com%2Furso%2Fecslog%2F@v%2Fv0.0.1.mod 383 BLAKE2B 8df83e25952ddac9c15ce3b7833839721fb0fe8809a0931e5f56d92c89dc3e3734405685b14539592a6ba27edf6b2e505582398291315003712a29db80029df8 SHA512 115efa5e9404787d245c188530502adf1cd1587a7d4048acbd017b2bccb5e5ce4eb179ec96a5b189e6d77c65ae17377a09a5656cdea3443a22757daa5d4d9f30
+DIST github.com%2Furso%2Fecslog%2F@v%2Fv0.0.1.zip 36935 BLAKE2B 0684fc86dd1848087ba54e7d7e921b32f615ef90c2391825e99bbb3dd0da6c9af6f70c7e067d45e93deeaaf8561e88d3ca18f7fed2e8536d43f7f5380e1f872b SHA512 0772a790fcb45796ab1ed92a44ed5581363a78fd8400f553afb00a199720254e0e52f65046fb2b08da2859856ddc0505bf83418b5ad10fb123113c5e25b0fe9d
DIST github.com%2Furso%2Fgo-bin%2F@v%2Fv0.0.0-20180220135811-781c575c9f0e.mod 30 BLAKE2B 59a627ac9dc142b90929bb7534aa62c92788a4c3d42cd5498ca6a0333019cc053959d8e9cdcfd6be3ea7e6b996868519bb24e7212e406f30affcb3c075d1c2c8 SHA512 bb77d11f853441e67f924eb79a5307f0c9d7db7cf29752b6d7ab1bbadad8afdbccc6461c4401b66c698df86de7b9f32af593d35768c456964530c99e19881259
DIST github.com%2Furso%2Fgo-bin%2F@v%2Fv0.0.0-20180220135811-781c575c9f0e.zip 11941 BLAKE2B f64e153f3c62f9220f422f1b2e72b4eb77a3dcc009a99a93a2e985bdb8f134d298db36377b05e263ba8e059bbe0aaa9ee6e0ee0a54914f578d2a5ee76ddfeb3d SHA512 b6301d0eb0b0ec015068c9dbf2106109fb258c22010ef71db09bcbc84467fbec83363c3bfa369801f730da74a7779978a86834361d89e4fcee67db7853abfa97
DIST github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20190919040553-290c89e0c230.mod 33 BLAKE2B aae9bb38eb370b22426bafe483e842d67975bc186f2f040df14d7b8778d0e0d972d8bc084a25e70826cfc4604eec043e26f4add6273db90c6d7ca8b956f9b71b SHA512 8ea785e6ca06a6751f2598f434303a54fb9219f66a824bba4552e67ffcef12e94ad0527c24f762169a33dd627a55110a087e1e54adfef512c1e5909cde28aceb
DIST github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20200106130147-61080ed7b22b.mod 33 BLAKE2B aae9bb38eb370b22426bafe483e842d67975bc186f2f040df14d7b8778d0e0d972d8bc084a25e70826cfc4604eec043e26f4add6273db90c6d7ca8b956f9b71b SHA512 8ea785e6ca06a6751f2598f434303a54fb9219f66a824bba4552e67ffcef12e94ad0527c24f762169a33dd627a55110a087e1e54adfef512c1e5909cde28aceb
DIST github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20200106130147-61080ed7b22b.zip 16854 BLAKE2B c6c1ed2cc68e8ffb484b4b456b899e4f2135c8307396cb631cf5adadf0dfc8edfbcf90f8cd396e7e7087b7c82ef101afb23f67dcb2d15c6b2977d579add95459 SHA512 b9abcec3ed8b8fd669dda8b3382d18ef37f576b665d8fe1dc4b43922518223d3246c7affda5b28474b6a6577dcf1083211de50b049a7eab7d61e2b2d21005fab
+DIST github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20200125210132-c2e338f92f3a.mod 42 BLAKE2B 6c481463839f4b6f1e2d162413609f23091c4adb531bfba5eeed80b1c604fa3cc514c097abb72e7ea36a7a07f94fe22909f03fd1420ebe0197d7af7d6f9ee87f SHA512 4ef4c98060e06cde13e9efcd7aeeb47b03960850075f68f2e7d6f9d251f35ac783303a0ece1b8639e254d8c17a6d17a5652c5d5ae4d549be02c32d0eb884473c
+DIST github.com%2Furso%2Fmagetools%2F@v%2Fv0.0.0-20200125210132-c2e338f92f3a.zip 17736 BLAKE2B 2c358e3baa5bca3ea87e8db6574f4b8a907dde49d46e8fdb2860c834a165ba96f41e714b0b7bd430ba6dfe0502b0213029cd5c38b0b8b374c6fd2f0c2821966a SHA512 7511306054669300a1206af2cc6772d9c0258cd098274e540da274251c99f40225ab7c38b0d4d959e60bde6adc29608603f01f93e9edf71a21d891eac8c0fbe7
DIST github.com%2Furso%2Fqcgen%2F@v%2Fv0.0.0-20180131103024-0b059e7db4f4.mod 29 BLAKE2B 3edbe2c6139af3cab6c0ac32b935764c9442e84ce2c6861d4908741c2c060bc95292c7d24ef0c439397cc23ccc4817214dd802366aafd6941d9e8c9bb6470aae SHA512 406ab8978f9f53c5c35aedb7416a9dda857aec33d3e7ddad167528efba35034c7eedc235a18b533649a2544fd0d5410a6feb03223cd2be32c8bf3ba84c808708
DIST github.com%2Furso%2Fqcgen%2F@v%2Fv0.0.0-20180131103024-0b059e7db4f4.zip 6351 BLAKE2B 375a6fb8ff47ca013b12c95031317aa394e1e3433e99283896def97b64031cd6fb11a2b45bfb26cca2cb8926bbd8d459731888d36ccec610f3872fb0106b57e3 SHA512 80c71da97f9aa0ecb6d5f72d7f707c42a5b8562d3d94603d5bcf801a8202a46e014f5bff485dc2f88e351da05726e8686d3a2b0702939d3580232905b7a80afa
+DIST github.com%2Furso%2Fsderr%2F@v%2Fv0.0.0-20200210124243-c2a16f3d43ec.mod 103 BLAKE2B 44cd6f3830a796a1b03d0d573228f3c7a1bc9a8ce49afb68a907e974cbae1c0b0f8c1ec33c0738795a2bc63d51aa93f7bd37f049a4a5f201c1b2ecdeff83a71c SHA512 05d11f62ff3e5d0f276d899c1041e0b5bab7ea0c7380c189bafe40ce35150023b10c280f0880bb00feb01c973bd39b8fc041c3041e0570eb499d359d1f302065
+DIST github.com%2Furso%2Fsderr%2F@v%2Fv0.0.0-20200210124243-c2a16f3d43ec.zip 12567 BLAKE2B c1d36493f95214c2daa78c834b14bd026f64d23bf95174751e12a92f950bb1679f25feceeb558cf3f748fc31479e595b5942c5bc7ed6cc2b48d7315231c7385e SHA512 ff292080ec1137df9b1c9aca019ffdf534f3f3863fe1a592795652f623187d48af07bd2b2bf61afbabf786d28b334adf1579e3c63cddd2ed913cc95899817a24
DIST github.com%2Fvbatts%2Ftar-split%2F@v%2Fv0.11.1.mod 35 BLAKE2B 7d7563eed186b479251bd355f40cb1930c74c0e9421e16d786ea653bc073c297ff12d9fafc11f9664c2a5d8515eceeb85af8e7638c15a7abbb5386467693ae1a SHA512 d519f1c3f9128d34c753f2b5ad141e72e507f8d682494af304f94e794f6e83798c1c67cdf727c24cf0a43d87bec4f450a9cfc41f31dfd7221da86eea339cb51f
DIST github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.0.0-20170802214208-2cad15190b41.mod 33 BLAKE2B cd0b56c3105d5a303d3e19c1b7fe5231ea3d9454e9b1f67047cbaaae6b5689f2d48fd6ef31c58bbf1453d995045709eacc57b6e9adf1a3c9613b0512dad62868 SHA512 483d88e041bc73a30a83559b427d454381c2774acf67edba69d8dff8034992b6f2435c472e32391f6b6c7c1f0c52715fb554c01890e9da1c173f481df51f51f2
DIST github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.0.0-20170802214208-2cad15190b41.zip 1253983 BLAKE2B 54037ddd261a65e88a34214456df6ae52c36bd5367648614a05a3e0031dc5fb17222d3f93630fe0d72789998f7a4deb9b77283b6c5a09326b2f06a655833600b SHA512 f011d603972a3ebf9d57f5b0ba723f5122aedaed383d2506a6a57eb2fd5b5c167792d601294b47ddd54036614f9fd1f9c28cec971d4bd34d0bbede464a7c1eca
DIST github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.22.3.mod 368 BLAKE2B 7e035da82eeb13c315526358d3e3631a69607f86cbdbe327e271de0e4809f0b7a5226f4c95a9bdbe2e80cf5856c77519ad50160fddc4670f2d61b61adf49b189 SHA512 a386f6131970d53037e4f9698832e74b0c5b0d5ab7c904760702e29b5a581fabb23f9cfc131d9a92b6d34e5ab2c89aff2cfd28c9e5e2eafd514e8467b979794d
DIST github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.22.3.zip 234015 BLAKE2B c9ec1b2347f34973b893acf7e8247d8e108a36fedf6adb5b775aa7dd23a0cd972bb8905a4f6cba874471974502902d5f6777cb1da3c5d2604b8e9e29f5a13b86 SHA512 d711bd876c6090db0febe5af99dccd81ee7b099eddfd68859f1536b1fd04e4a752f4028ff115452b54119aaa65ee7d6d0903c86d4b798e2c42c088dea3731a41
+DIST github.com%2Fxanzy%2Fssh-agent%2F@v%2Fv0.2.1.mod 168 BLAKE2B 61409485b5a15b6972b31745d6d4153561aba9608993faefed322829f885949f7f09f4455d786ad2b088cc8b40f30bc6746388e86625964fe9adee36adc33035 SHA512 8685959ca2e8ca2ae8e0d802e8fa954c91c9cffd318b476669fc1a2bf969a0463ebe3fc0ec2588a5f151e2da394b0d37fabafb83c8d25337d9b65a307d79b51b
DIST github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.mod 28 BLAKE2B 87b79aaa3dda433afe275fbb69b3abfaf808a8a992f37846b51a3cb9069b1a0e5506ce6166d5186eef8656b451c3f6fad5bdfb58a213a9dbab2e7820e9062c81 SHA512 2303a64b0acb96f5f73dc64468a81d6aa6fd9a08240a04d5025884d6076cf90eeb5b132979488431d6f885138702a22a606419cfc0aecd05798deeb3acc4fa1e
DIST github.com%2Fxdg%2Fscram%2F@v%2Fv0.0.0-20180814205039-7eeb5667e42c.zip 33880 BLAKE2B 4b0decc2808a3f38cf272cdc053d1ed933e5023985543ae1643f0ad18dd9de98287403ec3c44ae753c001c25355591d000c996efc23f6bdf4a571cd1ad805833 SHA512 12666c80cb033c49832f33435b6a38d1e0e562965e84485efc5da6243f9fc959de19d05a70628a3bcdd02e7167a69a1a4731f6e6e3960e754f90fb38e7343f9e
DIST github.com%2Fxdg%2Fstringprep%2F@v%2Fv1.0.0.mod 33 BLAKE2B 602b301b7da6b66bdb3a5c9c88d4a74f776ea535fe1c4b1085840eaaea4ea5d9a05fc2f088b92fb85152d22025e89801eb476cdc26e031f8e3adb68fbb62542e SHA512 9c89175c24f82cba599f754d2efb8dec6def64b32735f9733b883b20a0758a6769afc527322ec5059ce275df6e034bc631a32c0a392a66e96c9d4d4a1087c4c8
@@ -642,6 +716,16 @@ DIST github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20181112162635-ac52e6811b
DIST github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20181112162635-ac52e6811b56.zip 139320 BLAKE2B 0f152a17ee3790bc11d4e4344d16406c494cf9fa563ca4a38a5d5ed6e9b6d0ce0cb95ecf5b13b5acbecae8604d6578265ec276b4d430aa7d25c0b0de496f979d SHA512 53b6fef3e9fc66824a6a6a4a1e66b803052a80b8c1127abcda8d27ba264cf8477035ffbf8b84d0433c697a3f683ae7c1fac64c5326d978de78395822714bdb47
DIST github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20170403160031-b402f3114ec7.mod 34 BLAKE2B 58672703644ac6739cc829047dc75265ef7c6c4ab2783595819e7f1c4edee8a4ca4b6820f5734dc387882b780dab7f786e03291af2edce3e1bf839dad060c22f SHA512 a93071d377a3b10b4220e71d7ad8bbcae0c55746f11f44f59deec7bc4216e19e4ceb375ee2c0d3ec8ae7f9e78be1a4b93eae6ecb6668936783c778ade75d6cc7
DIST github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20170403160031-b402f3114ec7.zip 182857 BLAKE2B 1f21c2074fb23a68e95cb4f4f6ed29760fceaf5b6333309ed83fc75ee29728fb388ebce43766c2ed4ad1b7cab83473f2369387b6963b0afbc1fccfe9a8d5479c SHA512 bb421f5858d73f3ac01df87418004575bfc64ee643a935ca44699ee1fd3b9a51f199896ef1a2c5afff52384385f9c0abc2b3d8f8a0f8ca591d255f5e10f03a4a
+DIST go.elastic.co%2Fapm%2F@v%2Fv1.7.2.mod 478 BLAKE2B 5f009a9e870f64c57c52e4e4ac40ca7ee95382fab969e6316f84c5de6bc48629edda4e588727b928399020028a687563fb4f69f6ac6222c20b97e60d34280e56 SHA512 fde518d1bc6c7f675decdf4f2421bb41e3d285269c611a774596e3c222666b0e7f4b2f7f1af39045c1665dfa0b9f4ec90a5e41b609ec8b69e2d7cead874aaa32
+DIST go.elastic.co%2Fapm%2F@v%2Fv1.7.2.zip 332338 BLAKE2B bcf39cd63231e14048fcb16ff54c1b1d8253982010a52b4112e3cbfbf9365dc16af5147c841462fa99eb58f93c4599d327c5f79442668342590e8d67d26911ab SHA512 ccf598af44dd7704f741b04d704ecb48ee0689ef4de8552eb6ae3060cc75fa65a42de6e054c3726e4e52b5b960dc4da374d4810146b3a6190e3c25c9ec828145
+DIST go.elastic.co%2Fapm%2Fmodule%2Fapmelasticsearch%2F@v%2Fv1.7.2.mod 319 BLAKE2B 8bdfeba2da6858dcedd306fcd21c68a68589d44da930b6f0a85a4de39c913838e5e24115a8778e9851361299ed1afe0f61fba9c3f21b7bd2430c131f4c4a72c5 SHA512 f03ce02f3e178d30f5e890c62e647bbe0788e1e42d09489664d5321513c3ea28f09fe99d2f51a1557c06b9aa446fc120eaa8fa3779309be6d4216b6be0cf39df
+DIST go.elastic.co%2Fapm%2Fmodule%2Fapmelasticsearch%2F@v%2Fv1.7.2.zip 16390 BLAKE2B eb63085475105fb3c2749a1e90ed84f8bea36b8859cb7f0155b1d267867d950bbca7d45043ed11610d43b733f895203ed26393bce34d935184741ee4fe3e8164 SHA512 d72b3b404ad475b8e7c0ee59397bb631bf10e7d41262158dc19a33806b84d914fd4763c55e49d251d7341ee73d6332fc912359b9608f4114fde54c804f020f11
+DIST go.elastic.co%2Fapm%2Fmodule%2Fapmhttp%2F@v%2Fv1.7.2.mod 281 BLAKE2B 69b39708dbc3ba646836e44bdc85ef6d867663c97efb3e4a965678dc746fdc84d5bec5bb9fc809a28e340034a9d5a7bc34ca41c47ef7e37c2c061bc6ed0f9c3a SHA512 b23e7e60140bd80d6c46c744120a27d35189fc6ba97365a0d2bf827386390bdeba3e82b16e5d94fa824ddf0a21c329bbc2a113587ac253c27dcd26a816b6c24d
+DIST go.elastic.co%2Fapm%2Fmodule%2Fapmhttp%2F@v%2Fv1.7.2.zip 38649 BLAKE2B b6c9200c6f4dd65324bc7441b82212c8ea182ed0a7d36aa748cbbc790e7d755d4a286026c65e33a994d1a52f2e64556bc51a8f14f3963d6575429aa9f3a4dca1 SHA512 ad10ec85cc845d3b09ae7ebcebf6156ef302c9470371444f9311c53db0c93a08050a2da2374672853c109b2dbf7922412a349d2869aaa9cb309b7f60a0560bed
+DIST go.elastic.co%2Fecszap%2F@v%2Fv0.1.1-0.20200424093508-cdd95a104193.mod 174 BLAKE2B 738d91b9cf4b7a927f67f24a52b5dd181e483fd8e71bd04add082e776a6ea3b4929925c30c865cdb4d553eb4e50d796f4e2a9581ed2959a5eec5982df5f101de SHA512 4ee49236e3bb1354ff8a09235d9bf75bcfdc53a4b1bd95fc4cb17ef327aab083815920ad84b2c03cd563ef24449f3433e9d8c0ca5abd53e66a90951c27be26f2
+DIST go.elastic.co%2Fecszap%2F@v%2Fv0.1.1-0.20200424093508-cdd95a104193.zip 32631 BLAKE2B 55921402d674a684117290a4fea2921a10d8f7624bd0c6c451921139411ee2d0e57b920e39955868457a0d3f46dc94e289d0feaaa598d0a34665380dbebe1720 SHA512 9ca1324dfa639d6d58f772468edbc338d9a8d193240b89abb43e5891cd6ba226d0a74cca2bdd5f81cc9e47d4c0fa8dd6cc8d67f6dcd3c21b5dfd1c6b26fb7454
+DIST go.elastic.co%2Ffastjson%2F@v%2Fv1.0.0.mod 68 BLAKE2B 38761b0b1593550d253ccb0876a8a5d2be2e71ac0ee33a9e4183d95044f57cd4404ee1cbb3f9aa995ff37d949c6ba8e8ce8708b398a79514ad3256da64e3ab2e SHA512 c15374592dc4ec4f13699ce4fcbbdd96ad6dc40d2c6be32d7dc244d04848d2db8305db96ef5fb0be6f2708778ab4da4557cb973720d9010dd8a276372fa8c981
+DIST go.elastic.co%2Ffastjson%2F@v%2Fv1.0.0.zip 13266 BLAKE2B 74f1d3b40705a460d08738d5bff9400540d637a05131e5864b4b0bc2f6bf377258dc8c412d2bd831465c55545fee2fd471ed85c2938cb80ae18b4e9958307765 SHA512 c549aab7779c5637002b7108983e9a63eccea277617f6186edeb3b3de9f4eebe3f32092d7ae008bf8897fa905348ff739e81854b73423595b06229f2a9dd16f1
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
DIST go.opencensus.io%2F@v%2Fv0.22.0.zip 291484 BLAKE2B ca3bfc9c9864a2218ec373d78792ba0a40f4e2522bf3e0acd01b153eee43083cf8b124ae19b5fb0eaf7eef7cd59b2733b6c3ad847761518eeff2b183780c79cf SHA512 4fe718c3dd4c7bc0914b32844ae86ce281721f98b05797fb0a0fb51245129dfe1a74d2d04b419f4e0b7a31409b874e0e9d7939c8426af1efd92fdd5f12a52a98
@@ -649,22 +733,35 @@ DIST go.opencensus.io%2F@v%2Fv0.22.2.mod 478 BLAKE2B 534d5c63341897b7213d30ae225
DIST go.opencensus.io%2F@v%2Fv0.22.2.zip 296264 BLAKE2B 0b0e20eb2f10b81748d55b843f8489ffb8147a8b17c063cb21fe505fcdb46feb9cc0830f3b3a91ea7034b1e7ba78df27b0b235b8500b8c1ade19f6837366aaa1 SHA512 c98a43e1bfc9f4bd1e54847dfd6b07e9af14efdbcd8d61b70c9f9701541ee2405f800b1e33cf115615a43030accb735a1235e2b7d81f54efd127e2fe5c992326
DIST go.uber.org%2Fatomic%2F@v%2Fv1.3.1.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
DIST go.uber.org%2Fatomic%2F@v%2Fv1.3.1.zip 14706 BLAKE2B d310973614a50f94f92344ea10e1bd50e29be5ef90f78a0b03fde6c962df670de8ad56968fca2aab816004906cfb8cc2aa73fa8dac508c8233e5f2c78ea1e701 SHA512 21f4182cd0872e15396ed08dcd7bd3307c2da40c6ac51be0a5e73571776487edf3b611be20ed6a1f745b7197f73a5d0517f34ede098f42f6db24cba8aac322e0
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.5.0.mod 252 BLAKE2B d5019d6264ec35aa5c7c85d6c42130027213590c6dca568099f9c3b7c02fea9abdc969dccdc2d8d3f8abd0ce4c95727ec3f6f8dfbd2d4c1c75d4462e356181ac SHA512 15aae0e0950c9812700ba4bab0a19050c30398511df8e29fcfe496927fae3aa228761a796f150dd766377e5768beed842f06ece285e8b0e094a59288e1b86e23
+DIST go.uber.org%2Fatomic%2F@v%2Fv1.5.0.zip 18762 BLAKE2B a472638d7d9fa9cf5fa1ad2bf968c1eef4b2b3e8bb6fb53066a85a7139fc8621954ff21ae09aae6887803621dabfbf00069deccb9c208e39776052d13a9f0a6c SHA512 73bff83189e7a98b144cc407d4cb267277e68f00827f86d24d9b5586fff66691b6566ad2fce11525b11a5bc3b8f0ade753ea996c7468ea5bfbae682aabb2db95
DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.1-0.20170829224307-fb7d312c2c04.mod 28 BLAKE2B 4f0c4b42b00093024ef494b1b0a07896ec41eb140fb953affc085921181eab44bab0baa38ab559b9e36e022acf5cb9ebad5ddcc7303f33982d9012e9e150cb03 SHA512 7939dfe977dd42ac3ca8b91824a73046222ac9bed4f9cbcf0f2d332727b92a094540a56dfb19d095df6d5917b30cec86a6e9e1b082581049fb05bb7bb10106a4
DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.1-0.20170829224307-fb7d312c2c04.zip 15327 BLAKE2B 539eb4089f20b1764b62d01e4162eae8c70b05b3072b6bc95c888152f1d7f2fd7d5539856cffa9f00b27b2e2e992ff44b23d01fa03174968e1c94108f17d9137 SHA512 e9a0808e740203e81eaddf9345b42267b8a61d995efac06739b5919a14338919a2b784f9ae45e1cfde84b3b0fe1467630f8dd4439ef60445f15a6a5e4d0467d3
+DIST go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.mod 324 BLAKE2B 48b4bfac55f83ef9b78680d5354431cb8fa66139bb3e2f81dfb2861c8c2bd0731572372178c8499f8de7f3e7bd8d34f23f5b51935214eb008d52cda1e80953ce SHA512 9060d8bf8fd7a14d2a32656b1e086de1b3ec5658041ea0127fb2f68570c01059854137ce213d5ed648673c6f1843ae467facf647a4c7cd6ff44165eab575d30d
+DIST go.uber.org%2Fmultierr%2F@v%2Fv1.3.0.zip 19365 BLAKE2B 7d71e90b68a4d6dd2412108b9484f782209f0c0a9531d1158fee4a9e9c377769ac1734a1254f762e055cbbe342ea9c053bd038826a11e327ed7e13a53de18da5 SHA512 6260dbe2a98d9c74cea2648187ce28280acbbb361a93ba75a8c53755c6521cb929ec05ae93046b3515a194133894111fb0717e9d04e00b1711c2520a62d8759d
+DIST go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.mod 25 BLAKE2B 233f108e33b587684ea189f873a869f028f02d9fee0eea04183b8d5baa445c5f76bbe2b497f5cae24dbe1745d8b26d35f302b23d8b11b95bb7c62f54416548ad SHA512 0ee649ad9b6a2d478469ece9e6ad9b51fa00f002f7a4966068892cdae278680403637897d83a0a423effcb8bddce1d2f9316774cb5890609f6085b906394909f
+DIST go.uber.org%2Ftools%2F@v%2Fv0.0.0-20190618225709-2cfd321de3ee.zip 27032 BLAKE2B 58b337663e7a5625521925deadcd0d686ccbaa7d04925852bee0ff1cf3ada22c078e9715930dd20858b16bf51632a4e4d7e76986b0092107bc07ad46d132840c SHA512 b0f1b10667e0e600a4ebca7b4cd9983a27c3ec5f2c54cd46eb055cc0a07504642bea7ccfd0e0f6e3d007422633506efe863817b7c7bc9d18eec3642c84b28f8c
+DIST go.uber.org%2Fzap%2F@v%2Fv1.14.0.mod 221 BLAKE2B 586c82887d6cf6582837fb495a46030e1c582b58305fc70c7b88a29e570610e693a298fa7d4eac80bc86231c7fe6f6e27d3fdb5afe084363eb918692a1ccbc59 SHA512 2a7413f6f83e66456c340536502d855772e6de433ca4be1a9cd1572caf5fba7cafc7d377ef529324b5bd8af97830c9eae75768f7c45d4676b455e3959acc82c1
+DIST go.uber.org%2Fzap%2F@v%2Fv1.14.0.zip 223137 BLAKE2B 55b880703f2b061605954bca3ae21959663c88a8e88deb62373f38228da090a81511bbd0bdf24346e76feba4164b48ec892fc587bbb41de7807c52205db1642b SHA512 3021ddb93de155c5834da694c9528f4c8532c951acfd86b6431302461baf1e097210a7d9cdef8fdeb2a1745842bdeceba4e8d8feaa81dfb8884ba629718feb74
DIST go.uber.org%2Fzap%2F@v%2Fv1.7.1.mod 23 BLAKE2B c60cbd3c1e15e71a99909c113b100de3909740d9e0f939da800209ed1ccde49f77be7a8c22e045b9edc663859995859bc7ccd60bb6953846829ca3164115f3fa SHA512 263e322e5615c91e810fb9ba30a601508e1e3e418f87c7c74de962c341f207e703930f2ad41ae1bf7b2ad106831dc37b0b96637b816d130bddc7225d41911946
DIST go.uber.org%2Fzap%2F@v%2Fv1.7.1.zip 201415 BLAKE2B 67ce98a69444d6b8050fc2e3b9d89cdaeda809fccc973f854ad4aa9bb26cdebef3e02c8884b2e066bae6eaf572c0af050e122733c2ab14463aecdf7cc0131db9 SHA512 bae6a0e1e42eb79ed1ebf14ac527970cca6820379174b12e71a7772dbe31e500d37e1a1e7c98b9cac05b1d0158cac3420f091e657e2017a0c48ef7510eb09e51
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20171113213409-9f005a07e0d3.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181025213731-e84da0312774.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190219172222-a4c6cb3142f2.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-20190325154230-a5d413f7728c.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190404164418-38d8ce5564a5.mod 88 BLAKE2B 22568b660b7e13eed0dd423bfb6b033adf659a2c2b59c6ab12d707aca9f6f7317b7b438640caf6233dea4d9840aec4eb997eff5fcccbcdb193ba81db52d814d7 SHA512 fcfc8d63d333065f1193e9c27efe32a1fab270e450fbe1db533156e00427a13c75691163cd1bc7e9aa26b84d4142625c9fbd755535c575f83d63d82d7a276066
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
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-20191206172530-e9b2fee46413.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191206172530-e9b2fee46413.zip 1859923 BLAKE2B 289c9b56814fd50a40a350f1e325381ab0789ec38e161eb7c64a988e6fa46dca70892de0b1fa21636d10ff7f8870160714d30d294781024c45782c5e6ff165e8 SHA512 f54cb2da01ee50f7e04fa3caecd06a794c70e9b58c6ac05fee6d09d7a8cf4f0d8ed129f981d457b8ae1ffc79316744b3e6d0ef8534e61fdc4127d41da8cf2700
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200204104054-c9f3fb736b72.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200204104054-c9f3fb736b72.zip 1863059 BLAKE2B ffa21e8af27abc68c144798d86da766b0c246f68c8a35dc94b29b31234e5b7c611651a1b1f79ea70d0fdf3fd54190df608a23f3a0931271e962ea28bd18fb0bc SHA512 0256e72c4734509cd52a04f4cb6e37837ea352fb649d716bd35befedfc825f531b1b07a0f1427cca08f379989c7a1e2a13c9a62de17fee09fb72e647cee367bd
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.zip 1871909 BLAKE2B fa2d419a5bdff43385f70e3c6e61f8c1b3528b6c4e21c3105f66dc358515b6336673188ff68b27a792be9ae69d77cd26c82b7e30605b974e4435634f961c7583 SHA512 de179d887c4ed6ebba0a1cdcfa67b8312b8b2dcd9bd04589d581c872f6fa7a8606ad1376dc6933dec41938781218a91f31fa27331d80cbda30542b8cd14c5af1
DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod 327 BLAKE2B 209bd1491b6099491fca7ccfd2fabb500b56112557b4b359819b5f9d18e1587b8b1551acab53ac6c222b66b825c4058ecd6adb1d886f1868b7b96ebbd5865eea SHA512 e16919da8b2302c45f8fab5f0d200f41c2c978ad31eab2b4db18310bfbe09079d738f682920ef6530f1d5f53359ddc3d4bf33fe5cefbcefd440212b31e72ef28
@@ -679,6 +776,7 @@ DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod 25 BLAK
DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
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-20190909230951-414d861bb4ac.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-20191125180803-fdd1cda4f05f.mod 97 BLAKE2B ec2dbdd2dad833a979dc53c8d170b4d0f5d336f4c52f36e3116cba2f3549e42fc3191fa56b81d3b9378a52322b86cf5eb0e947e6002dc1d1bee12f7a6bc2eb36 SHA512 23082eb3c6f3e4330e88178c7511b83a06288b678e517cf8ad5062943d0a0fdcea16973425a8dc01cfeacc32ec05b2dba8edb1adfba2e0bcb2d81cb5060c6085
DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20191125180803-fdd1cda4f05f.zip 45839 BLAKE2B 7fa2da9301cd760ce923164ca73b1e5c528f41421aeab0c9b90915b72ebf70f350766db083800d7f552c9253452dbac8c5dd48f8701dafb206513d46389b5638 SHA512 979b197fbfc92f81d4d376c4fcb0845a9e86a7a9350841d88ae2f3059c5192e2309df2e19edb76ef96e1e33bd957a83f95fe5c439d72731bd05fa29dda589e23
DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod 27 BLAKE2B 9bc664bbb78cd778f132bf3504160bf8f6d9950342fa73c461db815f07c0ce2ae5bb2a0ac099457d022e1edf2d07e536566fea043a77aa8b21054254ae854c46 SHA512 a105eb088532321694d3adb5da0b3cdceb7781670a2d4a8a757799e3c8fde02784b981747714cfa8770ed29eb1a0228e0945ad3c363220c39108a7432fc29a32
@@ -704,6 +802,7 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod 172 BLAK
DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191002035440-2ec189313ef0.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191021144547-ec77196f6094.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191112182307-2180aed22343.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
@@ -734,6 +833,7 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod 24 BLAKE
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190221075227-b4e8571b14e0.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190405154228-4b34438f7a67.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -745,6 +845,7 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190514135907-3a4b5fb9f71f.mod 33 BLAKE
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190616124812-15dcb6c0061f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190801041406-cbf593c0f2f3.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -754,6 +855,8 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod 33 BLAKE
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200102141924-c96a22e43c9c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200102141924-c96a22e43c9c.zip 1913889 BLAKE2B 01685a0af3f641695bde63f581fafa299b77cdebe1c656864df2bffd65366e65aae62c2a8d6420511a0504e44134ce6e96fa27258a4cd43fb2f1c96f11b6349b SHA512 9a710e5e577fc262316202da89d0058d36313a0f2a849e85b413fcf8bddfef57474d5c6d50bbc61d230bf1a47a96a85dd421c42bba7d81e78be00b10b585213e
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.zip 1913169 BLAKE2B c50435879fb1df50f91b1f37dd92f6504047944d41797350f0871a581d5bf17cf474845d3b422fb219c56f7627f2fdb302059d68657bd7860ebc604861cfae72 SHA512 b732d79f0828b9a900595b8dc98377436dcdcc24e2d3d9fe0472a8170d477c0e2487bb4b8e2da4eb7ca9b19251e29ea3b38a9de777d03c069425897ac47e325e
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
@@ -781,9 +884,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-20190606124116-d0a3d012864b.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190729092621-ff9f1409240a.mod 155 BLAKE2B 23d2d8015cce612ac3719373303a968d64840c82a2c4442c1c287baf2d7f30e5422fdbf0eb451912f2d38d23a4c36e7730f2c60d5aa1edb55e0b63c0b6359aea SHA512 99b2e19040279bbf7ccafe1de879eaed0dc22c49d60cc3a0e267b533ca04523ca12f35bbbb3b4b85033f1025b036acf9ee3e526d45ff6fa1ecf30d67a3ffedd9
DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191012152004-8de300cfc20a.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029041327-9cc4af7d6b2c.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191029190741-b9c20aec41a5.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191125144606-a911d9008d1f.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191227053925-7b8e75db28f4.zip 2927101 BLAKE2B 0ed9b3d5c567fdb1cd21ece339622c10c11d4a668971e7e6306a4dcaefb93501fa4d327081e25b7beb99c8cd4fc41510e1da76a2569a504b8e4aed18c2c7ee82 SHA512 f8680d8f2709e6d70d080ad4bccaeec40659d831db019061ea6034a9932116e0bd0a20a8d04e38e2e74d0348a25843380b911e6beb3ce966b2112421e801862c
@@ -830,6 +936,8 @@ DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2
DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip 41465 BLAKE2B 9a7183d3ac6591399b5208026208047a670c85e8b6014ad29955b168c63bb4953fa972d31025613c2ab12d7207adeebe9578b3c15b65ebb792f1e41df2668297 SHA512 fa7c68a2b5a6bb14f99cda92a3e77aad0e4160f659c54ea73e9813af9ff9449df6b0cab42ee283971e778b6b9da4a6098df805dd284c3b1aedfcd3a0b8504bde
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip 41481 BLAKE2B b952f04dc8d4717c839de5a5b7780ec2434915d11f897cc759647f71073dd3df717e1195ff2f4f804457195886c63620b342a089fc489f5deafa9c928708d4bb SHA512 40a523fc1dcc36677a0dc0e626313d44a308fa2ad5eedf7b616470ae2972dd8f5b78c18384efffa65d58391e60b704ed35db5557a5dce8362ae45204f64b721d
DIST gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod 133 BLAKE2B c4ac637e2bf2d6635065be5213d73f23a1870054c58e9f1cce93af4627ed6fdefa96798b0fbbd27666573757f8b4a48c694ddf3f86c98e898124294459500771 SHA512 cac59fd7470fc9d3203dab6b9e881d4182cfca5acf0a19207a9aff2964d42f20422f9a164bb52b2fa73c523e3caafd63028189bd4190a1670870154dbf3e8178
DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod 28 BLAKE2B ee2514c386f6cb3ff4a9b829d903e57372ce765aeab91fb2f29e95358e3472e0612a00f2982f53790159738e416819e368afa03e44bf8f6b43511347bc6d6995 SHA512 7cf7d1933039974dd4fa16febc52cc118bcd0e35c329d4c563c7f411b8000d9e17be5bca9a60d94f5309cbef97b3d176110704ebfbc3c114572cbadf63a55a34
DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip 40894 BLAKE2B 5edf237401ae1a48c425ffec6fc67146850d7137c7026260e894656f6c832066321d930151bdd7624489e1f768fc04b47b0fd3dac3b2171bd092dff344de16a7 SHA512 f99afc545324e49ef1de05fd4c8dde0dae37094e2fb1b81de8d8c9b8ba9b28f39f9b5ab715c728e4a0375544a48d49c2dbd719fc178d222e0b914a425d9aeb63
@@ -845,12 +953,18 @@ DIST gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.zip 7069 BLAKE2B db430bd
DIST gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.2.3.mod 36 BLAKE2B 268adc19223fdd60f8dc01a4eb96290f6c4ae0fe2576d3bac9f82caa3e683e79151d9147a8bf76bfe9b2341ec2bd28d6447248fccfd10e4ed348fd02a88473ed SHA512 a963f19cd93e788d0f5de9873a5b0aa152ea592d829c1513e74c277718ac496d6d2a9dcae0462951fb92ad1fdc59381c30eb5b1bcc2dbb3bcab1cb11928ce05e
DIST gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.3.0.mod 36 BLAKE2B 268adc19223fdd60f8dc01a4eb96290f6c4ae0fe2576d3bac9f82caa3e683e79151d9147a8bf76bfe9b2341ec2bd28d6447248fccfd10e4ed348fd02a88473ed SHA512 a963f19cd93e788d0f5de9873a5b0aa152ea592d829c1513e74c277718ac496d6d2a9dcae0462951fb92ad1fdc59381c30eb5b1bcc2dbb3bcab1cb11928ce05e
DIST gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.3.0.zip 55262753 BLAKE2B 42ecb6953d818d5b70bb6ca430ffbb5ee9d2e66feca01d89c41856b99c5d3738b031a1c743cd45860499ae6dd8c0fbe6e949c4954f969dc6bf20be39744f5afd SHA512 8d24dac1e8429af5d26697bb75407490f5a36860cfe5fcb4303c17e931c37454b17d51dd54d6b70112475704da0cdbcb851ed21e1303bde950768192749a822b
+DIST gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.5.0.mod 36 BLAKE2B 268adc19223fdd60f8dc01a4eb96290f6c4ae0fe2576d3bac9f82caa3e683e79151d9147a8bf76bfe9b2341ec2bd28d6447248fccfd10e4ed348fd02a88473ed SHA512 a963f19cd93e788d0f5de9873a5b0aa152ea592d829c1513e74c277718ac496d6d2a9dcae0462951fb92ad1fdc59381c30eb5b1bcc2dbb3bcab1cb11928ce05e
+DIST gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.5.0.zip 55267516 BLAKE2B 75bf270c4214dae356f04ee97895e4811443e013fdb373233c9c7d312c346bdfc7bf74953fe95a8e420a32961f76176fce77246bd384d78512944f9983594748 SHA512 b48eb67302402a67fe0d343eafea34d93063e19b592f6cdb10835ad059c740a90e5f7cdd9eccb66c27d806a8bdf630d5d810681fab97666a953c898444840070
DIST gopkg.in%2Fjcmturner%2Frpc.v1%2F@v%2Fv1.1.0.mod 33 BLAKE2B 0c256369010fa14f2dd95100b3f1b75357816012d226e52588c91c6615eb5b56459061d3bdc8201a84985136912c4d8e62dc281600cb53fd2e9e2a545eb3f35d SHA512 0513089b977716c7cb885b4edced551183b397858963f74f002a078920fd1e2178376261abad2c1c475e7de7ba262670de9d25e8a6e801b4c78385370cd0a489
DIST gopkg.in%2Fjcmturner%2Frpc.v1%2F@v%2Fv1.1.0.zip 42124 BLAKE2B 172da6e6ccc58989dc4827d113bc8b93dfefef6321344bc9f569786ca152dd50369e98e7fdf718096d42eec90c1cd14d05cf908afbcc12dce8de6e2248d8463d SHA512 056ad239cc4831d56ef60f0e36c7cfe78a3a4d67160ee81619f63f27ff975247eb53e2b3461b8ee461f8aeee2fe8c37131832304e3eafadbc5ed5a4fb90a994a
DIST gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20160818020120-3f83fa500528.mod 23 BLAKE2B 43e4570f039747c5b2ecef5c736a4316d8517a202a587de55165960ba41b79431b8f1d3544b02581c224c5cffaf13e2ddefca0b67e14b9227ab136f285a183d0 SHA512 28d79dd9430ce03c7f67d3c798b1dff21019fb5fe588cffa5003fcad5fc1fe5d7c19c8bd7fd4f132acd59f6c24df7aefd4f1b72eb5b7cd45f2d11302f1560c36
DIST gopkg.in%2Fmgo.v2%2F@v%2Fv2.0.0-20160818020120-3f83fa500528.zip 443024 BLAKE2B 7e0457c8405f182908d271470e0c32edc328778dd32aea9f642da550b46f3a867ce673a4037dbefeeca374fb8d00c8539bef005bdcde80cc36b2b8d0e619439e SHA512 f9a64218de18fc71fefbba88e17bb274244740c9deb75354cf80a3f642ff0def456f18bde589df883994441ea6eccebe7174602a6ae239a0807367766e72950f
+DIST gopkg.in%2Fsrc-d%2Fgo-billy.v4%2F@v%2Fv4.3.2.mod 233 BLAKE2B c1fc00ae50a9dc2ae76534d85ed853a215dc9c685867cf9981544739806e10c47e42e14c702a613f0d19ecadb72ba486c7e8f5ba5d62933b66f2ac5dea267657 SHA512 b39a6f26eb0dae87688149c00768ab232cf1615b55f210d69fd10423034e2ace9c48d8e246cc12e235e93e7ef539dc116083107a589b02f565d6e713ccdfecfc
+DIST gopkg.in%2Fsrc-d%2Fgo-git-fixtures.v3%2F@v%2Fv3.5.0.mod 41 BLAKE2B 03ca301a47c343c381196bfbcfda429e85a7af164f9b299043c5ed8ce3f3c31254ed733b2ae946dbf69b57d8ac0852b4e4be05ff4e2288ff37cc1bac3f902251 SHA512 cf6f2393997a22a6e1f8549bd632b9406ae54a300c1d0981453a1bd6bdb084de71e6f5515cde2d875cc006651d689769159fa3d38fb761c194402d484bde02da
+DIST gopkg.in%2Fsrc-d%2Fgo-git.v4%2F@v%2Fv4.13.1.mod 1258 BLAKE2B 3e337c2ac0851d9f7572156b4bbd960943da2e95815f85f3b72e5bb1d011c244aeb81d7e6177c2aca41068ca5bf3075922b9fbdc871e613a4ff92102958c83d8 SHA512 d8cc528d1e6d8e8f1ca6f3da5d74f63bf70ed45e3dbaacaed27065ea666dce1aed2e675a15b22e6faddc9893f8af7704f95276b8249f2209a6402a61fdbabfd1
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%2Fwarnings.v0%2F@v%2Fv0.1.2.mod 28 BLAKE2B 39555ca91c4818bcc1955c20438d83965ad6f1b2058c6d8590f4c30688eab2ac08dfa1655d4de34bd68006afea1788a89fb0240d60b048be9616c8e44d8a801f SHA512 6fe714c089847582c8c01e055e4bd6b991e8fddc6e420aa03a40efb35fc4ecc5e87a60c44aa82fe004899eab427d4b82262cfebb3331b7443a2c7a68718f8f75
DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip 78275 BLAKE2B 139c8eb7c405dddbb67321eacd25c0af1e5b3f031831266abf6a8e5a5ed12f6381778868383c03433f8ef760d6b42ffbff40150f2fee91dedd0b312f9fe81c7f SHA512 3214b38f348921f6a6d9ef93d4337bb90abd0d101d69d16ad8e38415c22d3b9a85bda873df2eb7a271f9b973ef38b74731405e522e1bb8083c78932762cb5535
@@ -859,6 +973,8 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e9102
DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.zip 80160 BLAKE2B 7c19bcfee1136e9afaa54bb36a296e48c276e21517eead613313409f3ff85f4a961c1dca7926d3c4fd51feb0f537a85de905294d2a310276bb8177f27f3776c3 SHA512 a8fa21d2f84f8c6f28250e9ec7d678ae160963eaa0a373f345fe67804925b2647239a6117ad6f253f458f34ec9f62bc21e8f2071fc9dfe76dbd2a7ded1e1a0e0
DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.zip 80579 BLAKE2B d5de9f0dbf72902ec2244971ef1d62790008d5686ec66b67ca5ded08503168e507d7afdbc38fbfe3b431432e32d2c79540e407a2916ea93de24d45040262366a SHA512 c4a38c485edfd1773be4d3b3dd97c475b1894603526f5d95b40a3ba34b148f3979f0983444009d716e106fea0a2362836a5277f49ea21f764a55279f343a3920
+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 gotest.tools%2F@v%2Fv2.2.0+incompatible.mod 20 BLAKE2B 25d11078b1caa5a705f3ae32f28d155683dfe0109d96531b1fc20e632acdc2f8429395975e6509f5dc78bc042b5e70e90fa2daa9790c39eb3422cbc189fb21af SHA512 5a73bc54777766425ba833348d2986408baedcaff86acf1648384bbcb31e302b0b0de38e1a92d53083551e35c62f375262497c0d5a37c9fb39824ae68fe8113e
DIST gotest.tools%2F@v%2Fv2.2.0+incompatible.zip 88327 BLAKE2B 8730134244a00fb47b24b347ee4758fac8c11e3f627788c03d6568af129acb5b911b08857ab77a619bf571986ee90dd1c6c6aa12fd8e6e26d395a64bb7513a8b SHA512 66a13fedc358399644b869ac4b39a295c6c15d642e074ec66ff042e1b109f9603bc941ff25aaf7d9bc700f6c2fb1f60bf2a637a471e26ae037d822f0f1e2c518
DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
@@ -885,6 +1001,7 @@ DIST k8s.io%2Fklog%2F@v%2Fv0.3.4-0.20190719014911-6a023d6d0e09.mod 68 BLAKE2B f7
DIST k8s.io%2Fklog%2F@v%2Fv0.3.4-0.20190719014911-6a023d6d0e09.zip 37555 BLAKE2B e3ed1adffed1382395f69e2be37d933f77e712bc80c76239196dbbab3a43df510ff0b468e15ecd30cc314069c26959f946571074ffc72b96087e0f7bb5709b54 SHA512 df15a9ff5496f18f6f2ef6a0b9269b8e4d59b009d81030bab3030c2ed0dd0c7c341cce666642d2d87122afcd9ee349adae352a704c939a8942a7ac00a55c3adb
DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190228160746-b3a7cee44a30.mod 27 BLAKE2B 9c24d9586f1fdfa479ef27be1f45780be8e756931657d77cc78236332838e6f792d3c8be027ad96528ac819933444eebaa1b2a84d7f7fe63f3f4529c2543d259 SHA512 cfddbdd6ebaa638a046c7f20a87048946521ce1320a615bdd77ec639dcc3994fc8cdf3375c1dc523691af6eb4c87cc4b2119c228d222df7f449c03271670fd5a
DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190709113604-33be087ad058.mod 2063 BLAKE2B 25b919ce7a92cb3a01ee155b007fdb6816621a3273d63ec155ab207cfd1ac3b1184cc62cc4d85da79ca05e9be908fc2825ab3d2319db63bc2d08ae3ba4d47873 SHA512 8efc1a6f4a88dcd325b4c6503be1563be99e0e588ef4b0ec177ee2ef61e08014ed231d17e285efd1363bdfa4f16419ab2087d42c8cd8ac305a0a59a487d599a3
+DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20190709113604-33be087ad058.zip 822693 BLAKE2B 6ab7ada74314c78eee02587fda2357715d9bfa80431e94b9ce9faee1f6cd34ab2e81732f61bfeac9b4e135fc977c4d58b682f450ef10f66b6f26fd1a5eea9b5b SHA512 28774105e826575c8c2cb98e6670eb7ec394258eb8ec15aed493f275ea9d80a6efe58224da43a304efe3d1ff9e87a66d336bb68b0987675c05d72dc1cb30386c
DIST k8s.io%2Fkubernetes%2F@v%2Fv1.13.0.mod 25 BLAKE2B 4060536d51fac9854215957b1108a158adb0b3aeb8bfc659eca1140efdcf79cffe378db6f3cb1f4a4b68aa36468b7d5631e993d5a089eb839bd03b6b608496be SHA512 2349b7dbe8409836cc70d97c5b336f518b809f5731baf05ce68d957c9970895a9b7f89caf09763794cf13824ee29410b3a6e431b2da7f64610895c44b86c4d2d
DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20190221042446-c2654d5206da.mod 20 BLAKE2B 98441f8baf467c4c00918acd9c9e22b0e2368cec17b055ac2c518a12eb8546f0c43930c9fca03855e170f7894e3749a55154e9c9f3f6be1e868b229867522a7f SHA512 1184f14f81034921a81e5526c559cd68d07f244998fa134aabc7015ac6e85a6c2e976657fa2f15d2620bec3601e0674324e663f4480394313c3e08af738f89e1
DIST k8s.io%2Futils%2F@v%2Fv0.0.0-20190712204705-3dccf664f023.mod 164 BLAKE2B cd4086710de69fcfd2179978f78cb5fb4633a6700b6cab545a83a733fef06e492428deb492149294c3fea186aa01b86080d2a387c1af2a789f35b5f37abfc7ac SHA512 d2cb2a60b25ab16fe3d377d4811a04503c068eef7901bb971f4107d3cc1339279ee95e3c3967651c98112b61fa7bc0fd913dd61a8aec6348180fa8bb357914c5
diff --git a/app-admin/filebeat/filebeat-7.8.0.ebuild b/app-admin/filebeat/filebeat-7.8.0.ebuild
new file mode 100644
index 000000000000..ad82014eecdb
--- /dev/null
+++ b/app-admin/filebeat/filebeat-7.8.0.ebuild
@@ -0,0 +1,1019 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+EGO_SUM=(
+ "4d63.com/embedfiles v0.0.0-20190311033909-995e0740726f"
+ "4d63.com/embedfiles v0.0.0-20190311033909-995e0740726f/go.mod"
+ "4d63.com/tz v1.1.1-0.20191124060701-6d37baae851b"
+ "4d63.com/tz v1.1.1-0.20191124060701-6d37baae851b/go.mod"
+ "bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod"
+ "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/go.mod"
+ "cloud.google.com/go v0.44.1/go.mod"
+ "cloud.google.com/go v0.44.2/go.mod"
+ "cloud.google.com/go v0.45.1/go.mod"
+ "cloud.google.com/go v0.46.3/go.mod"
+ "cloud.google.com/go v0.51.0"
+ "cloud.google.com/go v0.51.0/go.mod"
+ "cloud.google.com/go/bigquery v1.0.1"
+ "cloud.google.com/go/bigquery v1.0.1/go.mod"
+ "cloud.google.com/go/datastore v1.0.0"
+ "cloud.google.com/go/datastore v1.0.0/go.mod"
+ "cloud.google.com/go/pubsub v1.0.1"
+ "cloud.google.com/go/pubsub v1.0.1/go.mod"
+ "cloud.google.com/go/storage v1.0.0"
+ "cloud.google.com/go/storage v1.0.0/go.mod"
+ "code.cloudfoundry.org/go-diodes v0.0.0-20190809170250-f77fb823c7ee"
+ "code.cloudfoundry.org/go-diodes v0.0.0-20190809170250-f77fb823c7ee/go.mod"
+ "code.cloudfoundry.org/go-loggregator v7.4.0+incompatible"
+ "code.cloudfoundry.org/go-loggregator v7.4.0+incompatible/go.mod"
+ "code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f"
+ "code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f/go.mod"
+ "code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a"
+ "code.cloudfoundry.org/rfc5424 v0.0.0-20180905210152-236a6d29298a/go.mod"
+ "dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+ "github.com/Azure/azure-amqp-common-go/v3 v3.0.0"
+ "github.com/Azure/azure-amqp-common-go/v3 v3.0.0/go.mod"
+ "github.com/Azure/azure-event-hubs-go/v3 v3.1.2"
+ "github.com/Azure/azure-event-hubs-go/v3 v3.1.2/go.mod"
+ "github.com/Azure/azure-pipeline-go v0.1.8/go.mod"
+ "github.com/Azure/azure-pipeline-go v0.1.9/go.mod"
+ "github.com/Azure/azure-pipeline-go v0.2.1"
+ "github.com/Azure/azure-pipeline-go v0.2.1/go.mod"
+ "github.com/Azure/azure-sdk-for-go v37.1.0+incompatible"
+ "github.com/Azure/azure-sdk-for-go v37.1.0+incompatible/go.mod"
+ "github.com/Azure/azure-storage-blob-go v0.6.0/go.mod"
+ "github.com/Azure/azure-storage-blob-go v0.8.0"
+ "github.com/Azure/azure-storage-blob-go v0.8.0/go.mod"
+ "github.com/Azure/go-amqp v0.12.6"
+ "github.com/Azure/go-amqp v0.12.6/go.mod"
+ "github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78"
+ "github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod"
+ "github.com/Azure/go-autorest v12.2.0+incompatible"
+ "github.com/Azure/go-autorest v12.2.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.9.4"
+ "github.com/Azure/go-autorest/autorest v0.9.4/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"
+ "github.com/Azure/go-autorest/autorest/adal v0.8.1/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/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+ "github.com/Masterminds/semver v1.4.2"
+ "github.com/Masterminds/semver v1.4.2/go.mod"
+ "github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5"
+ "github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod"
+ "github.com/Microsoft/hcsshim v0.8.7"
+ "github.com/Microsoft/hcsshim v0.8.7/go.mod"
+ "github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
+ "github.com/PuerkitoBio/purell v1.0.0/go.mod"
+ "github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
+ "github.com/Shopify/toxiproxy v2.1.4+incompatible"
+ "github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod"
+ "github.com/StackExchange/wmi v0.0.0-20170221213301-9f32b5905fd6"
+ "github.com/StackExchange/wmi v0.0.0-20170221213301-9f32b5905fd6/go.mod"
+ "github.com/adriansr/fsnotify v0.0.0-20180417234312-c9bbe1f46f1d"
+ "github.com/adriansr/fsnotify v0.0.0-20180417234312-c9bbe1f46f1d/go.mod"
+ "github.com/adriansr/gopacket v1.1.18-0.20200327165309-dd62abfa8a41"
+ "github.com/adriansr/gopacket v1.1.18-0.20200327165309-dd62abfa8a41/go.mod"
+ "github.com/aerospike/aerospike-client-go v1.27.1-0.20170612174108-0f3b54da6bdc"
+ "github.com/aerospike/aerospike-client-go v1.27.1-0.20170612174108-0f3b54da6bdc/go.mod"
+ "github.com/akavel/rsrc v0.8.0"
+ "github.com/akavel/rsrc v0.8.0/go.mod"
+ "github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/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/andrewkroh/goja v0.0.0-20190128172624-dd2ac4456e20"
+ "github.com/andrewkroh/goja v0.0.0-20190128172624-dd2ac4456e20/go.mod"
+ "github.com/andrewkroh/sys v0.0.0-20151128191922-287798fe3e43"
+ "github.com/andrewkroh/sys v0.0.0-20151128191922-287798fe3e43/go.mod"
+ "github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod"
+ "github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod"
+ "github.com/antlr/antlr4 v0.0.0-20200326173327-a4c66dc863bb"
+ "github.com/antlr/antlr4 v0.0.0-20200326173327-a4c66dc863bb/go.mod"
+ "github.com/armon/go-radix v1.0.0"
+ "github.com/armon/go-radix v1.0.0/go.mod"
+ "github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5"
+ "github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod"
+ "github.com/aws/aws-lambda-go v1.6.0"
+ "github.com/aws/aws-lambda-go v1.6.0/go.mod"
+ "github.com/aws/aws-sdk-go-v2 v0.9.0"
+ "github.com/aws/aws-sdk-go-v2 v0.9.0/go.mod"
+ "github.com/awslabs/goformation/v3 v3.1.0/go.mod"
+ "github.com/awslabs/goformation/v4 v4.1.0"
+ "github.com/awslabs/goformation/v4 v4.1.0/go.mod"
+ "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/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2"
+ "github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2/go.mod"
+ "github.com/blang/semver v3.1.0+incompatible/go.mod"
+ "github.com/bradleyfalzon/ghinstallation v1.1.0"
+ "github.com/bradleyfalzon/ghinstallation v1.1.0/go.mod"
+ "github.com/bsm/sarama-cluster v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible"
+ "github.com/bsm/sarama-cluster v2.1.14-0.20180625083203-7e67d87a6b3f+incompatible/go.mod"
+ "github.com/cavaliercoder/badio v0.0.0-20160213150051-ce5280129e9e"
+ "github.com/cavaliercoder/badio v0.0.0-20160213150051-ce5280129e9e/go.mod"
+ "github.com/cavaliercoder/go-rpm v0.0.0-20190131055624-7a9c54e3d83e"
+ "github.com/cavaliercoder/go-rpm v0.0.0-20190131055624-7a9c54e3d83e/go.mod"
+ "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/chzyer/logex v1.1.10/go.mod"
+ "github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+ "github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+ "github.com/client9/misspell v0.3.4/go.mod"
+ "github.com/cloudfoundry-community/go-cfclient v0.0.0-20190808214049-35bcce23fc5f"
+ "github.com/cloudfoundry-community/go-cfclient v0.0.0-20190808214049-35bcce23fc5f/go.mod"
+ "github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4"
+ "github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4/go.mod"
+ "github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0"
+ "github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod"
+ "github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod"
+ "github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod"
+ "github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod"
+ "github.com/containerd/containerd v1.3.3"
+ "github.com/containerd/containerd v1.3.3/go.mod"
+ "github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod"
+ "github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41"
+ "github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41/go.mod"
+ "github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod"
+ "github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c"
+ "github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c/go.mod"
+ "github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod"
+ "github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod"
+ "github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod"
+ "github.com/coreos/bbolt v1.3.1-coreos.6.0.20180318001526-af9db2027c98"
+ "github.com/coreos/bbolt v1.3.1-coreos.6.0.20180318001526-af9db2027c98/go.mod"
+ "github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e"
+ "github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+ "github.com/coreos/go-systemd/v22 v22.0.0"
+ "github.com/coreos/go-systemd/v22 v22.0.0/go.mod"
+ "github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea"
+ "github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod"
+ "github.com/creack/pty v1.1.7/go.mod"
+ "github.com/cucumber/godog v0.8.1"
+ "github.com/cucumber/godog v0.8.1/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/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892"
+ "github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892/go.mod"
+ "github.com/denisenkom/go-mssqldb v0.0.0-20200206145737-bbfc9a55622e"
+ "github.com/denisenkom/go-mssqldb v0.0.0-20200206145737-bbfc9a55622e/go.mod"
+ "github.com/devigned/tab v0.1.1/go.mod"
+ "github.com/devigned/tab v0.1.2-0.20190607222403-0c15cf42f9a2"
+ "github.com/devigned/tab v0.1.2-0.20190607222403-0c15cf42f9a2/go.mod"
+ "github.com/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda/go.mod"
+ "github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+ "github.com/dgrijalva/jwt-go v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible"
+ "github.com/dgrijalva/jwt-go v3.2.1-0.20190620180102-5e25c22bd5d6+incompatible/go.mod"
+ "github.com/digitalocean/go-libvirt v0.0.0-20180301200012-6075ea3c39a1"
+ "github.com/digitalocean/go-libvirt v0.0.0-20180301200012-6075ea3c39a1/go.mod"
+ "github.com/dimchansky/utfbom v1.1.0"
+ "github.com/dimchansky/utfbom v1.1.0/go.mod"
+ "github.com/dlclark/regexp2 v1.1.7-0.20171009020623-7632a260cbaf"
+ "github.com/dlclark/regexp2 v1.1.7-0.20171009020623-7632a260cbaf/go.mod"
+ "github.com/docker/distribution v2.7.1+incompatible"
+ "github.com/docker/distribution v2.7.1+incompatible/go.mod"
+ "github.com/docker/engine v0.0.0-20191113042239-ea84732a7725"
+ "github.com/docker/engine v0.0.0-20191113042239-ea84732a7725/go.mod"
+ "github.com/docker/go-connections v0.4.0"
+ "github.com/docker/go-connections v0.4.0/go.mod"
+ "github.com/docker/go-metrics v0.0.1"
+ "github.com/docker/go-metrics v0.0.1/go.mod"
+ "github.com/docker/go-units v0.4.0"
+ "github.com/docker/go-units v0.4.0/go.mod"
+ "github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96"
+ "github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
+ "github.com/dop251/goja_nodejs v0.0.0-20171011081505-adff31b136e6"
+ "github.com/dop251/goja_nodejs v0.0.0-20171011081505-adff31b136e6/go.mod"
+ "github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4"
+ "github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
+ "github.com/eapache/go-resiliency v1.2.0"
+ "github.com/eapache/go-resiliency v1.2.0/go.mod"
+ "github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21"
+ "github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod"
+ "github.com/eapache/queue v1.1.0"
+ "github.com/eapache/queue v1.1.0/go.mod"
+ "github.com/eclipse/paho.mqtt.golang v1.2.1-0.20200121105743-0d940dd29fd2"
+ "github.com/eclipse/paho.mqtt.golang v1.2.1-0.20200121105743-0d940dd29fd2/go.mod"
+ "github.com/elastic/dhcp v0.0.0-20200227161230-57ec251c7eb3"
+ "github.com/elastic/dhcp v0.0.0-20200227161230-57ec251c7eb3/go.mod"
+ "github.com/elastic/ecs v1.5.0"
+ "github.com/elastic/ecs v1.5.0/go.mod"
+ "github.com/elastic/fsevents v0.0.0-20181029231046-e1d381a4d270"
+ "github.com/elastic/fsevents v0.0.0-20181029231046-e1d381a4d270/go.mod"
+ "github.com/elastic/go-libaudit v0.4.0"
+ "github.com/elastic/go-libaudit v0.4.0/go.mod"
+ "github.com/elastic/go-licenser v0.2.1"
+ "github.com/elastic/go-licenser v0.2.1/go.mod"
+ "github.com/elastic/go-lookslike v0.3.0"
+ "github.com/elastic/go-lookslike v0.3.0/go.mod"
+ "github.com/elastic/go-lumber v0.1.0"
+ "github.com/elastic/go-lumber v0.1.0/go.mod"
+ "github.com/elastic/go-perf v0.0.0-20191212140718-9c656876f595"
+ "github.com/elastic/go-perf v0.0.0-20191212140718-9c656876f595/go.mod"
+ "github.com/elastic/go-plugins-helpers v0.0.0-20200207104224-bdf17607b79f"
+ "github.com/elastic/go-plugins-helpers v0.0.0-20200207104224-bdf17607b79f/go.mod"
+ "github.com/elastic/go-seccomp-bpf v1.1.0"
+ "github.com/elastic/go-seccomp-bpf v1.1.0/go.mod"
+ "github.com/elastic/go-structform v0.0.6"
+ "github.com/elastic/go-structform v0.0.6/go.mod"
+ "github.com/elastic/go-sysinfo v1.1.1/go.mod"
+ "github.com/elastic/go-sysinfo v1.3.0"
+ "github.com/elastic/go-sysinfo v1.3.0/go.mod"
+ "github.com/elastic/go-txfile v0.0.7"
+ "github.com/elastic/go-txfile v0.0.7/go.mod"
+ "github.com/elastic/go-ucfg v0.7.0/go.mod"
+ "github.com/elastic/go-ucfg v0.8.3"
+ "github.com/elastic/go-ucfg v0.8.3/go.mod"
+ "github.com/elastic/go-windows v1.0.0/go.mod"
+ "github.com/elastic/go-windows v1.0.1"
+ "github.com/elastic/go-windows v1.0.1/go.mod"
+ "github.com/elastic/gosigar v0.10.5"
+ "github.com/elastic/gosigar v0.10.5/go.mod"
+ "github.com/elastic/sarama v1.24.1-elastic.0.20200519143807-cbc80333a91e"
+ "github.com/elastic/sarama v1.24.1-elastic.0.20200519143807-cbc80333a91e/go.mod"
+ "github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e"
+ "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/emirpasic/gods v1.12.0/go.mod"
+ "github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+ "github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+ "github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550/go.mod"
+ "github.com/evanphx/json-patch v4.2.0+incompatible"
+ "github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
+ "github.com/fatih/color v1.5.0"
+ "github.com/fatih/color v1.5.0/go.mod"
+ "github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod"
+ "github.com/fortytw2/leaktest v1.3.0"
+ "github.com/fortytw2/leaktest v1.3.0/go.mod"
+ "github.com/frankban/quicktest v1.7.2"
+ "github.com/frankban/quicktest v1.7.2/go.mod"
+ "github.com/garyburd/redigo v1.0.1-0.20160525165706-b8dc90050f24"
+ "github.com/garyburd/redigo v1.0.1-0.20160525165706-b8dc90050f24/go.mod"
+ "github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
+ "github.com/ghodss/yaml v1.0.0/go.mod"
+ "github.com/gliderlabs/ssh v0.2.2/go.mod"
+ "github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
+ "github.com/go-kit/kit v0.8.0/go.mod"
+ "github.com/go-kit/kit v0.9.0"
+ "github.com/go-kit/kit v0.9.0/go.mod"
+ "github.com/go-logfmt/logfmt v0.3.0/go.mod"
+ "github.com/go-logfmt/logfmt v0.4.0"
+ "github.com/go-logfmt/logfmt v0.4.0/go.mod"
+ "github.com/go-logr/logr v0.1.0/go.mod"
+ "github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab"
+ "github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod"
+ "github.com/go-ole/go-ole v1.2.5-0.20190920104607-14974a1cf647"
+ "github.com/go-ole/go-ole v1.2.5-0.20190920104607-14974a1cf647/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-sourcemap/sourcemap v2.1.2+incompatible"
+ "github.com/go-sourcemap/sourcemap v2.1.2+incompatible/go.mod"
+ "github.com/go-sql-driver/mysql v1.4.0/go.mod"
+ "github.com/go-sql-driver/mysql v1.4.1"
+ "github.com/go-sql-driver/mysql v1.4.1/go.mod"
+ "github.com/go-stack/stack v1.8.0"
+ "github.com/go-stack/stack v1.8.0/go.mod"
+ "github.com/gocarina/gocsv v0.0.0-20170324095351-ffef3ffc77be"
+ "github.com/gocarina/gocsv v0.0.0-20170324095351-ffef3ffc77be/go.mod"
+ "github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e"
+ "github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod"
+ "github.com/godbus/dbus/v5 v5.0.3"
+ "github.com/godbus/dbus/v5 v5.0.3/go.mod"
+ "github.com/godror/godror v0.10.4"
+ "github.com/godror/godror v0.10.4/go.mod"
+ "github.com/gofrs/flock v0.7.1/go.mod"
+ "github.com/gofrs/flock v0.7.2-0.20190320160742-5135e617513b"
+ "github.com/gofrs/flock v0.7.2-0.20190320160742-5135e617513b/go.mod"
+ "github.com/gofrs/uuid v3.2.0+incompatible"
+ "github.com/gofrs/uuid v3.2.0+incompatible/go.mod"
+ "github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod"
+ "github.com/gogo/protobuf v1.0.0/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.3.1"
+ "github.com/gogo/protobuf v1.3.1/go.mod"
+ "github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe"
+ "github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/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-20190702054246-869f871628b6/go.mod"
+ "github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7"
+ "github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
+ "github.com/golang/mock v1.1.1/go.mod"
+ "github.com/golang/mock v1.2.0/go.mod"
+ "github.com/golang/mock v1.3.1/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/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-20160524151835-7d79101e329e/go.mod"
+ "github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+ "github.com/google/btree v1.0.0/go.mod"
+ "github.com/google/flatbuffers v1.7.2-0.20170925184458-7a6b2bf521e9"
+ "github.com/google/flatbuffers v1.7.2-0.20170925184458-7a6b2bf521e9/go.mod"
+ "github.com/google/go-cmp v0.2.0/go.mod"
+ "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-github/v28 v28.1.1"
+ "github.com/google/go-github/v28 v28.1.1/go.mod"
+ "github.com/google/go-github/v29 v29.0.2"
+ "github.com/google/go-github/v29 v29.0.2/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 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/google/martian v2.1.0+incompatible"
+ "github.com/google/martian v2.1.0+incompatible/go.mod"
+ "github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+ "github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+ "github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
+ "github.com/google/renameio v0.1.0/go.mod"
+ "github.com/google/subcommands v1.0.1/go.mod"
+ "github.com/google/uuid v1.0.0/go.mod"
+ "github.com/google/uuid v1.1.1/go.mod"
+ "github.com/google/uuid v1.1.2-0.20190416172445-c2e93f3ae59f"
+ "github.com/google/uuid v1.1.2-0.20190416172445-c2e93f3ae59f/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-20170426233943-68f4ded48ba9/go.mod"
+ "github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
+ "github.com/googleapis/gnostic v0.3.1-0.20190624222214-25d8b0b66985"
+ "github.com/googleapis/gnostic v0.3.1-0.20190624222214-25d8b0b66985/go.mod"
+ "github.com/gophercloud/gophercloud v0.0.0-20190126172459-c818fa66e4c8/go.mod"
+ "github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
+ "github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+ "github.com/gorhill/cronexpr v0.0.0-20161205141322-d520615e531a"
+ "github.com/gorhill/cronexpr v0.0.0-20161205141322-d520615e531a/go.mod"
+ "github.com/gorilla/mux v1.7.2"
+ "github.com/gorilla/mux v1.7.2/go.mod"
+ "github.com/gorilla/websocket v1.4.1"
+ "github.com/gorilla/websocket v1.4.1/go.mod"
+ "github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod"
+ "github.com/grpc-ecosystem/grpc-gateway v1.13.0"
+ "github.com/grpc-ecosystem/grpc-gateway v1.13.0/go.mod"
+ "github.com/h2non/filetype v1.0.12"
+ "github.com/h2non/filetype v1.0.12/go.mod"
+ "github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce"
+ "github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod"
+ "github.com/hashicorp/errwrap v1.0.0"
+ "github.com/hashicorp/errwrap v1.0.0/go.mod"
+ "github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874"
+ "github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod"
+ "github.com/hashicorp/go-multierror v1.0.0"
+ "github.com/hashicorp/go-multierror v1.0.0/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.0.0"
+ "github.com/hashicorp/go-version v1.0.0/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.2-0.20190520140433-59383c442f7d"
+ "github.com/hashicorp/golang-lru v0.5.2-0.20190520140433-59383c442f7d/go.mod"
+ "github.com/haya14busa/go-actions-toolkit v0.0.0-20200105081403-ca0307860f01"
+ "github.com/haya14busa/go-actions-toolkit v0.0.0-20200105081403-ca0307860f01/go.mod"
+ "github.com/haya14busa/go-checkstyle v0.0.0-20170303121022-5e9d09f51fa1/go.mod"
+ "github.com/haya14busa/secretbox v0.0.0-20180525171038-07c7ecf409f5/go.mod"
+ "github.com/hpcloud/tail v1.0.0"
+ "github.com/hpcloud/tail v1.0.0/go.mod"
+ "github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/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"
+ "github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+ "github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod"
+ "github.com/jcmturner/gofork v1.0.0"
+ "github.com/jcmturner/gofork v1.0.0/go.mod"
+ "github.com/jessevdk/go-flags v1.4.0/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/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5"
+ "github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5/go.mod"
+ "github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901"
+ "github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901/go.mod"
+ "github.com/joho/godotenv v1.3.0"
+ "github.com/joho/godotenv v1.3.0/go.mod"
+ "github.com/josephspurrier/goversioninfo v0.0.0-20200309025242-14b0ab84c6ca"
+ "github.com/josephspurrier/goversioninfo v0.0.0-20200309025242-14b0ab84c6ca/go.mod"
+ "github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/go.mod"
+ "github.com/jpillora/backoff v1.0.0"
+ "github.com/jpillora/backoff v1.0.0/go.mod"
+ "github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
+ "github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/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/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+ "github.com/jstemmer/go-junit-report v0.9.1"
+ "github.com/jstemmer/go-junit-report v0.9.1/go.mod"
+ "github.com/jtolds/gls v4.20.0+incompatible"
+ "github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+ "github.com/julienschmidt/httprouter v1.2.0/go.mod"
+ "github.com/justinas/nosurf v1.1.0/go.mod"
+ "github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/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/klauspost/compress v1.9.8"
+ "github.com/klauspost/compress v1.9.8/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"
+ "github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+ "github.com/kr/pretty v0.1.0"
+ "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/pty v1.1.8/go.mod"
+ "github.com/kr/text v0.1.0"
+ "github.com/kr/text v0.1.0/go.mod"
+ "github.com/kylelemons/godebug v1.1.0"
+ "github.com/kylelemons/godebug v1.1.0/go.mod"
+ "github.com/lib/pq v1.0.0/go.mod"
+ "github.com/lib/pq v1.1.2-0.20190507191818-2ff3cb3adc01"
+ "github.com/lib/pq v1.1.2-0.20190507191818-2ff3cb3adc01/go.mod"
+ "github.com/magefile/mage v1.9.0"
+ "github.com/magefile/mage v1.9.0/go.mod"
+ "github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
+ "github.com/mailru/easyjson v0.7.1"
+ "github.com/mailru/easyjson v0.7.1/go.mod"
+ "github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11"
+ "github.com/martini-contrib/render v0.0.0-20150707142108-ec18f8345a11/go.mod"
+ "github.com/mattn/go-colorable v0.0.8"
+ "github.com/mattn/go-colorable v0.0.8/go.mod"
+ "github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod"
+ "github.com/mattn/go-ieproxy v0.0.0-20191113090002-7c0f6868bffe"
+ "github.com/mattn/go-ieproxy v0.0.0-20191113090002-7c0f6868bffe/go.mod"
+ "github.com/mattn/go-isatty v0.0.2"
+ "github.com/mattn/go-isatty v0.0.2/go.mod"
+ "github.com/mattn/go-shellwords v1.0.7"
+ "github.com/mattn/go-shellwords v1.0.7/go.mod"
+ "github.com/mattn/go-sqlite3 v1.9.0"
+ "github.com/mattn/go-sqlite3 v1.9.0/go.mod"
+ "github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+ "github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369"
+ "github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod"
+ "github.com/miekg/dns v1.1.15"
+ "github.com/miekg/dns v1.1.15/go.mod"
+ "github.com/mitchellh/go-homedir v1.1.0"
+ "github.com/mitchellh/go-homedir v1.1.0/go.mod"
+ "github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
+ "github.com/mitchellh/gox v1.0.1"
+ "github.com/mitchellh/gox v1.0.1/go.mod"
+ "github.com/mitchellh/hashstructure v0.0.0-20170116052023-ab25296c0f51"
+ "github.com/mitchellh/hashstructure v0.0.0-20170116052023-ab25296c0f51/go.mod"
+ "github.com/mitchellh/iochan v1.0.0"
+ "github.com/mitchellh/iochan v1.0.0/go.mod"
+ "github.com/mitchellh/mapstructure v1.1.2"
+ "github.com/mitchellh/mapstructure v1.1.2/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/morikuni/aec v1.0.0"
+ "github.com/morikuni/aec v1.0.0/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/oklog/ulid v1.3.1"
+ "github.com/oklog/ulid v1.3.1/go.mod"
+ "github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+ "github.com/onsi/ginkgo v1.5.0/go.mod"
+ "github.com/onsi/ginkgo v1.6.0/go.mod"
+ "github.com/onsi/ginkgo v1.8.0/go.mod"
+ "github.com/onsi/ginkgo v1.10.1"
+ "github.com/onsi/ginkgo v1.10.1/go.mod"
+ "github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+ "github.com/onsi/gomega v0.0.0-20190113212917-5533ce8a0da3/go.mod"
+ "github.com/onsi/gomega v1.2.0/go.mod"
+ "github.com/onsi/gomega v1.4.3/go.mod"
+ "github.com/onsi/gomega v1.5.0/go.mod"
+ "github.com/onsi/gomega v1.7.0"
+ "github.com/onsi/gomega v1.7.0/go.mod"
+ "github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod"
+ "github.com/opencontainers/go-digest v1.0.0-rc1/go.mod"
+ "github.com/opencontainers/go-digest v1.0.0-rc1.0.20190228220655-ac19fd6e7483"
+ "github.com/opencontainers/go-digest v1.0.0-rc1.0.20190228220655-ac19fd6e7483/go.mod"
+ "github.com/opencontainers/image-spec v1.0.1/go.mod"
+ "github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6"
+ "github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6/go.mod"
+ "github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod"
+ "github.com/opencontainers/runc v1.0.0-rc9"
+ "github.com/opencontainers/runc v1.0.0-rc9/go.mod"
+ "github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod"
+ "github.com/opencontainers/runtime-spec v1.0.1/go.mod"
+ "github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod"
+ "github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2"
+ "github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2/go.mod"
+ "github.com/pelletier/go-buffruneio v0.2.0/go.mod"
+ "github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
+ "github.com/pierrec/lz4 v2.4.1+incompatible"
+ "github.com/pierrec/lz4 v2.4.1+incompatible/go.mod"
+ "github.com/pierrre/gotestcover v0.0.0-20160113212533-7b94f124d338"
+ "github.com/pierrre/gotestcover v0.0.0-20160113212533-7b94f124d338/go.mod"
+ "github.com/pkg/errors v0.8.0/go.mod"
+ "github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod"
+ "github.com/pkg/errors v0.8.1/go.mod"
+ "github.com/pkg/errors v0.9.1"
+ "github.com/pkg/errors v0.9.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/prometheus/client_golang v0.9.1/go.mod"
+ "github.com/prometheus/client_golang v1.0.0/go.mod"
+ "github.com/prometheus/client_golang v1.1.0/go.mod"
+ "github.com/prometheus/client_golang v1.1.1-0.20190913103102-20428fa0bffc"
+ "github.com/prometheus/client_golang v1.1.1-0.20190913103102-20428fa0bffc/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"
+ "github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+ "github.com/prometheus/common v0.4.1/go.mod"
+ "github.com/prometheus/common v0.6.0/go.mod"
+ "github.com/prometheus/common v0.7.0"
+ "github.com/prometheus/common v0.7.0/go.mod"
+ "github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+ "github.com/prometheus/procfs v0.0.0-20190425082905-87a4384529e0/go.mod"
+ "github.com/prometheus/procfs v0.0.2/go.mod"
+ "github.com/prometheus/procfs v0.0.3/go.mod"
+ "github.com/prometheus/procfs v0.0.5/go.mod"
+ "github.com/prometheus/procfs v0.0.11"
+ "github.com/prometheus/procfs v0.0.11/go.mod"
+ "github.com/prometheus/prometheus v2.5.0+incompatible"
+ "github.com/prometheus/prometheus v2.5.0+incompatible/go.mod"
+ "github.com/rakyll/statik v0.1.6/go.mod"
+ "github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563"
+ "github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod"
+ "github.com/reviewdog/errorformat v0.0.0-20200109134752-8983be9bc7dd"
+ "github.com/reviewdog/errorformat v0.0.0-20200109134752-8983be9bc7dd/go.mod"
+ "github.com/reviewdog/reviewdog v0.9.17"
+ "github.com/reviewdog/reviewdog v0.9.17/go.mod"
+ "github.com/rogpeppe/fastuuid v1.2.0/go.mod"
+ "github.com/rogpeppe/go-internal v1.3.0/go.mod"
+ "github.com/samuel/go-parser v0.0.0-20130731160455-ca8abbf65d0e"
+ "github.com/samuel/go-parser v0.0.0-20130731160455-ca8abbf65d0e/go.mod"
+ "github.com/samuel/go-thrift v0.0.0-20140522043831-2187045faa54"
+ "github.com/samuel/go-thrift v0.0.0-20140522043831-2187045faa54/go.mod"
+ "github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b"
+ "github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b/go.mod"
+ "github.com/sanathkr/yaml v0.0.0-20170819201035-0056894fa522/go.mod"
+ "github.com/sanathkr/yaml v1.0.1-0.20170819201035-0056894fa522"
+ "github.com/sanathkr/yaml v1.0.1-0.20170819201035-0056894fa522/go.mod"
+ "github.com/santhosh-tekuri/jsonschema v1.2.4"
+ "github.com/santhosh-tekuri/jsonschema v1.2.4/go.mod"
+ "github.com/sergi/go-diff v1.0.0/go.mod"
+ "github.com/shirou/gopsutil v2.19.11+incompatible"
+ "github.com/shirou/gopsutil v2.19.11+incompatible/go.mod"
+ "github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod"
+ "github.com/sirupsen/logrus v1.2.0/go.mod"
+ "github.com/sirupsen/logrus v1.4.1/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-20180927180507-b2de0cb4f26d"
+ "github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+ "github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a"
+ "github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
+ "github.com/spf13/afero v1.2.2/go.mod"
+ "github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod"
+ "github.com/spf13/cobra v0.0.3"
+ "github.com/spf13/cobra v0.0.3/go.mod"
+ "github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
+ "github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod"
+ "github.com/spf13/pflag v1.0.1/go.mod"
+ "github.com/spf13/pflag v1.0.3"
+ "github.com/spf13/pflag v1.0.3/go.mod"
+ "github.com/src-d/gcfg v1.4.0/go.mod"
+ "github.com/stretchr/objx v0.1.0/go.mod"
+ "github.com/stretchr/objx v0.1.1/go.mod"
+ "github.com/stretchr/objx v0.2.0"
+ "github.com/stretchr/objx v0.2.0/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.5.0"
+ "github.com/stretchr/testify v1.5.0/go.mod"
+ "github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod"
+ "github.com/tsg/go-daemon v0.0.0-20200207173439-e704b93fd89b"
+ "github.com/tsg/go-daemon v0.0.0-20200207173439-e704b93fd89b/go.mod"
+ "github.com/tsg/gopacket v0.0.0-20190320122513-dd3d0e41124a"
+ "github.com/tsg/gopacket v0.0.0-20190320122513-dd3d0e41124a/go.mod"
+ "github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod"
+ "github.com/urso/diag v0.0.0-20200125202105-ffdc32ff5518/go.mod"
+ "github.com/urso/diag v0.0.0-20200210123136-21b3cc8eb797"
+ "github.com/urso/diag v0.0.0-20200210123136-21b3cc8eb797/go.mod"
+ "github.com/urso/diag-ecs v0.0.0-20200210114345-ab085841dcb9"
+ "github.com/urso/diag-ecs v0.0.0-20200210114345-ab085841dcb9/go.mod"
+ "github.com/urso/ecslog v0.0.1"
+ "github.com/urso/ecslog v0.0.1/go.mod"
+ "github.com/urso/go-bin v0.0.0-20180220135811-781c575c9f0e"
+ "github.com/urso/go-bin v0.0.0-20180220135811-781c575c9f0e/go.mod"
+ "github.com/urso/magetools v0.0.0-20190919040553-290c89e0c230/go.mod"
+ "github.com/urso/magetools v0.0.0-20200125210132-c2e338f92f3a"
+ "github.com/urso/magetools v0.0.0-20200125210132-c2e338f92f3a/go.mod"
+ "github.com/urso/qcgen v0.0.0-20180131103024-0b059e7db4f4"
+ "github.com/urso/qcgen v0.0.0-20180131103024-0b059e7db4f4/go.mod"
+ "github.com/urso/sderr v0.0.0-20200210124243-c2a16f3d43ec"
+ "github.com/urso/sderr v0.0.0-20200210124243-c2a16f3d43ec/go.mod"
+ "github.com/vbatts/tar-split v0.11.1/go.mod"
+ "github.com/vmware/govmomi v0.0.0-20170802214208-2cad15190b41"
+ "github.com/vmware/govmomi v0.0.0-20170802214208-2cad15190b41/go.mod"
+ "github.com/xanzy/go-gitlab v0.22.3"
+ "github.com/xanzy/go-gitlab v0.22.3/go.mod"
+ "github.com/xanzy/ssh-agent v0.2.1/go.mod"
+ "github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c"
+ "github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod"
+ "github.com/xdg/stringprep v1.0.0"
+ "github.com/xdg/stringprep v1.0.0/go.mod"
+ "github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod"
+ "github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb"
+ "github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod"
+ "github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415"
+ "github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod"
+ "github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod"
+ "github.com/xeipuuv/gojsonschema v0.0.0-20181112162635-ac52e6811b56"
+ "github.com/xeipuuv/gojsonschema v0.0.0-20181112162635-ac52e6811b56/go.mod"
+ "github.com/yuin/gopher-lua v0.0.0-20170403160031-b402f3114ec7"
+ "github.com/yuin/gopher-lua v0.0.0-20170403160031-b402f3114ec7/go.mod"
+ "go.elastic.co/apm v1.7.2"
+ "go.elastic.co/apm v1.7.2/go.mod"
+ "go.elastic.co/apm/module/apmelasticsearch v1.7.2"
+ "go.elastic.co/apm/module/apmelasticsearch v1.7.2/go.mod"
+ "go.elastic.co/apm/module/apmhttp v1.7.2"
+ "go.elastic.co/apm/module/apmhttp v1.7.2/go.mod"
+ "go.elastic.co/ecszap v0.1.1-0.20200424093508-cdd95a104193"
+ "go.elastic.co/ecszap v0.1.1-0.20200424093508-cdd95a104193/go.mod"
+ "go.elastic.co/fastjson v1.0.0"
+ "go.elastic.co/fastjson v1.0.0/go.mod"
+ "go.opencensus.io v0.21.0/go.mod"
+ "go.opencensus.io v0.22.0/go.mod"
+ "go.opencensus.io v0.22.2"
+ "go.opencensus.io v0.22.2/go.mod"
+ "go.uber.org/atomic v1.5.0"
+ "go.uber.org/atomic v1.5.0/go.mod"
+ "go.uber.org/multierr v1.3.0"
+ "go.uber.org/multierr v1.3.0/go.mod"
+ "go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee"
+ "go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod"
+ "go.uber.org/zap v1.14.0"
+ "go.uber.org/zap v1.14.0/go.mod"
+ "golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod"
+ "golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+ "golang.org/x/crypto v0.0.0-20181025213731-e84da0312774/go.mod"
+ "golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod"
+ "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+ "golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod"
+ "golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+ "golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+ "golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/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-20200204104054-c9f3fb736b72/go.mod"
+ "golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37"
+ "golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod"
+ "golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+ "golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
+ "golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+ "golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
+ "golang.org/x/exp v0.0.0-20191227195350-da58074b4299"
+ "golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
+ "golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+ "golang.org/x/image v0.0.0-20190802002840-cff245a6509b/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-20190909230951-414d861bb4ac/go.mod"
+ "golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+ "golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f"
+ "golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
+ "golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+ "golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
+ "golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+ "golang.org/x/mod v0.1.0/go.mod"
+ "golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/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-20181108082009-03003ca0c849/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-20190108225652-1e06a53dbb7e/go.mod"
+ "golang.org/x/net v0.0.0-20190206173232-65e2d4e15006/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-20190603091049-60506f45cf65/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-20190724013045-ca1201d0de80/go.mod"
+ "golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod"
+ "golang.org/x/net v0.0.0-20191021144547-ec77196f6094/go.mod"
+ "golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod"
+ "golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
+ "golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
+ "golang.org/x/net v0.0.0-20200202094626-16171245cfb2"
+ "golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+ "golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+ "golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod"
+ "golang.org/x/oauth2 v0.0.0-20190130055435-99b60b757ec1/go.mod"
+ "golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+ "golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod"
+ "golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+ "golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
+ "golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d"
+ "golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/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"
+ "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-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-20181116152217-5ac8a444bdc5/go.mod"
+ "golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+ "golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod"
+ "golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+ "golang.org/x/sys v0.0.0-20190405154228-4b34438f7a67/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-20190514135907-3a4b5fb9f71f/go.mod"
+ "golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+ "golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod"
+ "golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+ "golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
+ "golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod"
+ "golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod"
+ "golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod"
+ "golang.org/x/sys v0.0.0-20191025021431-6c3a3bfe00ae/go.mod"
+ "golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod"
+ "golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+ "golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
+ "golang.org/x/sys v0.0.0-20200102141924-c96a22e43c9c"
+ "golang.org/x/sys v0.0.0-20200102141924-c96a22e43c9c/go.mod"
+ "golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e"
+ "golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/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-20161028155119-f51c12702a4d/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-20191024005414-555d28b269f0"
+ "golang.org/x/time v0.0.0-20191024005414-555d28b269f0/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-20190312151545-0bb0c0a6e846/go.mod"
+ "golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+ "golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+ "golang.org/x/tools v0.0.0-20190425150028-36563e24a262/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-20190606124116-d0a3d012864b/go.mod"
+ "golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+ "golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+ "golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod"
+ "golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
+ "golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
+ "golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
+ "golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod"
+ "golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod"
+ "golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
+ "golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4"
+ "golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/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.7.0/go.mod"
+ "google.golang.org/api v0.8.0/go.mod"
+ "google.golang.org/api v0.9.0/go.mod"
+ "google.golang.org/api v0.15.0"
+ "google.golang.org/api v0.15.0/go.mod"
+ "google.golang.org/appengine v1.1.0/go.mod"
+ "google.golang.org/appengine v1.2.0/go.mod"
+ "google.golang.org/appengine v1.3.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.1/go.mod"
+ "google.golang.org/appengine v1.6.5"
+ "google.golang.org/appengine v1.6.5/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-20190801165951-fa694d86fc64/go.mod"
+ "google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+ "google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
+ "google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c/go.mod"
+ "google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb"
+ "google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/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.1/go.mod"
+ "google.golang.org/grpc v1.23.0/go.mod"
+ "google.golang.org/grpc v1.24.0/go.mod"
+ "google.golang.org/grpc v1.26.0/go.mod"
+ "google.golang.org/grpc v1.27.1"
+ "google.golang.org/grpc v1.27.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-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/errgo.v2 v2.1.0/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/go.mod"
+ "gopkg.in/inf.v0 v0.9.0"
+ "gopkg.in/inf.v0 v0.9.0/go.mod"
+ "gopkg.in/jcmturner/aescts.v1 v1.0.1"
+ "gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod"
+ "gopkg.in/jcmturner/dnsutils.v1 v1.0.1"
+ "gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod"
+ "gopkg.in/jcmturner/goidentity.v3 v3.0.0"
+ "gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod"
+ "gopkg.in/jcmturner/gokrb5.v7 v7.5.0"
+ "gopkg.in/jcmturner/gokrb5.v7 v7.5.0/go.mod"
+ "gopkg.in/jcmturner/rpc.v1 v1.1.0"
+ "gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod"
+ "gopkg.in/mgo.v2 v2.0.0-20160818020120-3f83fa500528"
+ "gopkg.in/mgo.v2 v2.0.0-20160818020120-3f83fa500528/go.mod"
+ "gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod"
+ "gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod"
+ "gopkg.in/src-d/go-git.v4 v4.13.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/warnings.v0 v0.1.2/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.3/go.mod"
+ "gopkg.in/yaml.v2 v2.2.4/go.mod"
+ "gopkg.in/yaml.v2 v2.2.7/go.mod"
+ "gopkg.in/yaml.v2 v2.2.8"
+ "gopkg.in/yaml.v2 v2.2.8/go.mod"
+ "gotest.tools v2.2.0+incompatible"
+ "gotest.tools v2.2.0+incompatible/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"
+ "honnef.co/go/tools v0.0.1-2019.2.3"
+ "honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+ "howett.net/plist v0.0.0-20181124034731-591f970eefbb"
+ "howett.net/plist v0.0.0-20181124034731-591f970eefbb/go.mod"
+ "k8s.io/api v0.0.0-20190620084959-7cf5895f2711/go.mod"
+ "k8s.io/api v0.0.0-20190722141453-b90922c02518"
+ "k8s.io/api v0.0.0-20190722141453-b90922c02518/go.mod"
+ "k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719/go.mod"
+ "k8s.io/apimachinery v0.0.0-20190719140911-bfcf53abc9f8"
+ "k8s.io/apimachinery v0.0.0-20190719140911-bfcf53abc9f8/go.mod"
+ "k8s.io/client-go v0.0.0-20190620085101-78d2af792bab"
+ "k8s.io/client-go v0.0.0-20190620085101-78d2af792bab/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 v0.3.1/go.mod"
+ "k8s.io/klog v0.3.4-0.20190719014911-6a023d6d0e09"
+ "k8s.io/klog v0.3.4-0.20190719014911-6a023d6d0e09/go.mod"
+ "k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod"
+ "k8s.io/kube-openapi v0.0.0-20190709113604-33be087ad058"
+ "k8s.io/kube-openapi v0.0.0-20190709113604-33be087ad058/go.mod"
+ "k8s.io/kubernetes v1.13.0/go.mod"
+ "k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod"
+ "k8s.io/utils v0.0.0-20190712204705-3dccf664f023"
+ "k8s.io/utils v0.0.0-20190712204705-3dccf664f023/go.mod"
+ "rsc.io/binaryregexp v0.2.0/go.mod"
+ "sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
+ "sigs.k8s.io/yaml v1.1.0/go.mod"
+ "sigs.k8s.io/yaml v1.1.1-0.20190704183835-4cd0c284b15f"
+ "sigs.k8s.io/yaml v1.1.1-0.20190704183835-4cd0c284b15f/go.mod"
+)
+
+go-module_set_globals
+
+DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/beats"
+SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ ${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+S="${WORKDIR}/beats-${PV}"
+
+src_prepare() {
+ default
+
+ # avoid Elastic license
+ rm -r x-pack || die
+
+ # use ${PV} instead of git commit id
+ sed -i "s/\(COMMIT_ID=\).*/\1${PV}/g" "${S}/libbeat/scripts/Makefile" || die
+}
+
+src_compile() {
+ emake -C "${S}/filebeat"
+}
+
+src_install() {
+ keepdir /etc/${PN}
+ keepdir /var/{lib,log}/${PN}
+
+ fperms 0750 /var/{lib,log}/${PN}
+
+ newconfd "${FILESDIR}/${PN}.confd" ${PN}
+ newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
+
+ docinto examples
+ dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
+
+ dobin filebeat/filebeat
+}
+
+pkg_postinst() {
+ if [[ -n "${REPLACING_VERSIONS}" ]]; then
+ elog "Please read the migration guide at:"
+ elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html"
+ elog ""
+ fi
+
+ elog "Example configurations:"
+ elog "${EROOT}/usr/share/doc/${PF}/examples"
+}
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index bfaf48bbf8f8..3b9ba5f55fe0 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -1,6 +1,8 @@
DIST logstash-6.8.8.tar.gz 179965893 BLAKE2B a56db7b09c7fd59a5496e076ab11bf273265cff7eedfc9c9dfaa117a16baeb9b9c8e97a71eb8ff2a80f379b242d08c2d997476d7a48bab802ff3380d8914f13c SHA512 11c0b9be1d51c3feff82181234d0b5cd838edff78678bdc410f306c52d6345393e9d6c4d6095c2e3aa044f8c5af35d98fa2570891e81e9e3c57907c2baed6100
DIST logstash-7.6.2.tar.gz 172679447 BLAKE2B afeaab06178669559ff532cf72575f8063d07f95f2401060d33e0a99c87bb9e0c251e45634b9723efe456892ac19586accc89cf7272163e48eeaef438632b777 SHA512 c86dcf36cd0d578467c7013234040d5ea100f08ef69a185f6aa86c87dfa46936282abf10d0f495ffe649274136b735d17ab513ef3401205140c2d98bd9f91238
DIST logstash-7.7.0.tar.gz 166451553 BLAKE2B 30b732f1ef516b275246b0e14212b0b00b78502e0b4e78211b3bfdd77e2190639ed8c35f775dae7817b0b43a446d34941b968e8a0785302c337a326a507fc607 SHA512 970740adc47551d7967b9841cc39d15f2cbdcd46c2fee1f84b5688fac266fdcd2202cbb10d3a10cf3768606f693ed2e4fc79e91d293a3295083718bafaa7bc9d
+DIST logstash-7.8.0.tar.gz 167162975 BLAKE2B 666746571151b1cc1b79fc7405235a107f452c4741ba0e65f151e8b38934239e57698faed3663889d932eabf43e58277a1b2d5aebbf8dfa8c3f5e77fa8778ed2 SHA512 8b7c9015edfde0bed43a2668bf24d8523f785ea8f94b522e5d9dd886a677459f2c2c2e103b91b04f671287177e902e8f3fbf6747841f7984357a803405f9ed00
DIST logstash-oss-6.8.8.tar.gz 179836007 BLAKE2B e278d8dd34341bceb506accb3424b4af6db0795b582e1370d60f4a4b68671372449c94ae28f4a7585b8d4f4e63dcf7d6fa80eed37fd4ef8e872414ae2cd15b80 SHA512 ceba8d798c1246c9fd3385bc4b64995fcf9083dc5149211fabc09bfa3208d56bba6d8ae4ab73da5f9968633f30c547e0132f76543e2f9a2a96675ee58df74b09
DIST logstash-oss-7.6.2.tar.gz 172501347 BLAKE2B 2a83d7617c8e13a0b736ed0023a164d2191102f49e7d7174bf3ea9c56370c51e4fd760f7bb3aba97f1b9bd2ec122ba22e00dec9ac9636f7b79128c6bb2da548e SHA512 c425a9748964ef38fc58f67778cd88fc367df91087362353cfee316e54528e4a23407e1fc53d628008fd4c829b427061758112f10e7805cec88c0a1f0a966d2a
DIST logstash-oss-7.7.0.tar.gz 166272505 BLAKE2B a12b065874e03ae985c590b8bcbaabf4d2ee6d0ce3ca1f5d60b0874074996e7f8c40bad4fd242e26e74c11741620103e41bdeade2f60f6fabe97652d1c9fbb1e SHA512 a455fcf5c9a44c326ae581f9390ddf206064e6e6b3801cca312cef91e8d33086f8a6598ed68f81f2cfc6d8d66783632b983bef7c8a4ad0f24e929827ec137da4
+DIST logstash-oss-7.8.0.tar.gz 166982219 BLAKE2B e0d6b500184523e1bb2e52fae6971e12bd7a547796508d4eb6883ffb16e41676a807eb7b228e8e2a64c9b7b5b9e375b2acebe15a0dc77e502707350e43390795 SHA512 4413ed97527eb89da3462cc401b84f4770bfb9e3e3083fb314b8ac813165655752a204f091512de3507527bf8cbea5934f67ada446448802424dd441da2d475e
diff --git a/app-admin/logstash-bin/logstash-bin-7.8.0.ebuild b/app-admin/logstash-bin/logstash-bin-7.8.0.ebuild
new file mode 100644
index 000000000000..9e7d19873de3
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-7.8.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2
+
+MY_PN="${PN%-bin}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for managing events and logs"
+HOMEPAGE="https://www.elastic.co/products/logstash"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
+ !x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RESTRICT="strip"
+QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
+
+RDEPEND="acct-group/logstash
+ acct-user/logstash
+ virtual/jre"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
+ keepdir "/var/log/${MY_PN}"
+
+ insinto "/usr/share/${MY_PN}"
+ newins "${FILESDIR}/agent.conf.sample" agent.conf
+
+ rm -v config/{pipelines.yml,startup.options} || die
+ insinto /etc/${MY_PN}
+ doins -r config/.
+ doins "${FILESDIR}/pipelines.yml"
+ rm -rv config data || die
+
+ insinto "/opt/${MY_PN}"
+ doins -r .
+ fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
+
+ newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
+ newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
+
+ insinto /usr/share/eselect/modules
+ doins "${FILESDIR}"/logstash-plugin.eselect
+}
+
+pkg_postinst() {
+ ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
+ ewarn "Install the plugins via eselect module that will automatically re-install"
+ ewarn "all self installed plugins after Logstash upgrades."
+ elog
+ elog "Installing plugins:"
+ elog "eselect logstash-plugin install logstash-output-gelf"
+ elog
+
+ elog "Reinstalling self installed plugins (installed via eselect module):"
+ eselect logstash-plugin reinstall
+
+ elog
+ elog "Sample configuration:"
+ elog "${EROOT}/usr/share/${MY_PN}"
+ elog
+ elog "The default pipeline configuration expects the configuration(s) to be found in:"
+ elog "${EROOT}/etc/logstash/conf.d/*.conf"
+}
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index a89be67912fc..d5da4ec003ed 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -2,5 +2,7 @@ DIST mongo-tools-3.6.13.tar.gz 4990848 BLAKE2B 022ddf214869c3a3e545aa9572f77f0ad
DIST mongo-tools-3.6.17.tar.gz 4991196 BLAKE2B 53e86b3513aa74ad174801cea987d574c5248f438cb0a9419c2352c04333eae2f92214b11c59ee8688ad7235dc7a4586c39cc27450c654b1fc0e2eec2e4e22e2 SHA512 ea7a010097fdfe7807daf9352519b808b4a7b614b793ee2ac27495207bcf1cf8b4151fecd525946a0d6b8aa9332c205f437d5141b16efb613810963f502061be
DIST mongo-tools-4.0.12.tar.gz 11134652 BLAKE2B d3c9703046dc577b85cefe1185678e0029411ddd44d0648f9b09fc3ab41e3661891d18afd83bf1a148dc4c9208895f444c115948e515e09dfa3062e89d98fc24 SHA512 068d8c456386caddcce23fa8917ffecdc9b5c39fb6794c5cd1d9099be1f127ecf680b006055581dc3d90507072a87788b46be7410f0dbede42da64c664b77ced
DIST mongo-tools-4.0.16.tar.gz 11139827 BLAKE2B 550acfd7e4434b178170dfd94c65668cb7dd37d128235c63a10f72802e3119f33d5cd2138bfd5b957f6d3813f1d9aff49218c4e122c0cd454b4ea7a969c84d4e SHA512 a75831d9fd0b596bfb7354cbc05d1ecf6871d5a7230a858b09b94d5001d18069c9cbe89c9500e9c1a16fc5186fa7a1ac59c605156666a3f1a2d7c81115a47c16
+DIST mongo-tools-4.0.19.tar.gz 11139649 BLAKE2B 7e730138fce671e18a0ebe929b98eff1c0ce2c364ceef7d6868c380242689411c545ac321aebd609dcfe9f8d5b7d35cf37973a978f35a50cc44902b2dbad7134 SHA512 2639cb27a5a27e405bddf9817f409af244d643a9091f7e5ddff4876966af55b6710b0fe158c351df9aea10f3da0b87d224bfb2c962f4ca2cfe41f804cb16749c
DIST mongo-tools-4.2.3.tar.gz 15020325 BLAKE2B 8501a3ec6e947112ec561ce62f2ea568984f8ac911a7aff3cb8c08c1f29d2cfc64cf7f4b6a24ba73ae0f9b2b5853480f4fbed51c98fdc8c83cd433ea65e21dba SHA512 772719b450f8b656c22ac0126fee1e0fa58b5320c94ac6414b1d9af13e6437393c2482f2e386f4a73c84a2d1bfe0ea88df117a6a7ae87f4884477505cf662585
DIST mongo-tools-4.2.6.tar.gz 15016596 BLAKE2B 5ee37bf21ea05ec5ba2764c935c1dd3632753e772a01f854dc8a9949620e9a41fe95ba658a0efae0332ed2c059561e39e681f672cf5f4302a7f92c364cfab4b6 SHA512 e91bfba4b015f80d35b6c2ca766c599c5eedea113d6415ec0aef433d46b5e5fe06956481a063e26908a45fdcee4002125ea01a29fa3ea9a541a9210d25625f8e
+DIST mongo-tools-4.2.8.tar.gz 15021497 BLAKE2B e066c299462167754e0752079f35fef25b387eb1df0631ff0e0b783a8a14c4b68c6ed126ec3429f63de87b87b9fdde6a2645badd53ac1386befc7175a61a999e SHA512 c0fca14c60e5f399934f4dfad5be832684d2c1a1145967a4c395b246774f73f71e506bff902a634b7f08f7133304c09f14eb56a1a6fc8585608f537e59d9c899
diff --git a/app-admin/mongo-tools/mongo-tools-4.0.19.ebuild b/app-admin/mongo-tools/mongo-tools-4.0.19.ebuild
new file mode 100644
index 000000000000..86f626904b91
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-4.0.19.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="sasl ssl"
+
+DEPEND="dev-lang/go:=
+ net-libs/libpcap
+ sasl? ( dev-libs/cyrus-sasl )
+ ssl? ( dev-libs/openssl:0= )"
+
+# Do not complain about CFLAGS etc since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+EGO_PN="github.com/mongodb/mongo-tools"
+S="${WORKDIR}/src/${EGO_PN}"
+
+src_unpack() {
+ mkdir -p "${S%/*}" || die
+ default
+ mv ${MY_P} "${S}" || die
+}
+
+src_prepare() {
+ default
+
+ # allow building with go 1.12 #678924
+ sed -i 's/_Ctype_struct_/C.struct_/' vendor/github.com/google/gopacket/pcap/pcap.go || die
+}
+
+src_compile() {
+ local myconf=()
+
+ if use sasl; then
+ myconf+=(sasl)
+ fi
+
+ if use ssl; then
+ myconf+=(ssl)
+ fi
+
+ # build pie to avoid text relocations wrt #582854
+ local buildmode="pie"
+
+ # skip on ppc64 wrt #610984
+ if use ppc64; then
+ buildmode="default"
+ fi
+
+ mkdir -p bin || die
+ for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongoreplay; do
+ echo "Building $i"
+ GOROOT="$(go env GOROOT)" GOPATH="${WORKDIR}" go build -buildmode="${buildmode}" -o "bin/$i" \
+ -ldflags "-X ${EGO_PN}/common/options.VersionStr=${PV}" --tags "${myconf[*]}" "$i/main/$i.go" || die
+ done
+}
+
+src_install() {
+ dobin bin/*
+}
diff --git a/app-admin/mongo-tools/mongo-tools-4.2.8.ebuild b/app-admin/mongo-tools/mongo-tools-4.2.8.ebuild
new file mode 100644
index 000000000000..7d8cc9a0ebc2
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-4.2.8.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="sasl ssl"
+
+DEPEND="dev-lang/go:=
+ net-libs/libpcap
+ sasl? ( dev-libs/cyrus-sasl )
+ ssl? ( dev-libs/openssl:0= )"
+
+# Do not complain about CFLAGS etc since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+EGO_PN="github.com/mongodb/mongo-tools"
+S="${WORKDIR}/src/${EGO_PN}"
+
+src_unpack() {
+ mkdir -p "${S%/*}" || die
+ default
+ mv ${MY_P} "${S}" || die
+}
+
+src_prepare() {
+ default
+
+ # allow building with go 1.12 #678924
+ sed -i 's/_Ctype_struct_/C.struct_/' vendor/github.com/google/gopacket/pcap/pcap.go || die
+}
+
+src_compile() {
+ local myconf=()
+
+ if use sasl; then
+ myconf+=(sasl)
+ fi
+
+ if use ssl; then
+ myconf+=(ssl)
+ fi
+
+ # build pie to avoid text relocations wrt #582854
+ local buildmode="pie"
+
+ # skip on ppc64 wrt #610984
+ if use ppc64; then
+ buildmode="default"
+ fi
+
+ mkdir -p bin || die
+ for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongoreplay; do
+ echo "Building $i"
+ GOROOT="$(go env GOROOT)" GOPATH="${WORKDIR}" go build -buildmode="${buildmode}" -o "bin/$i" \
+ -ldflags "-X ${EGO_PN}/common/options.VersionStr=${PV}" --tags "${myconf[*]}" "$i/main/$i.go" || die
+ done
+}
+
+src_install() {
+ dobin bin/*
+}
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 59fa90470b92..a37a656f4284 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -2,3 +2,4 @@ DIST syslog-ng-3.22.1.tar.gz 4981746 BLAKE2B e4f7e47f1939fb07d204c4721ff558a606c
DIST syslog-ng-3.24.1.tar.gz 4909513 BLAKE2B 4b8d05899f9767784b6d24008d55808bee0af4a29883b2cb67031d23f4937632ba00f2ed7a9e969984ebec2785243a9e60811c4c2ccb3c6188c66a71af004f36 SHA512 b5326193e20db16763d3e187292bf683ebb77032b800a6e54a4ce2dd3864dda48b3d0ffc4d442eff0261117ac7a76d7927f4c8d0d96fc59ce29b46da6bd052d5
DIST syslog-ng-3.25.1.tar.gz 4938596 BLAKE2B bfcbd19b5a06c7ea15899bb919564661043bc7ab87bed147f77ab1aed153d70522aba9a42ab7dfa66d3b52a5f8432954b8a00594f428ddeb202979c5b9260da3 SHA512 79e09f1ba11080179c572016ce27328a28d479e68e663d39fb16624c03dc37d8439020ede922f78680e31e21629a6c13a4671464a31213c1dcf6acd2c5cd4b13
DIST syslog-ng-3.26.1.tar.gz 5040993 BLAKE2B 235971547c8febe61191014d971b9e5d71560f51ebc3a74fbae1c95b86653f1de8d0b99788f5b00cc75926dc67e7a80f650e9d2d12f191a4400c5b8edbbd01b7 SHA512 2cf6a8bd70addec3bef0888539f4a4686c30655698835d0c211ea929a0cae91a6f3dc9903f29fe717fd9d48b5cdc9918796f196ca84af6f5733bedff09ffab5a
+DIST syslog-ng-3.28.1.tar.gz 5149671 BLAKE2B bfc33f2a595cb4fbcc5a69b60d283673922873434b21ca8ce9685a0f54b355f162b11242704419349a561f412573c84df30a49a4dc0cc95699e98720e3e65247 SHA512 d70b435a6c9d1d0d22ecebc051dc294b6e7f841159edabf229c772c40342a28014ea1599b2277f0514236f545bac63c9879988fd85d634e9ab4fe4f079c984cb
diff --git a/app-admin/syslog-ng/files/syslog-ng-3.28.1-net-snmp.patch b/app-admin/syslog-ng/files/syslog-ng-3.28.1-net-snmp.patch
new file mode 100644
index 000000000000..e9c244502f4f
--- /dev/null
+++ b/app-admin/syslog-ng/files/syslog-ng-3.28.1-net-snmp.patch
@@ -0,0 +1,13 @@
+--- a/modules/afsnmp/Makefile.am
++++ b/modules/afsnmp/Makefile.am
+@@ -24,9 +24,7 @@
+ -I$(top_builddir)/modules/afsnmp
+
+ modules_afsnmp_libafsnmp_la_LIBADD = \
+- $(MODULE_DEPS_LIBS)
+-
+-modules_afsnmp_libafsnmp_la_LDFLAGS = \
++ $(MODULE_DEPS_LIBS) \
+ $(MODULE_LDFLAGS) \
+ $(NETSNMP_LIBS)
+
diff --git a/app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild b/app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild
index 834c32ffc4ad..72d211596b27 100644
--- a/app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0"
-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"
IUSE="amqp caps dbi geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RESTRICT="!test? ( test )"
diff --git a/app-admin/syslog-ng/syslog-ng-3.28.1-r1.ebuild b/app-admin/syslog-ng/syslog-ng-3.28.1-r1.ebuild
new file mode 100644
index 000000000000..f8a193b724b3
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.28.1-r1.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit autotools python-single-r1 systemd
+
+MY_PV_MM=$(ver_cut 1-2)
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="https://syslog-ng.com/open-source-log-management"
+SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="amqp caps dbi geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-libs/glib-2.10.1:2
+ >=dev-libs/ivykis-0.42.4
+ >=dev-libs/libpcre-6.1:=
+ !dev-libs/eventlog
+ amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] )
+ caps? ( sys-libs/libcap )
+ dbi? ( >=dev-db/libdbi-0.9.0 )
+ geoip2? ( dev-libs/libmaxminddb:= )
+ http? ( net-misc/curl )
+ json? ( >=dev-libs/json-c-0.9:= )
+ kafka? ( >=dev-libs/librdkafka-1.0.0:= )
+ mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
+ python? ( ${PYTHON_DEPS} )
+ redis? ( >=dev-libs/hiredis-0.11.0:= )
+ smtp? ( net-libs/libesmtp )
+ snmp? ( net-analyzer/net-snmp )
+ spoof-source? ( net-libs/libnet:1.1= )
+ systemd? ( sys-apps/systemd:= )
+ tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}
+ test? ( dev-libs/criterion )"
+BDEPEND="
+ sys-devel/flex
+ virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc}
+ contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened"
+ "${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.28.1-net-snmp.patch
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ local f
+
+ use python && python_fix_shebang .
+
+ # remove bundled libs
+ rm -r lib/ivykis || die
+
+ # drop scl modules requiring json
+ if use !json; then
+ sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic|netskope|nodejs|osquery|slack/d' scl/Makefile.am || die
+ fi
+
+ # drop scl modules requiring http
+ if use !http; then
+ sed -i -r '/slack|telegram/d' scl/Makefile.am || die
+ fi
+
+ # use gentoo default path
+ if use systemd; then
+ sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \
+ -i contrib/systemd/syslog-ng@default || die
+ fi
+
+ for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do
+ sed \
+ -e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \
+ "/etc/init.d/syslog-ng reload")#g" \
+ "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
+ done
+
+ for f in syslog-ng.conf.gentoo.hardened.in \
+ syslog-ng.conf.gentoo.in; do
+ sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
+ done
+
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=(
+ --disable-docs
+ --disable-java
+ --disable-java-modules
+ --disable-riemann
+ --enable-manpages
+ --localstatedir=/var/lib/syslog-ng
+ --sysconfdir=/etc/syslog-ng
+ --with-embedded-crypto
+ --with-ivykis=system
+ --with-module-dir=/usr/$(get_libdir)/syslog-ng
+ --with-pidfile-dir=/var/run
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ $(use_enable amqp)
+ $(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client)
+ $(use_enable caps linux-caps)
+ $(use_enable dbi sql)
+ $(use_enable geoip2)
+ $(use_enable http)
+ $(use_enable ipv6)
+ $(use_enable json)
+ $(use_enable kafka)
+ $(use_enable mongodb)
+ $(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options")
+ $(use_enable pacct)
+ $(use_enable python)
+ $(use_enable redis)
+ $(use_enable smtp)
+ $(use_enable snmp snmp-dest)
+ $(use_enable spoof-source)
+ $(use_enable systemd)
+ $(use_enable tcpd tcp-wrapper)
+ )
+
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ default
+
+ # Install default configuration
+ insinto /etc/default
+ doins contrib/systemd/syslog-ng@default
+
+ insinto /etc/syslog-ng
+ newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf
+
+ insinto /etc/logrotate.d
+ newins "${T}/syslog-ng.logrotate" syslog-ng
+
+ newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng
+ newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng
+ keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
+ find "${D}" -name '*.la' -delete || die
+
+ use python && python_optimize
+}
+
+pkg_postinst() {
+ # bug #355257
+ if ! has_version app-admin/logrotate ; then
+ elog "It is highly recommended that app-admin/logrotate be emerged to"
+ elog "manage the log files. ${PN} installs a file in /etc/logrotate.d"
+ elog "for logrotate to use."
+ fi
+
+ if use systemd; then
+ ewarn "The service file for systemd has changed to support multiple instances."
+ ewarn "To start the default instance issue:"
+ ewarn "# systemctl start syslog-ng@default"
+ fi
+}
diff --git a/app-admin/syslog-summary/files/syslog-summary-1.14-remove-file-magic.patch b/app-admin/syslog-summary/files/syslog-summary-1.14-remove-file-magic.patch
new file mode 100644
index 000000000000..c7a1738b7c8d
--- /dev/null
+++ b/app-admin/syslog-summary/files/syslog-summary-1.14-remove-file-magic.patch
@@ -0,0 +1,35 @@
+diff --git a/syslog-summary b/syslog-summary
+index abf6381..b3edffc 100755
+--- a/syslog-summary
++++ b/syslog-summary
+@@ -128,24 +128,12 @@ def split_date(line):
+
+ def is_gzipped(filename):
+ """Returns True if the filename is a gzipped compressed file"""
+- try:
+- import magic
+- ms = magic.open(magic.MAGIC_NONE)
+- ms.load()
+- if re.search("^gzip compressed data.*", ms.file(filename)):
+- return True
+- else:
+- return False
+- except:
+- from os.path import splitext
+-
+- if not QUIET:
+- print "Using fallback detection... please install python-magic for better gzip detection."
+-
+- if splitext(filename)[1] == ".gz":
+- return True
+- else:
+- return False
++ from os.path import splitext
++
++ if splitext(filename)[1] == ".gz":
++ return True
++ else:
++ return False
+
+ def summarize(filename, states):
+ counts = {}
diff --git a/app-admin/syslog-summary/syslog-summary-1.14-r4.ebuild b/app-admin/syslog-summary/syslog-summary-1.14-r4.ebuild
new file mode 100644
index 000000000000..1831eb914a2b
--- /dev/null
+++ b/app-admin/syslog-summary/syslog-summary-1.14-r4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="Summarizes the contents of a syslog log file"
+HOMEPAGE="https://github.com/dpaleino/syslog-summary"
+SRC_URI="https://github.com/downloads/dpaleino/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+RDEPEND="${PYTHON_DEPS}"
+
+PATCHES=( "${FILESDIR}/${P}-fix-ignore-code.patch" "${FILESDIR}/${P}-remove-file-magic.patch" )
+
+src_prepare() {
+ python_fix_shebang -f syslog-summary
+
+ # Sadly, the makefile is useless for us.
+ rm Makefile || die
+
+ default
+}
+
+src_install() {
+ dobin syslog-summary
+ einstalldocs
+ doman syslog-summary.1
+
+ insinto /etc/syslog-summary
+ doins ignore.rules
+}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 1f061f897420..bd318f0d6fd4 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/dpkg/dpkg-1.20.0.ebuild b/app-arch/dpkg/dpkg-1.20.0.ebuild
index 155450d1586a..8a0c90852c20 100644
--- a/app-arch/dpkg/dpkg-1.20.0.ebuild
+++ b/app-arch/dpkg/dpkg-1.20.0.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 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
IUSE="+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib"
RESTRICT="!test? ( test )"
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 348ff0723709..7832c82ae4e1 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/btrbk/btrbk-0.29.1.ebuild b/app-backup/btrbk/btrbk-0.29.1.ebuild
index 73afd3da3703..c89e18ac6c45 100644
--- a/app-backup/btrbk/btrbk-0.29.1.ebuild
+++ b/app-backup/btrbk/btrbk-0.29.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
SRC_URI=""
else
SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~x86"
fi
DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 87abf7878e78..8a01e45f6137 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/libmd/libmd-1.0.1.ebuild b/app-crypt/libmd/libmd-1.0.1.ebuild
index b3776d95ea2a..0081b4d97e23 100644
--- a/app-crypt/libmd/libmd-1.0.1.ebuild
+++ b/app-crypt/libmd/libmd-1.0.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
@@ -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 ~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/libsecret/libsecret-0.20.3.ebuild b/app-crypt/libsecret/libsecret-0.20.3.ebuild
index 8272d6cfa416..701137c3af64 100644
--- a/app-crypt/libsecret/libsecret-0.20.3.ebuild
+++ b/app-crypt/libsecret/libsecret-0.20.3.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
REQUIRED_USE="test? ( introspection )
vala? ( introspection )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
RDEPEND="
>=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
diff --git a/app-crypt/rotix/rotix-0.83-r1.ebuild b/app-crypt/rotix/rotix-0.83-r1.ebuild
index 659781528a35..16b2f5b0d5c3 100644
--- a/app-crypt/rotix/rotix-0.83-r1.ebuild
+++ b/app-crypt/rotix/rotix-0.83-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/shemminga/${PN}/releases/download/${PV}/${PN}_${PV}.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE=""
DEPEND="sys-devel/gettext"
diff --git a/app-crypt/seahorse/seahorse-3.34.1.ebuild b/app-crypt/seahorse/seahorse-3.34.1.ebuild
index 2f9feb4c7928..a3dadbaed708 100644
--- a/app-crypt/seahorse/seahorse-3.34.1.ebuild
+++ b/app-crypt/seahorse/seahorse-3.34.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
LICENSE="GPL-2+ FDL-1.1+"
SLOT="0"
IUSE="ldap zeroconf"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
RDEPEND="
>=dev-libs/glib-2.44:2
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 05a5750dc345..65c3cfa65914 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/zeal/metadata.xml b/app-doc/zeal/metadata.xml
index bd4216dd2955..73826b939e4b 100644
--- a/app-doc/zeal/metadata.xml
+++ b/app-doc/zeal/metadata.xml
@@ -1,10 +1,7 @@
-
- tranquility@gentoo.org
- Ole Reifschneider
-
+
zealdocs/zeal
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index c8f5287077fa..3f231a240f49 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/org-mode/org-mode-9.3.6.ebuild b/app-emacs/org-mode/org-mode-9.3.6.ebuild
index 60448056b54a..181f34143141 100644
--- a/app-emacs/org-mode/org-mode-9.3.6.ebuild
+++ b/app-emacs/org-mode/org-mode-9.3.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://orgmode.org/org-${PV}.tar.gz"
LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-macos"
+KEYWORDS="amd64 ~ppc ~x86 ~x86-macos"
IUSE="contrib doc odt-schema"
RESTRICT="test"
diff --git a/app-emacs/php-mode/php-mode-1.23.0.ebuild b/app-emacs/php-mode/php-mode-1.23.0.ebuild
index 3a75d798770b..ea2606d13964 100644
--- a/app-emacs/php-mode/php-mode-1.23.0.ebuild
+++ b/app-emacs/php-mode/php-mode-1.23.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ejmr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
SITEFILE="50${PN}-gentoo.el"
DOCS="README*.md CHANGELOG.md CONTRIBUTING.md"
diff --git a/app-emacs/xrdb-mode/xrdb-mode-3.0-r1.ebuild b/app-emacs/xrdb-mode/xrdb-mode-3.0-r1.ebuild
index 9f7879241eac..3618a6f531b4 100644
--- a/app-emacs/xrdb-mode/xrdb-mode-3.0-r1.ebuild
+++ b/app-emacs/xrdb-mode/xrdb-mode-3.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
PATCHES=("${FILESDIR}"/${P}-backquotes.patch)
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 881cf5d40d6d..118c5788b9b6 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
index f362f86ff55d..1036e9dfb0a3 100644
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@@ -6,5 +6,5 @@ DIST polarssl-1.1.4-gpl.tgz 611340 BLAKE2B 613da06dda9e4b86db5a4d616a0a0afee98c9
DIST xen-4.12.2.tar.gz 26985135 BLAKE2B 530821011a6dd0ac0a99fb135ff5311eb8e975c3791818093b5e250eed7854d153de6d4340197f9b949c0ad2c3d7b2b7180deb42bc71748ff70ff6fad195269d SHA512 7d9e7921271830c9eadf1bb8eca1aec20d343ad7475b0dc3165ef6d681759e7cb70739f8d9f85622a23aef960988820e822267fb198b12ee3dd657ad6164069f
DIST xen-4.12.3.tar.gz 26985230 BLAKE2B 403de519a552f1cd49e5a85b63f48df1b7a47ff8381385860b67df32af0b33be1c13c92ca2234e4479b7f415e711e0f46c396c3f62dfb5b2465d2991723cf6ef SHA512 7bbf4e752477f18143ac9a62fb633b1fbe115a1a9b03d0132f33dfca025bc9b76d9c2e9b66a3e407d14aff161b940b1a82e3e3ca43213798e9dd38b6970194e0
DIST xen-4.13.1.tar.gz 39024612 BLAKE2B efff138699fac2c14fad2e0dfd4535ebd744577df3dddccc2a589b81a76f24fc81c75e295f4cd33ca2e820929417b22d714504b576cb0737a563037bd56b6a95 SHA512 b56d20704155d98d803496cba83eb928e0f986a750831cd5600fc88d0ae772fe1456571654375054043d2da8daca255cc98385ebf08b1b1a75ecf7f4b7a0ee90
-DIST xen-4.14.0-rc1.tar.gz 39946385 BLAKE2B af4d4d0d205b76d7cfb954c4c8ef95afbab7209de522691a875e3b2fc55d843ba6b1d71c693a472dbcf8cdf6b4cf4aa8f27065fdcf06145a50e6708fe63ea0e2 SHA512 90442feb6e5f1e853c337972217762e4c4ea44719275de74211bf0e7101746c33e0e437db544d03b5528d75b2e5bc97468b448e587ca0345b38b850f2aa393e9
+DIST xen-4.14.0-rc3.tar.gz 39943460 BLAKE2B 12356947738cfc7b43d0fa1bcbc8912f87fa5f0368b02b2bd8cc1d2681edc2f26d8edce50991e5fab65aa40f32ce263a2ded80f8ae827f182ea5a0f63274ddc2 SHA512 c6771003f2f66334c9181faeb01cb3283fcbfda78064cfde3a14ae9dca2454c35766d78df23dc480a9daba1edb7fd31db9ebfc3a4f57dd2b07852dd486e859ed
DIST zlib-1.2.3.tar.gz 496597 BLAKE2B 603020b70cd52b83e48bde420b86e2acfd29d69bf7476eecbeeb07d1b8bcab703d2cbd3eab77772990bddb8c268f13594592ce985798d49e2d6ba25104d49f22 SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.14.0_rc1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.14.0_rc3.ebuild
similarity index 100%
rename from app-emulation/xen-pvgrub/xen-pvgrub-4.14.0_rc1.ebuild
rename to app-emulation/xen-pvgrub/xen-pvgrub-4.14.0_rc3.ebuild
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 7f0b70c0abb4..ad90d77923bc 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -13,7 +13,7 @@ DIST xen-4.12.3-upstream-patches-0.tar.xz 7236 BLAKE2B d795e2be6f1edb31f1d794912
DIST xen-4.12.3.tar.gz 26985230 BLAKE2B 403de519a552f1cd49e5a85b63f48df1b7a47ff8381385860b67df32af0b33be1c13c92ca2234e4479b7f415e711e0f46c396c3f62dfb5b2465d2991723cf6ef SHA512 7bbf4e752477f18143ac9a62fb633b1fbe115a1a9b03d0132f33dfca025bc9b76d9c2e9b66a3e407d14aff161b940b1a82e3e3ca43213798e9dd38b6970194e0
DIST xen-4.13.1-upstream-patches-0.tar.xz 7156 BLAKE2B 246b30cd8bc0ee8853a4e85ae0140d0ae52e69f3e4220bd97af8564491cf8285a7a592cd1392467a30acf6947733c8af355c110a44cb565927fb4f0bb7867113 SHA512 9059de696cb984c1891b5a87d1832562aa34b6568a21867c6744b603180f2b628905c81031f3c7c24867122d07432906750e0cfc6ca2fdacd31b82d35488455f
DIST xen-4.13.1.tar.gz 39024612 BLAKE2B efff138699fac2c14fad2e0dfd4535ebd744577df3dddccc2a589b81a76f24fc81c75e295f4cd33ca2e820929417b22d714504b576cb0737a563037bd56b6a95 SHA512 b56d20704155d98d803496cba83eb928e0f986a750831cd5600fc88d0ae772fe1456571654375054043d2da8daca255cc98385ebf08b1b1a75ecf7f4b7a0ee90
-DIST xen-4.14.0-rc1.tar.gz 39946385 BLAKE2B af4d4d0d205b76d7cfb954c4c8ef95afbab7209de522691a875e3b2fc55d843ba6b1d71c693a472dbcf8cdf6b4cf4aa8f27065fdcf06145a50e6708fe63ea0e2 SHA512 90442feb6e5f1e853c337972217762e4c4ea44719275de74211bf0e7101746c33e0e437db544d03b5528d75b2e5bc97468b448e587ca0345b38b850f2aa393e9
+DIST xen-4.14.0-rc3.tar.gz 39943460 BLAKE2B 12356947738cfc7b43d0fa1bcbc8912f87fa5f0368b02b2bd8cc1d2681edc2f26d8edce50991e5fab65aa40f32ce263a2ded80f8ae827f182ea5a0f63274ddc2 SHA512 c6771003f2f66334c9181faeb01cb3283fcbfda78064cfde3a14ae9dca2454c35766d78df23dc480a9daba1edb7fd31db9ebfc3a4f57dd2b07852dd486e859ed
DIST xen-gentoo-patches-20.tar.xz 17376 BLAKE2B 909795f611a089ab1eee86db5f034cec963c831873b3088f0682cdb7ec5284e75a4d49a5a1c93ee7a7e7ba3a899648b38928a1c7b726e019c2a90b66e31fee4a SHA512 d06b846ccb8c488f7155437cdf220533fc2d23ad13b0a2bd4d69d68938c4858fdb961c9e59f57c5228368b4e60dbbdf81ec15b77ecb0639bbf475333f8bf4b97
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/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf
index 5ef7519e2242..052e818a82eb 100644
--- a/app-emulation/xen-tools/files/gentoo-patches.conf
+++ b/app-emulation/xen-tools/files/gentoo-patches.conf
@@ -84,7 +84,7 @@ ${_gx060}
"
# xen-tools-4.14.0 patches set
-_gpv_xen_tools_4140_rc1_0="
+_gpv_xen_tools_4140_rc3_0="
${_gx039}
${_gx027}
${_gx028} ${_gx029}
diff --git a/app-emulation/xen-tools/xen-tools-4.14.0_rc1.ebuild b/app-emulation/xen-tools/xen-tools-4.14.0_rc3.ebuild
similarity index 100%
rename from app-emulation/xen-tools/xen-tools-4.14.0_rc1.ebuild
rename to app-emulation/xen-tools/xen-tools-4.14.0_rc3.ebuild
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 05778ab2baa6..39837ba542d5 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -2,4 +2,4 @@ DIST xen-4.12.3-upstream-patches-0.tar.xz 7236 BLAKE2B d795e2be6f1edb31f1d794912
DIST xen-4.12.3.tar.gz 26985230 BLAKE2B 403de519a552f1cd49e5a85b63f48df1b7a47ff8381385860b67df32af0b33be1c13c92ca2234e4479b7f415e711e0f46c396c3f62dfb5b2465d2991723cf6ef SHA512 7bbf4e752477f18143ac9a62fb633b1fbe115a1a9b03d0132f33dfca025bc9b76d9c2e9b66a3e407d14aff161b940b1a82e3e3ca43213798e9dd38b6970194e0
DIST xen-4.13.1-upstream-patches-0.tar.xz 7156 BLAKE2B 246b30cd8bc0ee8853a4e85ae0140d0ae52e69f3e4220bd97af8564491cf8285a7a592cd1392467a30acf6947733c8af355c110a44cb565927fb4f0bb7867113 SHA512 9059de696cb984c1891b5a87d1832562aa34b6568a21867c6744b603180f2b628905c81031f3c7c24867122d07432906750e0cfc6ca2fdacd31b82d35488455f
DIST xen-4.13.1.tar.gz 39024612 BLAKE2B efff138699fac2c14fad2e0dfd4535ebd744577df3dddccc2a589b81a76f24fc81c75e295f4cd33ca2e820929417b22d714504b576cb0737a563037bd56b6a95 SHA512 b56d20704155d98d803496cba83eb928e0f986a750831cd5600fc88d0ae772fe1456571654375054043d2da8daca255cc98385ebf08b1b1a75ecf7f4b7a0ee90
-DIST xen-4.14.0-rc1.tar.gz 39946385 BLAKE2B af4d4d0d205b76d7cfb954c4c8ef95afbab7209de522691a875e3b2fc55d843ba6b1d71c693a472dbcf8cdf6b4cf4aa8f27065fdcf06145a50e6708fe63ea0e2 SHA512 90442feb6e5f1e853c337972217762e4c4ea44719275de74211bf0e7101746c33e0e437db544d03b5528d75b2e5bc97468b448e587ca0345b38b850f2aa393e9
+DIST xen-4.14.0-rc3.tar.gz 39943460 BLAKE2B 12356947738cfc7b43d0fa1bcbc8912f87fa5f0368b02b2bd8cc1d2681edc2f26d8edce50991e5fab65aa40f32ce263a2ded80f8ae827f182ea5a0f63274ddc2 SHA512 c6771003f2f66334c9181faeb01cb3283fcbfda78064cfde3a14ae9dca2454c35766d78df23dc480a9daba1edb7fd31db9ebfc3a4f57dd2b07852dd486e859ed
diff --git a/app-emulation/xen/xen-4.14.0_rc1.ebuild b/app-emulation/xen/xen-4.14.0_rc3.ebuild
similarity index 100%
rename from app-emulation/xen/xen-4.14.0_rc1.ebuild
rename to app-emulation/xen/xen-4.14.0_rc3.ebuild
diff --git a/app-emulation/xtrs/xtrs-4.9d-r5.ebuild b/app-emulation/xtrs/xtrs-4.9d-r5.ebuild
index 34629601e862..4785a873f452 100644
--- a/app-emulation/xtrs/xtrs-4.9d-r5.ebuild
+++ b/app-emulation/xtrs/xtrs-4.9d-r5.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,10 +6,10 @@ EAPI=6
inherit flag-o-matic toolchain-funcs readme.gentoo-r1
DESCRIPTION="Radio Shack TRS-80 emulator"
-HOMEPAGE="http://www.tim-mann.org/xtrs.html"
-SRC_URI="http://www.tim-mann.org/trs80/${P}.tar.gz
+HOMEPAGE="https://www.tim-mann.org/xtrs.html"
+SRC_URI="https://www.tim-mann.org/trs80/${P}.tar.gz
ls-dos? (
- http://www.tim-mann.org/trs80/ld4-631.zip
+ https://www.tim-mann.org/trs80/ld4-631.zip
https://dev.gentoo.org/~ulm/distfiles/ld4-631l.xd3
)"
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 7af49449d957..f35eb101333e 100644
Binary files a/app-metrics/Manifest.gz and b/app-metrics/Manifest.gz differ
diff --git a/app-metrics/buildbot-prometheus/Manifest b/app-metrics/buildbot-prometheus/Manifest
deleted file mode 100644
index 0cc6923df045..000000000000
--- a/app-metrics/buildbot-prometheus/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST buildbot-prometheus-17.7.2.tar.gz 10101 BLAKE2B 25c060b5368aa1dea6145b6d380db8001f3cd1fb49f9b3bb1e4ecccdb771591abc269d5aee9d022a9b182b19650a0c398b580004f20def0675b86ca9f3a1e2db SHA512 8a0ecaf57eade3d69fabc57a19a1c02af8e398c3bc4732e40f39e8904a16c9b751d4f6f8ace0dd7893b380d1ffc8a51360279aeb7b4059a6cd9438145344e74b
diff --git a/app-metrics/buildbot-prometheus/buildbot-prometheus-17.7.2-r2.ebuild b/app-metrics/buildbot-prometheus/buildbot-prometheus-17.7.2-r2.ebuild
deleted file mode 100644
index 739ad58b123e..000000000000
--- a/app-metrics/buildbot-prometheus/buildbot-prometheus-17.7.2-r2.ebuild
+++ /dev/null
@@ -1,35 +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 distutils-r1
-
-DESCRIPTION="A Prometheus metrics exporter for Buildbot"
-HOMEPAGE="https://github.com/claws/buildbot-prometheus"
-SRC_URI="https://github.com/claws/buildbot-prometheus/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-python/prometheus_client[${PYTHON_USEDEP}]
- >=dev-util/buildbot-0.9.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- ${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch"
-)
-
-python_prepare_all() {
- sed -i -e "/^install_reqs.*$/d" -e "/^from pip.*$/d" -e "s/requires = .*/requires = ['buildbot', 'prometheus_client']/" setup.py || die
- distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
- einfo "This version has been patched to be compatible with the current buildbot releases >=0.9.0"
- einfo "For older buildbot-0.8* releases, please use dev-python/buildbot-prometheus-17.7.2-r1 version"
-}
diff --git a/app-metrics/buildbot-prometheus/files/buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch b/app-metrics/buildbot-prometheus/files/buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch
deleted file mode 100644
index 7fbdbdd09133..000000000000
--- a/app-metrics/buildbot-prometheus/files/buildbot-prometheus-17.7.2-Migrate-duration-calculations-to-buildbot-09.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From ceddea3f55773e104c628ef6316ce74785d235f3 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec
-Date: Tue, 6 Mar 2018 02:30:56 +0000
-Subject: [PATCH] Migrate duration calculations to >=buildbot-0.9
-
----
- buildbot_prometheus/prometheus.py | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/buildbot_prometheus/prometheus.py b/buildbot_prometheus/prometheus.py
-index a766f41..ebf41a1 100644
---- a/buildbot_prometheus/prometheus.py
-+++ b/buildbot_prometheus/prometheus.py
-@@ -302,7 +302,7 @@ class Prometheus(service.BuildbotService):
- build_started = msg['started_at']
- build_finished = msg['complete_at']
- build_duration = build_finished - build_started
-- duration_seconds = build_duration.total_seconds()
-+ duration_seconds = build_duration
- self.g_builds_duration.labels(**labels).set(duration_seconds)
-
- build_status = resolve_results_status(msg['results'])
-@@ -401,7 +401,7 @@ class Prometheus(service.BuildbotService):
- buildset_started = msg['submitted_at']
- buildset_finished = msg['complete_at']
- buildset_duration = buildset_finished - buildset_started
-- duration_seconds = buildset_duration.total_seconds()
-+ duration_seconds = buildset_duration
- self.g_buildsets_duration.labels(**labels).set(duration_seconds)
-
- bs_success = resolve_results_status(msg['results'])
-@@ -444,7 +444,7 @@ class Prometheus(service.BuildbotService):
- br_started = msg['submitted_at']
- br_finished = msg['complete_at']
- br_duration = br_finished - br_started
-- duration_seconds = br_duration.total_seconds()
-+ duration_seconds = br_duration
- self.g_build_requests_duration.labels(**labels).set(duration_seconds)
-
- br_success = resolve_results_status(msg['results'])
-@@ -491,7 +491,7 @@ class Prometheus(service.BuildbotService):
- step_started = msg['started_at']
- step_finished = msg['complete_at']
- step_duration = step_finished - step_started
-- duration_seconds = step_duration.total_seconds()
-+ duration_seconds = step_duration
- self.g_steps_duration.labels(**labels).set(duration_seconds)
-
- step_success = resolve_results_status(msg['results'])
---
-libgit2 0.24.6
-
diff --git a/app-metrics/buildbot-prometheus/metadata.xml b/app-metrics/buildbot-prometheus/metadata.xml
deleted file mode 100644
index 7499dcce7171..000000000000
--- a/app-metrics/buildbot-prometheus/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
- buildbot-prometheus
- claws/buildbot-prometheus
-
-
diff --git a/app-metrics/prometheus-bin/prometheus-bin-2.15.2.ebuild b/app-metrics/prometheus-bin/prometheus-bin-2.15.2.ebuild
index 89e508d0cf53..877bf429003d 100644
--- a/app-metrics/prometheus-bin/prometheus-bin-2.15.2.ebuild
+++ b/app-metrics/prometheus-bin/prometheus-bin-2.15.2.ebuild
@@ -4,7 +4,7 @@
EAPI=7
DESCRIPTION="prometheus monitoring system and time series database"
-HOMEPAGE="http://prometheus.io"
+HOMEPAGE="https://prometheus.io"
MY_PN=${PN%%-bin}
MY_P=${MY_PN}-${PV}
SRC_URI="https://github.com/prometheus/prometheus/releases/download/v${PV}/${MY_P}.linux-amd64.tar.gz"
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index eb8668696878..d5f96527abc3 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/beep/files/beep-1.3-CVE-2018-0492.patch b/app-misc/beep/files/beep-1.3-CVE-2018-0492.patch
deleted file mode 100644
index f4894b51fc81..000000000000
--- a/app-misc/beep/files/beep-1.3-CVE-2018-0492.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-diff --git a/beep.c b/beep.c
-index 7da2e70..4323d31 100644
---- beep.c
-+++ beep.c
-@@ -109,6 +109,7 @@ void do_beep(int freq) {
- /* BEEP_TYPE_EVDEV */
- struct input_event e;
-
-+ memset(&e, 0, sizeof(e));
- e.type = EV_SND;
- e.code = SND_TONE;
- e.value = freq;
-@@ -124,10 +125,6 @@ void do_beep(int freq) {
- /* If we get interrupted, it would be nice to not leave the speaker beeping in
- perpetuity. */
- void handle_signal(int signum) {
--
-- if(console_device)
-- free(console_device);
--
- switch(signum) {
- case SIGINT:
- case SIGTERM:
-@@ -257,7 +254,7 @@ void parse_command_line(int argc, char **argv, beep_parms_t *result) {
- result->verbose = 1;
- break;
- case 'e' : /* also --device */
-- console_device = strdup(optarg);
-+ console_device = optarg;
- break;
- case 'h' : /* notice that this is also --help */
- default :
-@@ -276,26 +273,6 @@ void play_beep(beep_parms_t parms) {
- "%d delay after) @ %.2f Hz\n",
- parms.reps, parms.length, parms.delay, parms.end_delay, parms.freq);
-
-- /* try to snag the console */
-- if(console_device)
-- console_fd = open(console_device, O_WRONLY);
-- else
-- if((console_fd = open("/dev/tty0", O_WRONLY)) == -1)
-- console_fd = open("/dev/vc/0", O_WRONLY);
--
-- if(console_fd == -1) {
-- fprintf(stderr, "Could not open %s for writing\n",
-- console_device != NULL ? console_device : "/dev/tty0 or /dev/vc/0");
-- printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */
-- perror("open");
-- exit(1);
-- }
--
-- if (ioctl(console_fd, EVIOCGSND(0)) != -1)
-- console_type = BEEP_TYPE_EVDEV;
-- else
-- console_type = BEEP_TYPE_CONSOLE;
--
- /* Beep */
- for (i = 0; i < parms.reps; i++) { /* start beep */
- do_beep(parms.freq);
-@@ -305,8 +282,6 @@ void play_beep(beep_parms_t parms) {
- if(parms.end_delay || (i+1 < parms.reps))
- usleep(1000*parms.delay); /* wait... */
- } /* repeat. */
--
-- close(console_fd);
- }
-
-
-@@ -328,6 +303,26 @@ int main(int argc, char **argv) {
- signal(SIGTERM, handle_signal);
- parse_command_line(argc, argv, parms);
-
-+ /* try to snag the console */
-+ if(console_device)
-+ console_fd = open(console_device, O_WRONLY);
-+ else
-+ if((console_fd = open("/dev/tty0", O_WRONLY)) == -1)
-+ console_fd = open("/dev/vc/0", O_WRONLY);
-+
-+ if(console_fd == -1) {
-+ fprintf(stderr, "Could not open %s for writing\n",
-+ console_device != NULL ? console_device : "/dev/tty0 or /dev/vc/0");
-+ printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */
-+ perror("open");
-+ exit(1);
-+ }
-+
-+ if (ioctl(console_fd, EVIOCGSND(0)) != -1)
-+ console_type = BEEP_TYPE_EVDEV;
-+ else
-+ console_type = BEEP_TYPE_CONSOLE;
-+
- /* this outermost while loop handles the possibility that -n/--new has been
- used, i.e. that we have multiple beeps specified. Each iteration will
- play, then free() one parms instance. */
-@@ -365,8 +360,8 @@ int main(int argc, char **argv) {
- parms = next;
- }
-
-- if(console_device)
-- free(console_device);
-+ close(console_fd);
-+ console_fd = -1;
-
- return EXIT_SUCCESS;
- }
diff --git a/app-misc/beep/files/beep-1.3-Makefile.patch b/app-misc/beep/files/beep-1.3-Makefile.patch
deleted file mode 100644
index f4b891e8b824..000000000000
--- a/app-misc/beep/files/beep-1.3-Makefile.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/Makefile 2002-03-29 09:37:22.000000000 -0800
-+++ b/Makefile 2009-03-27 22:19:18.000000000 -0700
-@@ -1,17 +1,18 @@
--CC=gcc
--FLAGS=-Wall
-+CC ?= gcc
-+LDFLAGS ?=
-+CFLAGS ?= -Wall
- EXEC_NAME=beep
- INSTALL_DIR=/usr/bin
- MAN_FILE=beep.1.gz
--MAN_DIR=/usr/man/man1
-+MAN_DIR=/usr/share/man/man1
-
- default : beep
-
- clean :
-- rm ${EXEC_NAME}
-+ rm -f ${EXEC_NAME}
-
- beep : beep.c
-- ${CC} ${FLAGS} -o ${EXEC_NAME} beep.c
-+ ${CC} ${CFLAGS} ${LDFLAGS} -o ${EXEC_NAME} beep.c
-
- install :
- cp ${EXEC_NAME} ${INSTALL_DIR}
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 2646a3af8cdf..9cca839d14c9 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -1,6 +1,8 @@
DIST elasticsearch-6.8.8.tar.gz 149927766 BLAKE2B 329bb778100125d9624acc84252fe8281cd4ee3823fbafeabf8aeeca529c3cd8902b197d5e5a852d55f7a56ec410312e3932b34736607890dedad9e12c3afe2e SHA512 c703d6230a42b77fb0f169158afbc18517118375e341ef889c231acc0f096a44716ba4fc1a2558fd000b0ceff4d9c3aff2f2c792f2c2ae92f0e7f82c6a70eaec
DIST elasticsearch-7.6.2-no-jdk-linux-x86_64.tar.gz 148140124 BLAKE2B 9a850011533052d7a4041484936dfa2c8fe7f7976314147bc2b1d5f239bbdfe68a3593d3e0d2bb4d709a71e81aa7c200f9530921dab9d50c0ab3e349f4769ffb SHA512 aa5f499b26e92e19a673093fe2ff73c1c03a8da029b59cb83db43f9e2dfd7c650ee6a122bcf647b7e83f658ad9b9cc64092e6e7c1b4f8476f2973a6006b8df3c
DIST elasticsearch-7.7.0-no-jdk-linux-x86_64.tar.gz 157716656 BLAKE2B 812c4db511f844fb23cb79bdfe3778281f1b6dad6a45553380829e330231304ce0e18eb975867e8474f652a63bdab2f4fb8c14158753aa8b29db5debfd3f00ae SHA512 a8d6cb7186301f50ba72ee5cde6c26390bdb6a8c13d902a75c63038b3dbb3cd7e544bbf6934d88324d722a213b7bf2efc0b27f9cae64428e6842d640bda5ee54
+DIST elasticsearch-7.8.0-no-jdk-linux-x86_64.tar.gz 162422169 BLAKE2B 035b8405cfad0cc440c5732526b0b9bbf42466598a921c42e4964ffb441475244f6b45803556a93a207e63dfdbfb92eef731add3d71ebe737cdef70e0cb50d34 SHA512 0fdc8e3d9c83c35bc1a01ceeabdbcfe192c6a0243a2def923a14198d5e41ba804725ac39a2b6287a932b4807b3cb359adb0348fd96506d556d4cb280b6c01071
DIST elasticsearch-oss-6.8.8.tar.gz 68655829 BLAKE2B 808b9dd49f7d9c9968e6e1c5dcd8d1150d3638b8380ad0608f1e85f00d98c6da6d0c9c324f244b510d35ecec0f37b40e29fd0761b83118e137cf394c231cc0e8 SHA512 7c5972d365a8a2a80c351039ff54a274bb1f95379d6f4feab4fa01360541bffa58409ffac6030acade24be54d1cc57e7ea24a7cf29531aba35a565718e30288d
DIST elasticsearch-oss-7.6.2-no-jdk-linux-x86_64.tar.gz 72570377 BLAKE2B 5a5ec3e79cba236dd4a6ffd279b0fca4ad882c877b418261b0314d8101885a2d2496c837b44e5dbefe5ed994aeeca488a8f08a2ba26c4b44b156c180dae6004c SHA512 6197a0b62f577cd0692c1fb97a473a9971f8fef383dc6ef618035785dbc662947d2adbc425ce130ef531cbfaf9add9ed5da5a698387e770c49af820644d67e72
DIST elasticsearch-oss-7.7.0-no-jdk-linux-x86_64.tar.gz 73216528 BLAKE2B f0f1a3d3347ea37703e90bd896b24f6e3c58406d9fb20f3607a4d08eee325b5ae293db48d1afdc208468ee775b9085a28f39f2e175b67e4881bfb61d5cb85a9a SHA512 f9b323cff078a0dc856f99efd164775a9cd0718bb0ddb6c4d4817fa53cae71748f1aec5158afa45d4b29076043cbada9743a996e685439436e93d94a9eff2768
+DIST elasticsearch-oss-7.8.0-no-jdk-linux-x86_64.tar.gz 75549734 BLAKE2B 8223e0083d9a5199457957d22c8413f6d0d90c5c21bdcf4d9b573a7f3dc09dfce6c7dce5959e23c3d9c543df21d7fbbe1f7ba1124d40966d13cd7ddf8aeb4813 SHA512 4fe29f5395d938cf51d23ef7531f4d1b4c4a052d842ba2f77fe822a0986703315b2211602bf250170b99bc672fc0de09f0d1a04752322f398b6a55a057d9090b
diff --git a/app-misc/elasticsearch/elasticsearch-7.8.0.ebuild b/app-misc/elasticsearch/elasticsearch-7.8.0.ebuild
new file mode 100644
index 000000000000..2155270debec
--- /dev/null
+++ b/app-misc/elasticsearch/elasticsearch-7.8.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
+HOMEPAGE="https://www.elastic.co/products/elasticsearch"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${P}-no-jdk-linux-x86_64.tar.gz )
+ !x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${PN}-oss-${PV}-no-jdk-linux-x86_64.tar.gz )"
+LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RDEPEND="acct-group/elasticsearch
+ acct-user/elasticsearch
+ virtual/jre"
+
+QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
+
+src_prepare() {
+ default
+
+ rm LICENSE.txt NOTICE.txt || die
+ rmdir logs || die
+}
+
+src_install() {
+ keepdir /etc/${PN}
+ keepdir /etc/${PN}/scripts
+
+ insinto /etc/${PN}
+ doins -r config/.
+ rm -r config || die
+
+ fowners root:${PN} /etc/${PN}
+ fperms 2750 /etc/${PN}
+
+ insinto /usr/share/${PN}
+ doins -r .
+
+ exeinto /usr/share/${PN}/bin
+ doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
+
+ chmod +x "${ED}"/usr/share/${PN}/bin/* || die
+
+ if use x-pack; then
+ chmod +x "${ED}"/usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin/* || die
+ fi
+
+ keepdir /var/{lib,log}/${PN}
+ fowners ${PN}:${PN} /var/{lib,log}/${PN}
+ fperms 0750 /var/{lib,log}/${PN}
+ dodir /usr/share/${PN}/plugins
+
+ insinto /etc/sysctl.d
+ newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
+
+ newconfd "${FILESDIR}/${PN}.conf.3" ${PN}
+ newinitd "${FILESDIR}/${PN}.init.7" ${PN}
+
+ systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
+ systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
+ systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
+}
+
+pkg_postinst() {
+ elog
+ elog "You may create multiple instances of ${PN} by"
+ elog "symlinking the init script:"
+ elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
+ elog
+ elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
+ elog "from /etc/${PN} into the configuration directory of the instance:"
+ elog "/etc/${PN}/instance"
+ elog
+ ewarn "Please make sure you have proper permissions on /etc/${PN}"
+ ewarn "prior to keystore generation or you may experience startup fails."
+ ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}"
+ ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore"
+}
diff --git a/app-misc/gnote/gnote-3.36.1.ebuild b/app-misc/gnote/gnote-3.36.1.ebuild
index 95d5527ca525..c31e6fee60f5 100644
--- a/app-misc/gnote/gnote-3.36.1.ebuild
+++ b/app-misc/gnote/gnote-3.36.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
LICENSE="GPL-3+ FDL-1.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE="debug"
# Automagic:
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
new file mode 100644
index 000000000000..e46b608ed6c5
--- /dev/null
+++ b/app-misc/golly/files/golly-3.3-allow-py23-exec.patch
@@ -0,0 +1,12 @@
+'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
new file mode 100644
index 000000000000..54a047830818
--- /dev/null
+++ b/app-misc/golly/files/golly-3.3-allow-py3.patch
@@ -0,0 +1,90 @@
+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
new file mode 100644
index 000000000000..8b1599712508
--- /dev/null
+++ b/app-misc/golly/files/golly-3.3-glife-py23.patch
@@ -0,0 +1,32 @@
+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
new file mode 100644
index 000000000000..bc1c81a61917
--- /dev/null
+++ b/app-misc/golly/files/golly-3.3-nondynamic-python.patch
@@ -0,0 +1,51 @@
+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.3-r1.ebuild b/app-misc/golly/golly-3.3-r1.ebuild
index 27ee1bae14e8..26742c324c99 100644
--- a/app-misc/golly/golly-3.3-r1.ebuild
+++ b/app-misc/golly/golly-3.3-r1.ebuild
@@ -4,8 +4,9 @@
EAPI=7
WX_GTK_VER=3.0
+PYTHON_COMPAT=( python2_7 )
-inherit desktop eutils flag-o-matic wxwidgets xdg-utils
+inherit desktop eutils flag-o-matic python-single-r1 wxwidgets xdg-utils
DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
HOMEPAGE="http://golly.sourceforge.net/"
@@ -15,11 +16,13 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="tiff"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="virtual/opengl
sys-libs/zlib
x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,tiff?]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ ${PYTHON_DEPS}"
S=${WORKDIR}/${P}-src
diff --git a/app-misc/golly/golly-3.3-r2.ebuild b/app-misc/golly/golly-3.3-r2.ebuild
new file mode 100644
index 000000000000..e3a3e4a7e591
--- /dev/null
+++ b/app-misc/golly/golly-3.3-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER=3.0
+PYTHON_COMPAT=( python{2_7,3_{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="tiff"
+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}"/${P}-nondynamic-python.patch
+ "${FILESDIR}"/${P}-allow-py23-exec.patch
+ "${FILESDIR}"/${P}-glife-py23.patch
+ "${FILESDIR}"/${P}-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/oneko/oneko-1.2_p6_p14-r1.ebuild b/app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild
index 8ad80ac4a084..eb47a60002a6 100644
--- a/app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild
+++ b/app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild
@@ -41,6 +41,10 @@ src_prepare() {
done
default
+
+ printf '#!/bin/sh\n%s ${*}\n' "$(tc-getLD)" > "${T}"/ld
+ chmod +x "${T}"/ld
+ export PATH="${T}:${PATH}"
}
src_configure() {
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 4feffe1890b2..bd5ec4df20a1 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index ac459e7481df..508be952bbee 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,2 +1,3 @@
DIST calligra-3.1.0.tar.xz 58037392 BLAKE2B b933012fe0031f4d6eac626054e7fb248f85635e5873224328d30f9aed31dce0a0a49f99cf6eea9c232477400af1d16ffc4dae483cdfd5081720434e95684e50 SHA512 ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b
DIST calligra-3.2.0.tar.xz 55205468 BLAKE2B 4e59e0e22195894ccd11db4e54841079ec4225ab3e35c166af3bf7a55e96db92a1e9818affa34bc4d99743257569abebc6c14db07dc8e3ac9f62e8e30f944c9e SHA512 625886ae6f0e81eb4c489a9f6bd45b57fdb35fd8131ddf9b59a6fe0a80e338b487f70a90bd28e138281309dbfeb23e49d7ef93856fe1815f4fa16fa37964c013
+DIST calligra-3.2.1.tar.xz 55207684 BLAKE2B 332629f18adbee649e8d25a1eedf4ee48af7d8cbb79382c70678bacfa89d9a10797eb0ff42cb5aad51ef2c28aa7071e687bd34053cadcc40ac1936bb9a40dc20 SHA512 e53a939aa1b277c2291cfd626868c77085fc9cc7774df160b5b1afceb33314b4381fa8ffe03636cbde6e35cc2abd170a51e7f9c1a99191339313b9c9c3b1526f
diff --git a/app-office/calligra/calligra-3.2.1.ebuild b/app-office/calligra/calligra-3.2.1.ebuild
new file mode 100644
index 000000000000..240ca9b02ecf
--- /dev/null
+++ b/app-office/calligra/calligra-3.2.1.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CHECKREQS_DISK_BUILD="4G"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit check-reqs ecm kde.org
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="https://calligra.org/"
+
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+CAL_FTS=( karbon sheets stage words )
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="activities +charts +crypt +fontconfig gemini gsl +import-filter +lcms okular openexr
+ +pdf phonon spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})"
+
+# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
+# Required for the matlab/octave formula tool
+BDEPEND="
+ sys-devel/gettext
+"
+COMMON_DEPEND="
+ dev-lang/perl
+ >=dev-qt/designer-${QTMIN}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtscript-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/karchive-${KFMIN}:5
+ >=kde-frameworks/kcmutils-${KFMIN}:5
+ >=kde-frameworks/kcodecs-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kdelibs4support-${KFMIN}:5
+ >=kde-frameworks/kemoticons-${KFMIN}:5
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kitemmodels-${KFMIN}:5
+ >=kde-frameworks/kitemviews-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/kross-${KFMIN}:5
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5
+ >=kde-frameworks/kwallet-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-frameworks/sonnet-${KFMIN}:5
+ sys-libs/zlib
+ virtual/libiconv
+ activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+ charts? ( dev-libs/kdiagram:5 )
+ crypt? ( app-crypt/qca:2[qt5(+)] )
+ fontconfig? ( media-libs/fontconfig )
+ gemini? ( >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] )
+ gsl? ( sci-libs/gsl )
+ import-filter? (
+ app-text/libetonyek
+ app-text/libodfgen
+ app-text/libwpd:*
+ app-text/libwpg:*
+ >=app-text/libwps-0.4
+ dev-libs/librevenge
+ >=kde-frameworks/khtml-${KFMIN}:5
+ media-libs/libvisio
+ )
+ lcms? (
+ media-libs/ilmbase:=
+ media-libs/lcms:2
+ )
+ okular? ( kde-apps/okular:5 )
+ openexr? ( media-libs/openexr )
+ pdf? ( app-text/poppler:=[qt5] )
+ phonon? ( media-libs/phonon[qt5(+)] )
+ spacenav? ( dev-libs/libspnav )
+ truetype? ( media-libs/freetype:2 )
+ X? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libX11
+ )
+ calligra_features_sheets? ( dev-cpp/eigen:3 )
+ calligra_features_words? ( dev-libs/libxslt )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/boost
+ test? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+ calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
+ gemini? (
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+ >=kde-frameworks/kirigami-${KFMIN}:5
+ )
+"
+
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.1.89-no-arch-detection.patch )
+
+pkg_pretend() {
+ check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+ ecm_pkg_setup
+ check-reqs_pkg_setup
+}
+
+src_prepare() {
+ ecm_src_prepare
+
+ if ! use test; then
+ sed -e "/add_subdirectory( *benchmarks *)/s/^/#DONT/" \
+ -i libs/pigment/CMakeLists.txt || die
+ fi
+
+ # Unconditionally disable deprecated deps (required by QtQuick1)
+ ecm_punt_bogus_dep Qt5 Declarative
+ ecm_punt_bogus_dep Qt5 OpenGL
+}
+
+src_configure() {
+ local cal_ft myproducts
+
+ # applications
+ for cal_ft in ${CAL_FTS[@]}; do
+ use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" )
+ done
+
+ use lcms && myproducts+=( PLUGIN_COLORENGINES )
+ use okular && myproducts+=( OKULAR )
+ use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
+
+ local mycmakeargs=(
+ -DPACKAGERS_BUILD=OFF
+ -DRELEASE_BUILD=ON
+ -DWITH_Iconv=ON
+ -DPRODUCTSET="${myproducts[*]}"
+ $(cmake_use_find_package activities KF5Activities)
+ $(cmake_use_find_package charts KChart)
+ -DWITH_Qca-qt5=$(usex crypt)
+ -DWITH_Fontconfig=$(usex fontconfig)
+ $(cmake_use_find_package gemini Libgit2)
+ $(cmake_use_find_package gemini Qt5QuickWidgets)
+ -DWITH_GSL=$(usex gsl)
+ -DWITH_LibEtonyek=$(usex import-filter)
+ -DWITH_LibOdfGen=$(usex import-filter)
+ -DWITH_LibRevenge=$(usex import-filter)
+ -DWITH_LibVisio=$(usex import-filter)
+ -DWITH_LibWpd=$(usex import-filter)
+ -DWITH_LibWpg=$(usex import-filter)
+ -DWITH_LibWps=$(usex import-filter)
+ $(cmake_use_find_package phonon Phonon4Qt5)
+ -DCMAKE_DISABLE_FIND_PACKAGE_KF5CalendarCore=ON
+ -DWITH_LCMS2=$(usex lcms)
+ -DWITH_Okular5=$(usex okular)
+ -DWITH_OpenEXR=$(usex openexr)
+ -DWITH_Poppler=$(usex pdf)
+ -DWITH_Eigen3=$(usex calligra_features_sheets)
+ -DBUILD_UNMAINTAINED=$(usex calligra_features_stage)
+ -ENABLE_CSTESTER_TESTING=$(usex test)
+ -DWITH_Freetype=$(usex truetype)
+ )
+
+ ecm_src_configure
+}
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index cc9fb7907ebc..d900b032f234 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1 +1,2 @@
DIST kmymoney-5.0.8.tar.xz 11753276 BLAKE2B 0c4967b3f39ec675b9bd7e8e81e230c7f5efa574671138db57396984add802d9b6c28e383eaaddb4ee8d486e6dcc2b0ac54f5cf1129aa4dafb9bd1cf4235914f SHA512 f332327dd40cc5667cd0141bd8e0c9cd81a2d996a4d482b2976f6bbd258cc27c73b2190d4631b8e0b9ee9d435ef8934312da399234830eb51b3e4ec942350988
+DIST kmymoney-5.1.0.tar.xz 12005824 BLAKE2B 4eaeefba29d4df85c485d8d94db80b418c0086f6cac81295f1251e3d4883a78c71d0401286a918831ee2a39571a70583675ee303775bffdb3333e11d5624bbf6 SHA512 143161efd708ae05923d68510945c24f08d85cd6482b3e6015c6061bc28c80e095ca56b768e595bfae50ea3340855e021dde5c715546c0641f94adcd91639334
diff --git a/app-office/kmymoney/kmymoney-5.1.0.ebuild b/app-office/kmymoney/kmymoney-5.1.0.ebuild
new file mode 100644
index 000000000000..f43a35d8d49f
--- /dev/null
+++ b/app-office/kmymoney/kmymoney-5.1.0.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_BRANCH="5.1"
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+VIRTUALDBUS_TEST="true"
+inherit ecm kde.org
+
+DESCRIPTION="Personal finance manager based on KDE Frameworks"
+HOMEPAGE="https://kmymoney.org"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="activities addressbook calendar hbci holidays quotes webkit"
+[[ ${KDE_BUILD_TYPE} = live ]] && IUSE+=" experimental"
+
+BDEPEND="virtual/pkgconfig"
+COMMON_DEPEND="
+ >=app-crypt/gpgme-1.7.1-r1[cxx]
+ >=app-office/libalkimia-7.0.0:=
+ dev-db/sqlcipher
+ dev-libs/gmp:0=[cxx]
+ dev-libs/kdiagram:5
+ dev-libs/libgpg-error
+ dev-libs/libofx:=
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/karchive-${KFMIN}:5
+ >=kde-frameworks/kcmutils-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kcodecs-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kitemmodels-${KFMIN}:5
+ >=kde-frameworks/kitemviews-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5
+ >=kde-frameworks/kwallet-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-frameworks/sonnet-${KFMIN}:5
+ activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+ addressbook? (
+ kde-apps/akonadi:5
+ kde-apps/kidentitymanagement:5
+ >=kde-frameworks/kcontacts-${KFMIN}:5
+ )
+ calendar? ( dev-libs/libical:= )
+ hbci? (
+ >=net-libs/aqbanking-6.0.1
+ >=sys-libs/gwenhywfar-5.1.2:=[qt5]
+ )
+ holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
+ webkit? (
+ >=dev-qt/qtwebkit-5.212.0_pre20180120:5
+ >=kde-frameworks/kdewebkit-${KFMIN}:5
+ )
+ !webkit? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/kmymoney:4
+ quotes? ( dev-perl/Finance-Quote )
+"
+
+pkg_setup() {
+ ecm_pkg_setup
+
+ if [[ ${KDE_BUILD_TYPE} = live ]] && use experimental; then
+ ewarn "USE experimental set: Building unfinished features."
+ ewarn "This *will* chew up your data. You have been warned."
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_OFXIMPORTER=ON
+ -DENABLE_WEBOOB=OFF
+ -DUSE_QT_DESIGNER=OFF
+ $(cmake_use_find_package activities KF5Activities)
+ $(cmake_use_find_package addressbook KF5Akonadi)
+ $(cmake_use_find_package addressbook KF5Contacts)
+ $(cmake_use_find_package addressbook KF5IdentityManagement)
+ -DENABLE_LIBICAL=$(usex calendar)
+ -DENABLE_KBANKING=$(usex hbci)
+ $(cmake_use_find_package holidays KF5Holidays)
+ -DENABLE_WEBENGINE=$(usex !webkit)
+ )
+ [[ ${KDE_BUILD_TYPE} = live ]] &&
+ mycmakeargs+=( -DENABLE_UNFINISHEDFEATURES=$(usex experimental) )
+
+ ecm_src_configure
+}
+
+src_test() {
+ # bug 652636; bug 673052: needs kmymoney installed to succeed
+ local myctestargs=(
+ -E "(reports-chart-test|qsqlcipher-test)"
+ )
+
+ ecm_src_test
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index a02b1bb2721e..2e6d347a19fe 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/porticron/porticron-0.7.1.ebuild b/app-portage/porticron/porticron-0.7.1.ebuild
index 74ceba2df79e..8499e8cd8c7b 100644
--- a/app-portage/porticron/porticron-0.7.1.ebuild
+++ b/app-portage/porticron/porticron-0.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/gentoo/porticron/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 hppa ppc ~ppc64 x86"
IUSE=""
RDEPEND="
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index d7e763822398..2dccf32a0002 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/hstr/files/hstr-2.1-fix-ncurses-configure.patch b/app-shells/hstr/files/hstr-2.1-fix-ncurses-configure.patch
deleted file mode 100644
index 215fd5cedfc9..000000000000
--- a/app-shells/hstr/files/hstr-2.1-fix-ncurses-configure.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 1676ec8..73c8be5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -47,39 +47,33 @@ then
- fi
-
- # PKG_CHECK_MODULES macro is NOT used to avoid confusing syntax errors in case that pkg-config is NOT installed
--AC_CHECK_LIB(ncursesw, killwchar, [],
--[
-- AC_CHECK_LIB(ncurses, killwchar, [],
-- [
-- AC_SUBST([NCURSESW_CFLAGS])
-- AC_SUBST([NCURSESW_LIBS])
-- if pkg-config --exists ncursesw
-- then
-- AC_MSG_NOTICE([Module ncursesw found])
-- NCURSESW_CFLAGS=`pkg-config --cflags ncursesw`
-- NCURSESW_LIBS=`pkg-config --libs ncursesw`
-- else
-- if pkg-config --exists ncurses
-- then
-- AC_MSG_NOTICE([Module ncurses found])
-- NCURSESW_CFLAGS=`pkg-config --cflags ncursesw`
-- NCURSESW_LIBS=`pkg-config --libs ncurses`
-- else
-- AS_CASE([$host_os],
-- [darwin*],
-- [
-- AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])])
-- AC_CHECK_HEADER(curses.h)
-- ],
-- [
-- AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])])
-- AC_CHECK_HEADER(ncursesw/curses.h)
-- ]
-- )
-- fi
-- fi
-- ]) # FAIL of ncurses
--]) # FAIL of ncursesw
-+AC_SUBST([NCURSESW_CFLAGS])
-+AC_SUBST([NCURSESW_LIBS])
-+if pkg-config --exists ncursesw
-+then
-+ AC_MSG_NOTICE([Module ncursesw found])
-+ NCURSESW_CFLAGS=`pkg-config --cflags ncursesw`
-+ NCURSESW_LIBS=`pkg-config --libs ncursesw`
-+else
-+ if pkg-config --exists ncurses
-+ then
-+ AC_MSG_NOTICE([Module ncurses found])
-+ NCURSESW_CFLAGS=`pkg-config --cflags ncursesw`
-+ NCURSESW_LIBS=`pkg-config --libs ncurses`
-+ else
-+ AS_CASE([$host_os],
-+ [darwin*],
-+ [
-+ AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])])
-+ AC_CHECK_HEADER(curses.h)
-+ ],
-+ [
-+ AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])])
-+ AC_CHECK_HEADER(ncursesw/curses.h)
-+ ]
-+ )
-+ fi
-+fi
-
-
- # Checks for libraries.
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 7640d21..17a82b7 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -37,4 +37,4 @@ hstr_SOURCES = \
- install-exec-hook:
- ln $(DESTDIR)$(bindir)/hstr$(EXEEXT) $(DESTDIR)$(bindir)/hh$(EXEEXT)
-
--hstr_LDADD = $(NCURSES_LIBS)
-+hstr_LDADD = $(NCURSESW_LIBS)
diff --git a/app-shells/hstr/hstr-2.1.ebuild b/app-shells/hstr/hstr-2.1.ebuild
index f9bffba4e61d..95a0c74991ac 100644
--- a/app-shells/hstr/hstr-2.1.ebuild
+++ b/app-shells/hstr/hstr-2.1.ebuild
@@ -22,7 +22,7 @@ DEPEND="
DOCS=( CONFIGURATION.md README.md )
-PATCHES=( ${FILESDIR}/${P}-fix-ncurses-configure.patch )
+PATCHES=( ${FILESDIR}/${PN}-2.0-fix-ncurses-configure.patch )
src_prepare() {
default
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 482f9a87d9e4..5d6c6788db41 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/ansifilter/ansifilter-2.16.ebuild b/app-text/ansifilter/ansifilter-2.16.ebuild
index 0481ddcea6a1..d6ef6e4cc8c8 100644
--- a/app-text/ansifilter/ansifilter-2.16.ebuild
+++ b/app-text/ansifilter/ansifilter-2.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~ppc64 x86"
IUSE="qt5"
RDEPEND="
diff --git a/app-text/flpsed/flpsed-0.7.3.ebuild b/app-text/flpsed/flpsed-0.7.3.ebuild
index 71ddce38048f..d5c909badb01 100644
--- a/app-text/flpsed/flpsed-0.7.3.ebuild
+++ b/app-text/flpsed/flpsed-0.7.3.ebuild
@@ -6,8 +6,8 @@ EAPI=7
inherit desktop
DESCRIPTION="Pseudo PostScript editor"
-HOMEPAGE="http://flpsed.org/flpsed.html"
-SRC_URI="http://flpsed.org/${P}.tar.gz"
+HOMEPAGE="https://flpsed.org/flpsed.html"
+SRC_URI="https://flpsed.org/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/app-text/highlight/highlight-3.57.ebuild b/app-text/highlight/highlight-3.57.ebuild
index 90bd4a859636..55a55186d8ae 100644
--- a/app-text/highlight/highlight-3.57.ebuild
+++ b/app-text/highlight/highlight-3.57.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/libspectre/libspectre-0.2.9.ebuild b/app-text/libspectre/libspectre-0.2.9.ebuild
index 03f16375e5c3..d8a1a897bd0e 100644
--- a/app-text/libspectre/libspectre-0.2.9.ebuild
+++ b/app-text/libspectre/libspectre-0.2.9.ebuild
@@ -18,7 +18,7 @@ BDEPEND="
virtual/pkgconfig
doc? ( app-doc/doxygen )
"
-RDEPEND=">=app-text/ghostscript-gpl-9.24"
+RDEPEND=">=app-text/ghostscript-gpl-9.24:="
DEPEND="${RDEPEND}"
# does not actually test anything, see bug 362557
diff --git a/app-text/xapers/metadata.xml b/app-text/xapers/metadata.xml
index b2b0bbc66d70..5b6ab9a1eabd 100644
--- a/app-text/xapers/metadata.xml
+++ b/app-text/xapers/metadata.xml
@@ -9,9 +9,6 @@
proxy-maint@gentoo.org
Proxy maintainers
-
- Xapers is a personal document indexing system, geared towards academic journal articles.
-
Jameson Graef Rollins
diff --git a/app-text/xapers/xapers-0.8.2-r1.ebuild b/app-text/xapers/xapers-0.8.2-r1.ebuild
new file mode 100644
index 000000000000..808db0ee8572
--- /dev/null
+++ b/app-text/xapers/xapers-0.8.2-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2016-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="Personal document indexing system"
+HOMEPAGE="https://finestructure.net/xapers/"
+SRC_URI="https://finestructure.net/xapers/releases/${P}.tar.gz"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="app-text/poppler[utils]
+ dev-libs/xapian-bindings[python,${PYTHON_USEDEP}]
+ dev-python/pybtex[${PYTHON_USEDEP}]
+ dev-python/pycurl[${PYTHON_USEDEP}]
+ dev-python/urwid[${PYTHON_USEDEP}]
+ x11-misc/xclip
+ x11-misc/xdg-utils"
+
+BDEPEND="test? ( ${RDEPEND} )"
+
+src_test() {
+ cd test || die
+ ./all || die
+}
diff --git a/app-text/xiphos/xiphos-4.0.6a-r2.ebuild b/app-text/xiphos/xiphos-4.0.6a-r2.ebuild
index dd5177d45fa9..7521fa24db4e 100644
--- a/app-text/xiphos/xiphos-4.0.6a-r2.ebuild
+++ b/app-text/xiphos/xiphos-4.0.6a-r2.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic gnome2-utils python-single-r1 toolchain-funcs
MY_PV="${PV}-20170820"
MY_P="${PN}-${MY_PV}"
DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)"
-HOMEPAGE="http://xiphos.org/"
+HOMEPAGE="https://xiphos.org/"
SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
diff --git a/app-text/xiphos/xiphos-4.1.0-r2.ebuild b/app-text/xiphos/xiphos-4.1.0-r2.ebuild
index 24314a606c49..49bfe5394fce 100644
--- a/app-text/xiphos/xiphos-4.1.0-r2.ebuild
+++ b/app-text/xiphos/xiphos-4.1.0-r2.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python2_7 )
inherit flag-o-matic gnome2-utils python-single-r1 toolchain-funcs
DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)"
-HOMEPAGE="http://xiphos.org/"
+HOMEPAGE="https://xiphos.org/"
SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
diff --git a/app-text/zathura/zathura-0.4.3.ebuild b/app-text/zathura/zathura-0.4.3.ebuild
index 26887b29c3f2..b73544c83c5c 100644
--- a/app-text/zathura/zathura-0.4.3.ebuild
+++ b/app-text/zathura/zathura-0.4.3.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
@@ -6,7 +6,7 @@ EAPI=7
inherit meson virtualx
DESCRIPTION="A highly customizable and functional document viewer"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
if [[ ${PV} == *9999 ]]; then
inherit git-r3
diff --git a/app-text/zathura/zathura-0.4.4.ebuild b/app-text/zathura/zathura-0.4.4.ebuild
index 1167454be534..cccc28f4066c 100644
--- a/app-text/zathura/zathura-0.4.4.ebuild
+++ b/app-text/zathura/zathura-0.4.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=7
@@ -6,7 +6,7 @@ EAPI=7
inherit meson virtualx
DESCRIPTION="A highly customizable and functional document viewer"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
if [[ ${PV} == *9999 ]]; then
inherit git-r3
diff --git a/app-text/zathura/zathura-0.4.5.ebuild b/app-text/zathura/zathura-0.4.5.ebuild
index 4a62e043c71b..08b6a2a8e21d 100644
--- a/app-text/zathura/zathura-0.4.5.ebuild
+++ b/app-text/zathura/zathura-0.4.5.ebuild
@@ -6,7 +6,7 @@ EAPI=7
inherit meson virtualx
DESCRIPTION="A highly customizable and functional document viewer"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
if [[ ${PV} == *9999 ]]; then
inherit git-r3
diff --git a/app-text/zathura/zathura-9999.ebuild b/app-text/zathura/zathura-9999.ebuild
index 83ead1f313eb..08b6a2a8e21d 100644
--- a/app-text/zathura/zathura-9999.ebuild
+++ b/app-text/zathura/zathura-9999.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
@@ -6,7 +6,7 @@ EAPI=7
inherit meson virtualx
DESCRIPTION="A highly customizable and functional document viewer"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
if [[ ${PV} == *9999 ]]; then
inherit git-r3
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index d1225bd311fb..69c784ffd199 100644
Binary files a/app-vim/Manifest.gz and b/app-vim/Manifest.gz differ
diff --git a/app-vim/exheres-syntax/exheres-syntax-20090310.ebuild b/app-vim/exheres-syntax/exheres-syntax-20090310.ebuild
index 98ebebae3200..7a014b993ceb 100644
--- a/app-vim/exheres-syntax/exheres-syntax-20090310.ebuild
+++ b/app-vim/exheres-syntax/exheres-syntax-20090310.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
@@ -6,8 +6,8 @@ EAPI=6
inherit vim-plugin
DESCRIPTION="vim plugin: exheres format highlighting"
-HOMEPAGE="http://www.exherbo.org/"
-SRC_URI="http://dev.exherbo.org/~ahf/pub/software/releases/${PN}/${P}.tar.bz2"
+HOMEPAGE="https://www.exherbo.org/"
+SRC_URI="https://dev.exherbo.org/~ahf/pub/software/releases/${PN}/${P}.tar.bz2"
LICENSE="vim"
SLOT="0"
diff --git a/app-vim/exheres-syntax/exheres-syntax-99999999.ebuild b/app-vim/exheres-syntax/exheres-syntax-99999999.ebuild
index 21106c1f23b8..437d26234642 100644
--- a/app-vim/exheres-syntax/exheres-syntax-99999999.ebuild
+++ b/app-vim/exheres-syntax/exheres-syntax-99999999.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
@@ -6,7 +6,7 @@ EAPI=6
inherit vim-plugin git-r3
DESCRIPTION="vim plugin: exheres format highlighting"
-HOMEPAGE="http://www.exherbo.org/"
+HOMEPAGE="https://www.exherbo.org/"
EGIT_REPO_URI="https://git.exherbo.org/git/exheres-syntax.git"
LICENSE="vim"
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index b45a34f17f15..228c3e99e63d 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/mm-common/mm-common-1.0.0.ebuild b/dev-cpp/mm-common/mm-common-1.0.0.ebuild
index ba4c89f0371d..42b9cdc2119a 100644
--- a/dev-cpp/mm-common/mm-common-1.0.0.ebuild
+++ b/dev-cpp/mm-common/mm-common-1.0.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gtkmm.org/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE=""
RDEPEND=""
diff --git a/dev-cpp/waylandpp/waylandpp-0.2.7.ebuild b/dev-cpp/waylandpp/waylandpp-0.2.7.ebuild
index f25c7dccb2b2..58a4949eaafd 100644
--- a/dev-cpp/waylandpp/waylandpp-0.2.7.ebuild
+++ b/dev-cpp/waylandpp/waylandpp-0.2.7.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/NilsBrause/waylandpp/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~x86"
fi
RDEPEND="
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 01b325a9792c..78219e7e4048 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/clickhouse/Manifest b/dev-db/clickhouse/Manifest
deleted file mode 100644
index 4c1396c38ae9..000000000000
--- a/dev-db/clickhouse/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST cctz-4f9776a.tar.gz 290009 BLAKE2B 532eb7d590f9814c05cc7fdd3c75efe0a6b3f81d85201b14163a9600dd858c4fbac592270d0afccd7d5eef0080d7e70e9d716023bdb60d55479585e2cd3d3f59 SHA512 ba0dfc404cc70f03ef2be29fa3b0c70ea881c92a92525ea4ba1b5bcfc9e45df1b62a5eec180f498293e64bdd5cb9b41f97361cbb7e8baf299dcfdcd1557ca205
-DIST clickhouse-18.10.3.tar.gz 6136661 BLAKE2B 5564bbe85f4ca43f18df702148af0e4e5b5a8826994d90f29beb3a37cdbeb36f9d3ec77d9c7bc6f843e7586e5441aeb0937548eb5eb61d27cecc5790d8c21a5b SHA512 c78386922388cf910a995b569724eb22fc41ab60e765a4d3644c4a48d8b9a67ef28b7e375186b2eb00c43b4f06e90783084f4ac4d3789f1b6e4251ee30e8833c
-DIST clickhouse-18.12.17.tar.gz 6495521 BLAKE2B 00dfb823b9e36923beb50a88bee88af3918bedc7b20079785699a42e36e52f32739f786bd78c5b350f58ae59251e3846da6202d04e24e9a750c92e16065cc395 SHA512 876c5fb6011c65b8ec201126678dad6f5de3430b7d320316ced5c6d22e8086ce337d20b73badbd053bf141097b8fe6cd94910ed607b4bbedb681cfa7921d1fb6
-DIST clickhouse-18.6.0.tar.gz 5852534 BLAKE2B 5634fd26907b21d4a35cff3ed816696205be4aff1cdd1acfe222e24214b1842eb18a4e499e888b0d92b78f5c3023c2962a385af2c0ea889055e473dfa0198bf5 SHA512 e8ea2d4457122513cad47b1cdb2a58dd2ffaec77a7a08bf82179aca12a369d39970520a995bb5db2e5ea4b0939da827b7d4b1f3929cf71c149c965438ebb3633
-DIST clickhouse-19.13.1.11.zip 11502726 BLAKE2B c2788702a2c27c995abc072a94f3945ed6f9039fe0c7840312a86987faf52d2f7801d531e89a02848fa8ee1319247c41de0f3ad0c0cb51c1df1dbcfca3bd3b0a SHA512 095a0e63eff6989ea1f70fac593069e1cdb6ea207a99d8cfd610c4eb8f3f7411a784d9f100c9fc899898e68dd88dd54bec3c136764793c8cae986d920a651f8c
-DIST clickhouse-19.15.2.2.zip 11425217 BLAKE2B 3a2288d771cd92dc283713a44df84df8c3c946ef92efd781d7619c8ffc0d7a3884f1a988c81f1703a7d373e78e413bdaea0fd100cebf7090be9bba16779209ff SHA512 029376b9d540c592d30a32457deb9e605d512fc448eb3dc6896b0ca48a5e92f390ef2dc3a4ea63ce19c264a8b2810ff952e95a6c7a8d4506f733ac6253c079d3
-DIST clickhouse-19.5.3.8.zip 11247905 BLAKE2B f72289f55bddf9b3ad2e16a4d1fc6e4f7681477e742eda3694c3c16975820c93affc01c70b194c5992226d79bee714f706c04402c62bd0ed3d1701a16fb22192 SHA512 f578abbd43c3ccf721e079ce2bafac22be0c5d619388be192c59a2053ae1cf1e7f0a025e0323f0f8f004f879990a88c0ca0cd4d135606de51c576619fe0172b8
-DIST clickhouse-19.9.5.36.zip 11708002 BLAKE2B 075f9b1556c5ee207a608047fa559cec7a0b1f044236e412189ae6dabe25aa04abf881726e4ffa17d4aad6937250c704f050935e61470994b57eaa1ac9ea07e4 SHA512 b0aa04a1c0f7c15316c83a2711f9b64f8235e664956f933530a9f2dc26fcb8b817adb8ca43c96db1cad498e06f4291ce13c0bb259726039c5caa52ae523fa4ab
diff --git a/dev-db/clickhouse/clickhouse-18.10.3-r1.ebuild b/dev-db/clickhouse/clickhouse-18.10.3-r1.ebuild
deleted file mode 100644
index 351b11c198be..000000000000
--- a/dev-db/clickhouse/clickhouse-18.10.3-r1.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils systemd toolchain-funcs user
-
-DESCRIPTION="An OSS column-oriented database management system for real-time data analysis"
-HOMEPAGE="https://clickhouse.yandex"
-LICENSE="Apache-2.0"
-
-MY_PN="ClickHouse"
-TYPE="stable"
-
-CCTZ_COMMIT="4f9776a"
-SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.tar.gz -> ${P}.tar.gz
- https://github.com/google/cctz/archive/${CCTZ_COMMIT}.tar.gz -> cctz-${CCTZ_COMMIT}.tar.gz
-"
-
-SLOT="0/${TYPE}"
-IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools zookeeper"
-RESTRICT="!test? ( test )"
-KEYWORDS="~amd64"
-
-REQUIRED_USE="
- server? ( cpu_flags_x86_sse4_2 )
- static? ( client server tools )
-"
-
-RDEPEND="
- dev-libs/re2:0=
- !static? (
- >=app-arch/lz4-1.8.0:=
- >=app-arch/zstd-1.3.4:=
- client? (
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- )
-
- dev-libs/double-conversion
- dev-libs/capnproto
- dev-libs/libltdl:0
- sys-libs/libunwind:0
- sys-libs/zlib
- || (
- dev-db/unixODBC
- dev-libs/poco[odbc]
- )
- dev-libs/icu:=
- dev-libs/glib
- >=dev-libs/boost-1.65.0:=
- dev-libs/openssl:0=
- dev-libs/zookeeper-c
- kafka? ( dev-libs/librdkafka:= )
- mysql? ( dev-db/mysql-connector-c:= )
- )
-
- >=dev-libs/poco-1.9.0
- dev-libs/libpcre
-"
-
-DEPEND="${RDEPEND}
- doc? ( >=dev-python/mkdocs-1.0.1 )
- static? (
- >=app-arch/lz4-1.8.0[static-libs]
- >=app-arch/zstd-1.3.4[static-libs]
- client? (
- sys-libs/ncurses:0=[static-libs]
- sys-libs/readline:0=[static-libs]
- )
- dev-libs/capnproto[static-libs]
- dev-libs/libltdl[static-libs]
- sys-libs/libunwind:0[static-libs]
- sys-libs/zlib[static-libs]
- || (
- dev-db/unixODBC[static-libs]
- dev-libs/poco[odbc]
- )
- dev-libs/icu[static-libs]
- dev-libs/glib[static-libs]
- >=dev-libs/boost-1.65.0[static-libs]
- dev-libs/openssl[static-libs]
- dev-libs/zookeeper-c[static-libs]
- dev-db/mysql-connector-c[static-libs]
- kafka? ( dev-libs/librdkafka[static-libs] )
- )
-
- sys-libs/libtermcap-compat
- dev-util/patchelf
- >=sys-devel/lld-6.0.0
- || (
- >=sys-devel/gcc-7.0
- >=sys-devel/clang-6.0
- )
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
-
-_clang_fullversion() {
- local ver="$1"; shift
- set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__")
- eval echo "$ver"
-}
-
-clang-fullversion() {
- _clang_fullversion '$1.$2.$3' "$@"
-}
-
-clang-version() {
- _clang_fullversion '$1.$2' "$@"
-}
-
-clang-major-version() {
- _clang_fullversion '$1' "$@"
-}
-
-clang-minor-version() {
- _clang_fullversion '$2' "$@"
-}
-
-clang-micro-version() {
- _clang_fullversion '$3' "$@"
-}
-
-pkg_pretend() {
- if [[ $(tc-getCC) == clang ]]; then
- if [[ $(clang-major-version) -lt 6 ]]; then
- eerror "Compilation with clang older than 6.0 is not supported"
- die "Too old clang found"
- fi
- :
- elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then
- eerror "Compilation with gcc older than 7.2 is not supported"
- die "Too old gcc found"
- fi
-}
-
-src_unpack() {
- default_src_unpack
- [[ ${PV} == 9999 ]] && return 0
- cd "${S}/contrib" || die "failed to cd to contrib"
- mkdir -p cctz zookeeper zstd || die "failed to create directories"
- tar --strip-components=1 -C cctz -xf "${DISTDIR}/cctz-${CCTZ_COMMIT}.tar.gz" || die "failed to unpack cctz"
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_POCO_MONGODB="$(usex mongodb)"
- -DENABLE_RDKAFKA="$(usex kafka)"
- -DENABLE_TESTS="$(usex test)"
- -DUSE_STATIC_LIBRARIES="$(usex static)"
- -DMAKE_STATIC_LIBRARIES="$(usex static)"
- -DUSE_MYSQL="$(usex mysql)"
- -DENABLE_CLICKHOUSE_SERVER="$(usex server)"
- -DENABLE_CLICKHOUSE_CLIENT="$(usex client)"
- -DENABLE_CLICKHOUSE_LOCAL="$(usex tools)"
- -DENABLE_CLICKHOUSE_BENCHMARK="$(usex tools)"
- -DENABLE_CLICKHOUSE_PERFORMANCE="$(usex tools)"
- -DENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG="$(usex tools)"
- -DENABLE_CLICKHOUSE_COMPRESSOR="$(usex tools)"
- -DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
- -DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
- -DENABLE_CLICKHOUSE_ALL=OFF
- -DUSE_INTERNAL_SSL_LIBRARY=False
- -DUSE_INTERNAL_CITYHASH_LIBRARY=ON # Clickhouse explicitly requires bundled patched cityhash
- -DUNBUNDLED=ON
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- if ! use test; then
- rm -rf "${D}/usr/share/clickhouse-test" || die "failed to remove tests"
- fi
-
- if use doc; then
- pushd "${S}/docs/tools" || die "Failed to enter docs build directory"
- ./build.py || die "Failed to build docs"
- popd || die "Failed to exit docs build directory"
-
- dodoc -r "${S}/docs/build"
- fi
-
- if use server; then
- newinitd "${FILESDIR}"/clickhouse-server.initd clickhouse-server
- systemd_dounit "${FILESDIR}"/clickhouse-server.service
- fi
-}
-
-pkg_preinst() {
- if use server; then
- enewgroup clickhouse
- enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse
- fi
-}
diff --git a/dev-db/clickhouse/clickhouse-18.12.17-r1.ebuild b/dev-db/clickhouse/clickhouse-18.12.17-r1.ebuild
deleted file mode 100644
index fa18cc2e59f7..000000000000
--- a/dev-db/clickhouse/clickhouse-18.12.17-r1.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils systemd toolchain-funcs user
-
-DESCRIPTION="An OSS column-oriented database management system for real-time data analysis"
-HOMEPAGE="https://clickhouse.yandex"
-LICENSE="Apache-2.0"
-
-MY_PN="ClickHouse"
-TYPE="stable"
-
-CCTZ_COMMIT="4f9776a"
-SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.tar.gz -> ${P}.tar.gz
- https://github.com/google/cctz/archive/${CCTZ_COMMIT}.tar.gz -> cctz-${CCTZ_COMMIT}.tar.gz
-"
-
-SLOT="0/${TYPE}"
-IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools"
-RESTRICT="!test? ( test )"
-KEYWORDS="~amd64"
-
-REQUIRED_USE="
- server? ( cpu_flags_x86_sse4_2 )
- static? ( client server tools )
-"
-
-RDEPEND="
- dev-libs/re2:0=
- !static? (
- >=app-arch/lz4-1.8.0:=
- >=app-arch/zstd-1.3.4:=
- client? (
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- )
-
- dev-libs/double-conversion
- dev-libs/capnproto
- dev-libs/libltdl:0
- sys-libs/libunwind:0
- sys-libs/zlib
- || (
- dev-db/unixODBC
- dev-libs/poco[odbc]
- )
- dev-libs/icu:=
- dev-libs/glib
- >=dev-libs/boost-1.65.0:=
- dev-libs/openssl:0=
- kafka? ( dev-libs/librdkafka:= )
- mysql? ( dev-db/mysql-connector-c:= )
- )
-
- >=dev-libs/poco-1.9.0
- dev-libs/libpcre
-"
-
-DEPEND="${RDEPEND}
- doc? ( >=dev-python/mkdocs-1.0.1 )
- static? (
- >=app-arch/lz4-1.8.0[static-libs]
- >=app-arch/zstd-1.3.4[static-libs]
- client? (
- sys-libs/ncurses:0=[static-libs]
- sys-libs/readline:0=[static-libs]
- )
- dev-libs/capnproto[static-libs]
- dev-libs/libltdl[static-libs]
- sys-libs/libunwind:0[static-libs]
- sys-libs/zlib[static-libs]
- || (
- dev-db/unixODBC[static-libs]
- dev-libs/poco[odbc]
- )
- dev-libs/icu[static-libs]
- dev-libs/glib[static-libs]
- >=dev-libs/boost-1.65.0[static-libs]
- dev-libs/openssl[static-libs]
- dev-db/mysql-connector-c[static-libs]
- kafka? ( dev-libs/librdkafka[static-libs] )
- )
-
- sys-libs/libtermcap-compat
- dev-util/patchelf
- >=sys-devel/lld-6.0.0
- || (
- >=sys-devel/gcc-7.0
- >=sys-devel/clang-6.0
- )
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
-
-_clang_fullversion() {
- local ver="$1"; shift
- set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__")
- eval echo "$ver"
-}
-
-clang-fullversion() {
- _clang_fullversion '$1.$2.$3' "$@"
-}
-
-clang-version() {
- _clang_fullversion '$1.$2' "$@"
-}
-
-clang-major-version() {
- _clang_fullversion '$1' "$@"
-}
-
-clang-minor-version() {
- _clang_fullversion '$2' "$@"
-}
-
-clang-micro-version() {
- _clang_fullversion '$3' "$@"
-}
-
-pkg_pretend() {
- if [[ $(tc-getCC) == clang ]]; then
- if [[ $(clang-major-version) -lt 6 ]]; then
- eerror "Compilation with clang older than 6.0 is not supported"
- die "Too old clang found"
- fi
- :
- elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then
- eerror "Compilation with gcc older than 7.2 is not supported"
- die "Too old gcc found"
- fi
-}
-
-src_unpack() {
- default_src_unpack
- [[ ${PV} == 9999 ]] && return 0
- cd "${S}/contrib" || die "failed to cd to contrib"
- mkdir -p cctz zstd || die "failed to create directories"
- tar --strip-components=1 -C cctz -xf "${DISTDIR}/cctz-${CCTZ_COMMIT}.tar.gz" || die "failed to unpack cctz"
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_POCO_MONGODB="$(usex mongodb)"
- -DENABLE_RDKAFKA="$(usex kafka)"
- -DENABLE_TESTS="$(usex test)"
- -DUSE_STATIC_LIBRARIES="$(usex static)"
- -DMAKE_STATIC_LIBRARIES="$(usex static)"
- -DUSE_MYSQL="$(usex mysql)"
- -DENABLE_CLICKHOUSE_SERVER="$(usex server)"
- -DENABLE_CLICKHOUSE_CLIENT="$(usex client)"
- -DENABLE_CLICKHOUSE_LOCAL="$(usex tools)"
- -DENABLE_CLICKHOUSE_BENCHMARK="$(usex tools)"
- -DENABLE_CLICKHOUSE_PERFORMANCE="$(usex tools)"
- -DENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG="$(usex tools)"
- -DENABLE_CLICKHOUSE_COMPRESSOR="$(usex tools)"
- -DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
- # As of now, clickhouse fails to build if odbc is disabled
- -DENABLE_ODBC=True
- -DENABLE_CLICKHOUSE_ODBC_BRIDGE=True
- -DENABLE_CLICKHOUSE_ALL=OFF
- -DUSE_INTERNAL_SSL_LIBRARY=False
- -DUSE_INTERNAL_CITYHASH_LIBRARY=ON # Clickhouse explicitly requires bundled patched cityhash
- -DUNBUNDLED=ON
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- if ! use test; then
- rm -rf "${D}/usr/share/clickhouse-test" || die "failed to remove tests"
- fi
-
- if use doc; then
- pushd "${S}/docs/tools" || die "Failed to enter docs build directory"
- ./build.py || die "Failed to build docs"
- popd || die "Failed to exit docs build directory"
-
- dodoc -r "${S}/docs/build"
- fi
-
- if use server; then
- newinitd "${FILESDIR}"/clickhouse-server.initd clickhouse-server
- systemd_dounit "${FILESDIR}"/clickhouse-server.service
- fi
-}
-
-pkg_preinst() {
- if use server; then
- enewgroup clickhouse
- enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse
- fi
-}
diff --git a/dev-db/clickhouse/clickhouse-18.6.0-r1.ebuild b/dev-db/clickhouse/clickhouse-18.6.0-r1.ebuild
deleted file mode 100644
index f5c30296ab3d..000000000000
--- a/dev-db/clickhouse/clickhouse-18.6.0-r1.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils systemd toolchain-funcs user
-
-DESCRIPTION="An OSS column-oriented database management system for real-time data analysis"
-HOMEPAGE="https://clickhouse.yandex"
-LICENSE="Apache-2.0"
-
-MY_PN="ClickHouse"
-TYPE="stable"
-
-CCTZ_COMMIT="4f9776a"
-ZSTD_COMMIT="2555975"
-SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.tar.gz -> ${P}.tar.gz
- https://github.com/google/cctz/archive/${CCTZ_COMMIT}.tar.gz -> cctz-${CCTZ_COMMIT}.tar.gz
-"
-
-SLOT="0/${TYPE}"
-IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools zookeeper"
-RESTRICT="!test? ( test )"
-KEYWORDS="~amd64"
-
-REQUIRED_USE="
- server? ( cpu_flags_x86_sse4_2 )
- static? ( client server tools )
-"
-
-RDEPEND="
- dev-libs/re2:0=
- !static? (
- >=app-arch/lz4-1.8.0:=
- >=app-arch/zstd-1.3.4:=
- client? (
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- )
-
- dev-libs/double-conversion
- dev-libs/capnproto
- dev-libs/libltdl:0
- sys-libs/libunwind:0
- sys-libs/zlib
- || (
- dev-db/unixODBC
- dev-libs/poco[odbc]
- )
- dev-libs/icu:=
- dev-libs/glib
- >=dev-libs/boost-1.65.0:=
- dev-libs/openssl:0=
- dev-libs/zookeeper-c
- kafka? ( dev-libs/librdkafka:= )
- mysql? ( dev-db/mysql-connector-c:= )
- )
-
- >=dev-libs/poco-1.9.0
- dev-libs/libpcre
-"
-
-DEPEND="${RDEPEND}
- doc? ( >=dev-python/mkdocs-0.17.3 )
- static? (
- >=app-arch/lz4-1.8.0[static-libs]
- >=app-arch/zstd-1.3.4[static-libs]
- client? (
- sys-libs/ncurses:0=[static-libs]
- sys-libs/readline:0=[static-libs]
- )
- dev-libs/capnproto[static-libs]
- dev-libs/libltdl[static-libs]
- sys-libs/libunwind:0[static-libs]
- sys-libs/zlib[static-libs]
- || (
- dev-db/unixODBC[static-libs]
- dev-libs/poco[odbc]
- )
- dev-libs/icu[static-libs]
- dev-libs/glib[static-libs]
- >=dev-libs/boost-1.65.0[static-libs]
- dev-libs/openssl[static-libs]
- dev-libs/zookeeper-c[static-libs]
- dev-db/mysql-connector-c[static-libs]
- kafka? ( dev-libs/librdkafka[static-libs] )
- )
-
- sys-libs/libtermcap-compat
- dev-util/patchelf
- >=sys-devel/lld-6.0.0
- || (
- >=sys-devel/gcc-7.0
- >=sys-devel/clang-6.0
- )
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
-
-_clang_fullversion() {
- local ver="$1"; shift
- set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__")
- eval echo "$ver"
-}
-
-clang-fullversion() {
- _clang_fullversion '$1.$2.$3' "$@"
-}
-
-clang-version() {
- _clang_fullversion '$1.$2' "$@"
-}
-
-clang-major-version() {
- _clang_fullversion '$1' "$@"
-}
-
-clang-minor-version() {
- _clang_fullversion '$2' "$@"
-}
-
-clang-micro-version() {
- _clang_fullversion '$3' "$@"
-}
-
-pkg_pretend() {
- if [[ $(tc-getCC) == clang ]]; then
- if [[ $(clang-major-version) -lt 6 ]]; then
- eerror "Compilation with clang older than 6.0 is not supported"
- die "Too old clang found"
- fi
- :
- elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then
- eerror "Compilation with gcc older than 7.2 is not supported"
- die "Too old gcc found"
- fi
-}
-
-src_unpack() {
- default_src_unpack
- [[ ${PV} == 9999 ]] && return 0
- cd "${S}/contrib" || die "failed to cd to contrib"
- mkdir -p cctz zookeeper zstd || die "failed to create directories"
- tar --strip-components=1 -C cctz -xf "${DISTDIR}/cctz-${CCTZ_COMMIT}.tar.gz" || die "failed to unpack cctz"
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_POCO_MONGODB="$(usex mongodb)"
- -DENABLE_RDKAFKA="$(usex kafka)"
- -DENABLE_TESTS="$(usex test)"
- -DUSE_STATIC_LIBRARIES="$(usex static)"
- -DMAKE_STATIC_LIBRARIES="$(usex static)"
- -DUSE_MYSQL="$(usex mysql)"
- -DENABLE_CLICKHOUSE_SERVER="$(usex server)"
- -DENABLE_CLICKHOUSE_CLIENT="$(usex client)"
- -DENABLE_CLICKHOUSE_LOCAL="$(usex tools)"
- -DENABLE_CLICKHOUSE_BENCHMARK="$(usex tools)"
- -DENABLE_CLICKHOUSE_PERFORMANCE="$(usex tools)"
- -DENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG="$(usex tools)"
- -DENABLE_CLICKHOUSE_COMPRESSOR="$(usex tools)"
- -DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
- -DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
- -DENABLE_CLICKHOUSE_ALL=OFF
- -DUSE_INTERNAL_CITYHASH_LIBRARY=ON # Clickhouse explicitly requires bundled patched cityhash
- -DUNBUNDLED=ON
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- if ! use test; then
- rm -rf "${D}/usr/share/clickhouse-test" || die "failed to remove tests"
- fi
-
- if use doc; then
- pushd "${S}/docs/tools" || die "Failed to enter docs build directory"
- ./build.py || die "Failed to build docs"
- popd || die "Failed to exit docs build directory"
-
- dodoc -r "${S}/docs/build"
- fi
-
- if use server; then
- newinitd "${FILESDIR}"/clickhouse-server.initd clickhouse-server
- systemd_dounit "${FILESDIR}"/clickhouse-server.service
- fi
-}
-
-pkg_preinst() {
- if use server; then
- enewgroup clickhouse
- enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse
- fi
-}
diff --git a/dev-db/clickhouse/clickhouse-19.13.1.11-r2.ebuild b/dev-db/clickhouse/clickhouse-19.13.1.11-r2.ebuild
deleted file mode 100644
index 0184d7fe5a7c..000000000000
--- a/dev-db/clickhouse/clickhouse-19.13.1.11-r2.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils systemd toolchain-funcs user
-
-DESCRIPTION="An OSS column-oriented database management system for real-time data analysis"
-HOMEPAGE="https://clickhouse.yandex"
-LICENSE="Apache-2.0"
-
-MY_PN="ClickHouse"
-TYPE="stable"
-
-CCTZ_COMMIT="4f9776a"
-SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.zip -> ${P}.zip
- https://github.com/google/cctz/archive/${CCTZ_COMMIT}.tar.gz -> cctz-${CCTZ_COMMIT}.tar.gz
-"
-
-SLOT="0/${TYPE}"
-IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools"
-RESTRICT="!test? ( test )"
-KEYWORDS="~amd64"
-
-REQUIRED_USE="
- server? ( cpu_flags_x86_sse4_2 )
- static? ( client server tools )
-"
-
-RDEPEND="
- dev-libs/re2:0=
- !static? (
- >=app-arch/lz4-1.8.0:=
- >=app-arch/zstd-1.3.4:=
- client? (
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- )
-
- dev-libs/double-conversion
- dev-libs/capnproto
- dev-libs/libltdl:0
- sys-libs/libunwind:0
- sys-libs/zlib
- dev-libs/poco[odbc]
- dev-libs/icu:=
- dev-libs/glib
- >=dev-libs/boost-1.65.0:=
- dev-libs/openssl:0=
- kafka? ( dev-libs/librdkafka:= )
- mysql? ( dev-db/mysql-connector-c:= )
- )
-
- >=dev-libs/poco-1.9.0
- dev-libs/libpcre
- dev-libs/jemalloc
- dev-libs/protobuf
-"
-
-DEPEND="${RDEPEND}
- doc? ( >=dev-python/mkdocs-1.0.1 )
- static? (
- >=app-arch/lz4-1.8.0[static-libs]
- >=app-arch/zstd-1.3.4[static-libs]
- client? (
- sys-libs/ncurses:0=[static-libs]
- sys-libs/readline:0=[static-libs]
- )
- dev-libs/capnproto[static-libs]
- dev-libs/libltdl[static-libs]
- sys-libs/libunwind:0[static-libs]
- sys-libs/zlib[static-libs]
- || (
- dev-db/unixODBC[static-libs]
- dev-libs/poco[odbc]
- )
- dev-libs/icu[static-libs]
- dev-libs/glib[static-libs]
- >=dev-libs/boost-1.65.0[static-libs]
- dev-libs/openssl[static-libs]
- dev-db/mysql-connector-c[static-libs]
- kafka? ( dev-libs/librdkafka[static-libs] )
- )
-
- sys-libs/libtermcap-compat
- dev-util/patchelf
- >=sys-devel/lld-6.0.0
- >=sys-devel/gcc-7.0
- >=sys-devel/clang-6.0
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
-
-_clang_fullversion() {
- local ver="$1"; shift
- set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__")
- eval echo "$ver"
-}
-
-clang-fullversion() {
- _clang_fullversion '$1.$2.$3' "$@"
-}
-
-clang-version() {
- _clang_fullversion '$1.$2' "$@"
-}
-
-clang-major-version() {
- _clang_fullversion '$1' "$@"
-}
-
-clang-minor-version() {
- _clang_fullversion '$2' "$@"
-}
-
-clang-micro-version() {
- _clang_fullversion '$3' "$@"
-}
-
-pkg_pretend() {
- if [[ $(tc-getCC) == clang ]]; then
- if [[ $(clang-major-version) -lt 6 ]]; then
- eerror "Compilation with clang older than 6.0 is not supported"
- die "Too old clang found"
- fi
- :
- elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then
- eerror "Compilation with gcc older than 7.2 is not supported"
- die "Too old gcc found"
- fi
-}
-
-src_unpack() {
- default_src_unpack
- [[ ${PV} == 9999 ]] && return 0
- cd "${S}/contrib" || die "failed to cd to contrib"
- mkdir -p cctz zstd || die "failed to create directories"
- tar --strip-components=1 -C cctz -xf "${DISTDIR}/cctz-${CCTZ_COMMIT}.tar.gz" || die "failed to unpack cctz"
-}
-
-src_prepare() {
- eapply_user
- cmake-utils_src_prepare
-}
-src_configure() {
- local mycmakeargs=(
- -DENABLE_POCO_MONGODB="$(usex mongodb)"
- -DENABLE_RDKAFKA="$(usex kafka)"
- -DENABLE_TESTS="$(usex test)"
- -DUSE_STATIC_LIBRARIES="$(usex static)"
- -DMAKE_STATIC_LIBRARIES="$(usex static)"
- -DUSE_MYSQL="$(usex mysql)"
- -DENABLE_CLICKHOUSE_SERVER="$(usex server)"
- -DENABLE_CLICKHOUSE_CLIENT="$(usex client)"
- -DENABLE_CLICKHOUSE_LOCAL="$(usex tools)"
- -DENABLE_CLICKHOUSE_BENCHMARK="$(usex tools)"
- -DENABLE_CLICKHOUSE_PERFORMANCE="$(usex tools)"
- -DENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG="$(usex tools)"
- -DENABLE_CLICKHOUSE_COMPRESSOR="$(usex tools)"
- -DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
- # As of now, clickhouse fails to build if odbc is disabled
- -DENABLE_ODBC=True
- -DENABLE_CLICKHOUSE_ODBC_BRIDGE=True
- -DENABLE_CLICKHOUSE_ALL=OFF
- -DUSE_INTERNAL_SSL_LIBRARY=False
- -DUSE_INTERNAL_CITYHASH_LIBRARY=ON # Clickhouse explicitly requires bundled patched cityhash
- -DUNBUNDLED=ON
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- if ! use test; then
- rm -rf "${D}/usr/share/clickhouse-test" || die "failed to remove tests"
- fi
-
- if use doc; then
- pushd "${S}/docs/tools" || die "Failed to enter docs build directory"
- ./build.py || die "Failed to build docs"
- popd || die "Failed to exit docs build directory"
-
- dodoc -r "${S}/docs/build"
- fi
-
- if use server; then
- newinitd "${FILESDIR}"/clickhouse-server.initd clickhouse-server
- systemd_dounit "${FILESDIR}"/clickhouse-server.service
- fi
-
- keepdir /var/log/clickhouse-server
- chown clickhouse:clickhouse "${D}"/var/log/clickhouse-server
-}
-
-pkg_preinst() {
- if use server; then
- enewgroup clickhouse
- enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse
- fi
-}
diff --git a/dev-db/clickhouse/clickhouse-19.13.1.11-r3.ebuild b/dev-db/clickhouse/clickhouse-19.13.1.11-r3.ebuild
deleted file mode 100644
index aafc89dc7813..000000000000
--- a/dev-db/clickhouse/clickhouse-19.13.1.11-r3.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils systemd toolchain-funcs user
-
-DESCRIPTION="An OSS column-oriented database management system for real-time data analysis"
-HOMEPAGE="https://clickhouse.yandex"
-LICENSE="Apache-2.0"
-
-MY_PN="ClickHouse"
-TYPE="stable"
-
-CCTZ_COMMIT="4f9776a"
-SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.zip -> ${P}.zip
- https://github.com/google/cctz/archive/${CCTZ_COMMIT}.tar.gz -> cctz-${CCTZ_COMMIT}.tar.gz
-"
-
-SLOT="0/${TYPE}"
-IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools"
-RESTRICT="!test? ( test )"
-KEYWORDS="~amd64"
-
-REQUIRED_USE="
- server? ( cpu_flags_x86_sse4_2 )
- static? ( client server tools )
-"
-
-RDEPEND="
- dev-libs/re2:0=
- !static? (
- >=app-arch/lz4-1.8.0:=
- >=app-arch/zstd-1.3.4:=
- client? (
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- )
-
- dev-libs/double-conversion
- dev-libs/capnproto
- dev-libs/libltdl:0
- sys-libs/libunwind:0
- sys-libs/zlib
- dev-libs/poco[odbc]
- dev-libs/icu:=
- dev-libs/glib
- >=dev-libs/boost-1.65.0:=
- dev-libs/openssl:0=
- kafka? ( dev-libs/librdkafka:= )
- mysql? ( dev-db/mysql-connector-c:= )
- )
-
- >=dev-libs/poco-1.9.0
- dev-libs/libpcre
- dev-libs/jemalloc
- dev-libs/protobuf
-"
-
-DEPEND="${RDEPEND}
- doc? ( >=dev-python/mkdocs-1.0.1 )
- static? (
- >=app-arch/lz4-1.8.0[static-libs]
- >=app-arch/zstd-1.3.4[static-libs]
- client? (
- sys-libs/ncurses:0=[static-libs]
- sys-libs/readline:0=[static-libs]
- )
- dev-libs/capnproto[static-libs]
- dev-libs/libltdl[static-libs]
- sys-libs/libunwind:0[static-libs]
- sys-libs/zlib[static-libs]
- || (
- dev-db/unixODBC[static-libs]
- dev-libs/poco[odbc]
- )
- dev-libs/icu[static-libs]
- dev-libs/glib[static-libs]
- >=dev-libs/boost-1.65.0[static-libs]
- dev-libs/openssl[static-libs]
- dev-db/mysql-connector-c[static-libs]
- kafka? ( dev-libs/librdkafka[static-libs] )
- )
- =dev-cpp/gtest-1.8*
- sys-libs/libtermcap-compat
- dev-util/patchelf
- >=sys-devel/lld-6.0.0
- >=sys-devel/gcc-7.0
- >=sys-devel/clang-6.0
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
-
-_clang_fullversion() {
- local ver="$1"; shift
- set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__")
- eval echo "$ver"
-}
-
-clang-fullversion() {
- _clang_fullversion '$1.$2.$3' "$@"
-}
-
-clang-version() {
- _clang_fullversion '$1.$2' "$@"
-}
-
-clang-major-version() {
- _clang_fullversion '$1' "$@"
-}
-
-clang-minor-version() {
- _clang_fullversion '$2' "$@"
-}
-
-clang-micro-version() {
- _clang_fullversion '$3' "$@"
-}
-
-pkg_pretend() {
- if [[ $(tc-getCC) == clang ]]; then
- if [[ $(clang-major-version) -lt 6 ]]; then
- eerror "Compilation with clang older than 6.0 is not supported"
- die "Too old clang found"
- fi
- :
- elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then
- eerror "Compilation with gcc older than 7.2 is not supported"
- die "Too old gcc found"
- fi
-}
-
-src_unpack() {
- default_src_unpack
- [[ ${PV} == 9999 ]] && return 0
- cd "${S}/contrib" || die "failed to cd to contrib"
- mkdir -p cctz zstd || die "failed to create directories"
- tar --strip-components=1 -C cctz -xf "${DISTDIR}/cctz-${CCTZ_COMMIT}.tar.gz" || die "failed to unpack cctz"
-}
-
-src_prepare() {
- eapply_user
- cmake-utils_src_prepare
-}
-src_configure() {
- local mycmakeargs=(
- -DENABLE_POCO_MONGODB="$(usex mongodb)"
- -DENABLE_RDKAFKA="$(usex kafka)"
- -DENABLE_TESTS="$(usex test)"
- -DUSE_STATIC_LIBRARIES="$(usex static)"
- -DMAKE_STATIC_LIBRARIES="$(usex static)"
- -DUSE_MYSQL="$(usex mysql)"
- -DENABLE_CLICKHOUSE_SERVER="$(usex server)"
- -DENABLE_CLICKHOUSE_CLIENT="$(usex client)"
- -DENABLE_CLICKHOUSE_LOCAL="$(usex tools)"
- -DENABLE_CLICKHOUSE_BENCHMARK="$(usex tools)"
- -DENABLE_CLICKHOUSE_PERFORMANCE="$(usex tools)"
- -DENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG="$(usex tools)"
- -DENABLE_CLICKHOUSE_COMPRESSOR="$(usex tools)"
- -DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
- # As of now, clickhouse fails to build if odbc is disabled
- -DENABLE_ODBC=True
- -DENABLE_CLICKHOUSE_ODBC_BRIDGE=True
- -DENABLE_CLICKHOUSE_ALL=OFF
- -DUSE_INTERNAL_SSL_LIBRARY=False
- -DUSE_INTERNAL_CITYHASH_LIBRARY=ON # Clickhouse explicitly requires bundled patched cityhash
- -DUNBUNDLED=ON
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- if ! use test; then
- rm -rf "${D}/usr/share/clickhouse-test" || die "failed to remove tests"
- fi
-
- if use doc; then
- pushd "${S}/docs/tools" || die "Failed to enter docs build directory"
- ./build.py || die "Failed to build docs"
- popd || die "Failed to exit docs build directory"
-
- dodoc -r "${S}/docs/build"
- fi
-
- if use server; then
- newinitd "${FILESDIR}"/clickhouse-server.initd-r1 clickhouse-server
- newconfd "${FILESDIR}"/clickhouse-server.confd clickhouse-server
- systemd_dounit "${FILESDIR}"/clickhouse-server.service
- fi
-
- keepdir /var/log/clickhouse-server
- chown clickhouse:clickhouse "${D}"/var/log/clickhouse-server
-}
-
-pkg_preinst() {
- if use server; then
- enewgroup clickhouse
- enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse
- fi
-}
diff --git a/dev-db/clickhouse/clickhouse-19.15.2.2.ebuild b/dev-db/clickhouse/clickhouse-19.15.2.2.ebuild
deleted file mode 100644
index 22b038f2ebdd..000000000000
--- a/dev-db/clickhouse/clickhouse-19.15.2.2.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils systemd toolchain-funcs user
-
-DESCRIPTION="An OSS column-oriented database management system for real-time data analysis"
-HOMEPAGE="https://clickhouse.yandex"
-LICENSE="Apache-2.0"
-
-MY_PN="ClickHouse"
-TYPE="stable"
-
-CCTZ_COMMIT="4f9776a"
-SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.zip -> ${P}.zip
- https://github.com/google/cctz/archive/${CCTZ_COMMIT}.tar.gz -> cctz-${CCTZ_COMMIT}.tar.gz
-"
-
-SLOT="0/${TYPE}"
-IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools"
-RESTRICT="!test? ( test )"
-KEYWORDS="~amd64"
-
-REQUIRED_USE="
- server? ( cpu_flags_x86_sse4_2 )
- static? ( client server tools )
-"
-
-RDEPEND="
- dev-libs/re2:0=
- !static? (
- >=app-arch/lz4-1.8.0:=
- >=app-arch/zstd-1.3.4:=
- client? (
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- )
-
- dev-libs/double-conversion
- dev-libs/capnproto
- dev-libs/libltdl:0
- sys-libs/libunwind:0
- sys-libs/zlib
- dev-libs/poco[odbc]
- dev-libs/icu:=
- dev-libs/glib
- >=dev-libs/boost-1.65.0:=
- dev-libs/openssl:0=
- kafka? ( dev-libs/librdkafka:= )
- mysql? ( dev-db/mysql-connector-c:= )
- )
-
- >=dev-libs/poco-1.9.0
- dev-libs/libpcre
- dev-libs/jemalloc
- dev-libs/protobuf
- dev-cpp/sparsehash
-"
-
-DEPEND="${RDEPEND}
- doc? ( >=dev-python/mkdocs-1.0.1 )
- static? (
- >=app-arch/lz4-1.8.0[static-libs]
- >=app-arch/zstd-1.3.4[static-libs]
- client? (
- sys-libs/ncurses:0=[static-libs]
- sys-libs/readline:0=[static-libs]
- )
- dev-libs/capnproto[static-libs]
- dev-libs/libltdl[static-libs]
- sys-libs/libunwind:0[static-libs]
- sys-libs/zlib[static-libs]
- || (
- dev-db/unixODBC[static-libs]
- dev-libs/poco[odbc]
- )
- dev-libs/icu[static-libs]
- dev-libs/glib[static-libs]
- >=dev-libs/boost-1.65.0[static-libs]
- dev-libs/openssl[static-libs]
- dev-db/mysql-connector-c[static-libs]
- kafka? ( dev-libs/librdkafka[static-libs] )
- )
- =dev-cpp/gtest-1.8*
- sys-libs/libtermcap-compat
- dev-util/patchelf
- >=sys-devel/lld-6.0.0
- >=sys-devel/gcc-7.0
- >=sys-devel/clang-6.0
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
-
-_clang_fullversion() {
- local ver="$1"; shift
- set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__")
- eval echo "$ver"
-}
-
-clang-fullversion() {
- _clang_fullversion '$1.$2.$3' "$@"
-}
-
-clang-version() {
- _clang_fullversion '$1.$2' "$@"
-}
-
-clang-major-version() {
- _clang_fullversion '$1' "$@"
-}
-
-clang-minor-version() {
- _clang_fullversion '$2' "$@"
-}
-
-clang-micro-version() {
- _clang_fullversion '$3' "$@"
-}
-
-pkg_pretend() {
- if [[ $(tc-getCC) == clang ]]; then
- if [[ $(clang-major-version) -lt 6 ]]; then
- eerror "Compilation with clang older than 6.0 is not supported"
- die "Too old clang found"
- fi
- :
- elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then
- eerror "Compilation with gcc older than 7.2 is not supported"
- die "Too old gcc found"
- fi
-}
-
-src_unpack() {
- default_src_unpack
- [[ ${PV} == 9999 ]] && return 0
- cd "${S}/contrib" || die "failed to cd to contrib"
- mkdir -p cctz zstd || die "failed to create directories"
- tar --strip-components=1 -C cctz -xf "${DISTDIR}/cctz-${CCTZ_COMMIT}.tar.gz" || die "failed to unpack cctz"
-}
-
-src_prepare() {
- sed -i -e 's~add_subdirectory(contrib/libunwind-cmake)~~' cmake/find/unwind.cmake || die "Failed to succeed"
- eapply_user
- cmake-utils_src_prepare
-}
-src_configure() {
- local mycmakeargs=(
- -DENABLE_POCO_MONGODB="$(usex mongodb)"
- -DENABLE_RDKAFKA="$(usex kafka)"
- -DENABLE_TESTS="$(usex test)"
- -DUSE_STATIC_LIBRARIES="$(usex static)"
- -DMAKE_STATIC_LIBRARIES="$(usex static)"
- -DUSE_MYSQL="$(usex mysql)"
- -DENABLE_CLICKHOUSE_SERVER="$(usex server)"
- -DENABLE_CLICKHOUSE_CLIENT="$(usex client)"
- -DENABLE_CLICKHOUSE_LOCAL="$(usex tools)"
- -DENABLE_CLICKHOUSE_BENCHMARK="$(usex tools)"
- -DENABLE_CLICKHOUSE_PERFORMANCE="$(usex tools)"
- -DENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG="$(usex tools)"
- -DENABLE_CLICKHOUSE_COMPRESSOR="$(usex tools)"
- -DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
- # As of now, clickhouse fails to build if odbc is disabled
- -DENABLE_ODBC=True
- -DENABLE_CLICKHOUSE_ODBC_BRIDGE=True
- -DENABLE_CLICKHOUSE_ALL=OFF
- -DUSE_INTERNAL_SSL_LIBRARY=False
- -DUSE_INTERNAL_CITYHASH_LIBRARY=ON # Clickhouse explicitly requires bundled patched cityhash
- -DUNBUNDLED=ON
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- if ! use test; then
- rm -rf "${D}/usr/share/clickhouse-test" || die "failed to remove tests"
- fi
-
- if use doc; then
- pushd "${S}/docs/tools" || die "Failed to enter docs build directory"
- ./build.py || die "Failed to build docs"
- popd || die "Failed to exit docs build directory"
-
- dodoc -r "${S}/docs/build"
- fi
-
- if use server; then
- newinitd "${FILESDIR}"/clickhouse-server.initd-r1 clickhouse-server
- newconfd "${FILESDIR}"/clickhouse-server.confd clickhouse-server
- systemd_dounit "${FILESDIR}"/clickhouse-server.service
- fi
-
- keepdir /var/log/clickhouse-server
- chown clickhouse:clickhouse "${D}"/var/log/clickhouse-server
-}
-
-pkg_preinst() {
- if use server; then
- enewgroup clickhouse
- enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse
- fi
-}
diff --git a/dev-db/clickhouse/clickhouse-19.5.3.8-r1.ebuild b/dev-db/clickhouse/clickhouse-19.5.3.8-r1.ebuild
deleted file mode 100644
index 80e66a29108b..000000000000
--- a/dev-db/clickhouse/clickhouse-19.5.3.8-r1.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils systemd toolchain-funcs user
-
-DESCRIPTION="An OSS column-oriented database management system for real-time data analysis"
-HOMEPAGE="https://clickhouse.yandex"
-LICENSE="Apache-2.0"
-
-MY_PN="ClickHouse"
-TYPE="stable"
-
-CCTZ_COMMIT="4f9776a"
-SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.zip -> ${P}.zip
- https://github.com/google/cctz/archive/${CCTZ_COMMIT}.tar.gz -> cctz-${CCTZ_COMMIT}.tar.gz
-"
-
-SLOT="0/${TYPE}"
-IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools"
-RESTRICT="!test? ( test )"
-KEYWORDS="~amd64"
-
-REQUIRED_USE="
- server? ( cpu_flags_x86_sse4_2 )
- static? ( client server tools )
-"
-
-RDEPEND="
- dev-libs/re2:0=
- !static? (
- >=app-arch/lz4-1.8.0:=
- >=app-arch/zstd-1.3.4:=
- client? (
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- )
-
- dev-libs/double-conversion
- dev-libs/capnproto
- dev-libs/libltdl:0
- sys-libs/libunwind:0
- sys-libs/zlib
- dev-libs/poco[odbc]
- dev-libs/icu:=
- dev-libs/glib
- >=dev-libs/boost-1.65.0:=
- dev-libs/openssl:0=
- kafka? ( dev-libs/librdkafka:= )
- mysql? ( dev-db/mysql-connector-c:= )
- )
-
- >=dev-libs/poco-1.9.0
- dev-libs/libpcre
- dev-libs/jemalloc
-"
-
-DEPEND="${RDEPEND}
- doc? ( >=dev-python/mkdocs-1.0.1 )
- static? (
- >=app-arch/lz4-1.8.0[static-libs]
- >=app-arch/zstd-1.3.4[static-libs]
- client? (
- sys-libs/ncurses:0=[static-libs]
- sys-libs/readline:0=[static-libs]
- )
- dev-libs/capnproto[static-libs]
- dev-libs/libltdl[static-libs]
- sys-libs/libunwind:0[static-libs]
- sys-libs/zlib[static-libs]
- || (
- dev-db/unixODBC[static-libs]
- dev-libs/poco[odbc]
- )
- dev-libs/icu[static-libs]
- dev-libs/glib[static-libs]
- >=dev-libs/boost-1.65.0[static-libs]
- dev-libs/openssl[static-libs]
- dev-db/mysql-connector-c[static-libs]
- kafka? ( dev-libs/librdkafka[static-libs] )
- )
-
- sys-libs/libtermcap-compat
- dev-util/patchelf
- >=sys-devel/lld-6.0.0
- >=sys-devel/gcc-7.0
- >=sys-devel/clang-6.0
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
-
-_clang_fullversion() {
- local ver="$1"; shift
- set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__")
- eval echo "$ver"
-}
-
-clang-fullversion() {
- _clang_fullversion '$1.$2.$3' "$@"
-}
-
-clang-version() {
- _clang_fullversion '$1.$2' "$@"
-}
-
-clang-major-version() {
- _clang_fullversion '$1' "$@"
-}
-
-clang-minor-version() {
- _clang_fullversion '$2' "$@"
-}
-
-clang-micro-version() {
- _clang_fullversion '$3' "$@"
-}
-
-pkg_pretend() {
- if [[ $(tc-getCC) == clang ]]; then
- if [[ $(clang-major-version) -lt 6 ]]; then
- eerror "Compilation with clang older than 6.0 is not supported"
- die "Too old clang found"
- fi
- :
- elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then
- eerror "Compilation with gcc older than 7.2 is not supported"
- die "Too old gcc found"
- fi
-}
-
-src_unpack() {
- default_src_unpack
- [[ ${PV} == 9999 ]] && return 0
- cd "${S}/contrib" || die "failed to cd to contrib"
- mkdir -p cctz zstd || die "failed to create directories"
- tar --strip-components=1 -C cctz -xf "${DISTDIR}/cctz-${CCTZ_COMMIT}.tar.gz" || die "failed to unpack cctz"
-}
-
-src_prepare() {
- eapply_user
- cmake-utils_src_prepare
-}
-src_configure() {
- local mycmakeargs=(
- -DENABLE_POCO_MONGODB="$(usex mongodb)"
- -DENABLE_RDKAFKA="$(usex kafka)"
- -DENABLE_TESTS="$(usex test)"
- -DUSE_STATIC_LIBRARIES="$(usex static)"
- -DMAKE_STATIC_LIBRARIES="$(usex static)"
- -DUSE_MYSQL="$(usex mysql)"
- -DENABLE_CLICKHOUSE_SERVER="$(usex server)"
- -DENABLE_CLICKHOUSE_CLIENT="$(usex client)"
- -DENABLE_CLICKHOUSE_LOCAL="$(usex tools)"
- -DENABLE_CLICKHOUSE_BENCHMARK="$(usex tools)"
- -DENABLE_CLICKHOUSE_PERFORMANCE="$(usex tools)"
- -DENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG="$(usex tools)"
- -DENABLE_CLICKHOUSE_COMPRESSOR="$(usex tools)"
- -DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
- # As of now, clickhouse fails to build if odbc is disabled
- -DENABLE_ODBC=True
- -DENABLE_CLICKHOUSE_ODBC_BRIDGE=True
- -DENABLE_CLICKHOUSE_ALL=OFF
- -DUSE_INTERNAL_SSL_LIBRARY=False
- -DUSE_INTERNAL_CITYHASH_LIBRARY=ON # Clickhouse explicitly requires bundled patched cityhash
- -DUNBUNDLED=ON
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- if ! use test; then
- rm -rf "${D}/usr/share/clickhouse-test" || die "failed to remove tests"
- fi
-
- if use doc; then
- pushd "${S}/docs/tools" || die "Failed to enter docs build directory"
- ./build.py || die "Failed to build docs"
- popd || die "Failed to exit docs build directory"
-
- dodoc -r "${S}/docs/build"
- fi
-
- if use server; then
- newinitd "${FILESDIR}"/clickhouse-server.initd clickhouse-server
- systemd_dounit "${FILESDIR}"/clickhouse-server.service
- fi
-
- keepdir /var/log/clickhouse-server
- chown clickhouse:clickhouse "${D}"/var/log/clickhouse-server
-}
-
-pkg_preinst() {
- if use server; then
- enewgroup clickhouse
- enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse
- fi
-}
diff --git a/dev-db/clickhouse/clickhouse-19.9.5.36-r1.ebuild b/dev-db/clickhouse/clickhouse-19.9.5.36-r1.ebuild
deleted file mode 100644
index 80e66a29108b..000000000000
--- a/dev-db/clickhouse/clickhouse-19.9.5.36-r1.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils systemd toolchain-funcs user
-
-DESCRIPTION="An OSS column-oriented database management system for real-time data analysis"
-HOMEPAGE="https://clickhouse.yandex"
-LICENSE="Apache-2.0"
-
-MY_PN="ClickHouse"
-TYPE="stable"
-
-CCTZ_COMMIT="4f9776a"
-SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.zip -> ${P}.zip
- https://github.com/google/cctz/archive/${CCTZ_COMMIT}.tar.gz -> cctz-${CCTZ_COMMIT}.tar.gz
-"
-
-SLOT="0/${TYPE}"
-IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools"
-RESTRICT="!test? ( test )"
-KEYWORDS="~amd64"
-
-REQUIRED_USE="
- server? ( cpu_flags_x86_sse4_2 )
- static? ( client server tools )
-"
-
-RDEPEND="
- dev-libs/re2:0=
- !static? (
- >=app-arch/lz4-1.8.0:=
- >=app-arch/zstd-1.3.4:=
- client? (
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- )
-
- dev-libs/double-conversion
- dev-libs/capnproto
- dev-libs/libltdl:0
- sys-libs/libunwind:0
- sys-libs/zlib
- dev-libs/poco[odbc]
- dev-libs/icu:=
- dev-libs/glib
- >=dev-libs/boost-1.65.0:=
- dev-libs/openssl:0=
- kafka? ( dev-libs/librdkafka:= )
- mysql? ( dev-db/mysql-connector-c:= )
- )
-
- >=dev-libs/poco-1.9.0
- dev-libs/libpcre
- dev-libs/jemalloc
-"
-
-DEPEND="${RDEPEND}
- doc? ( >=dev-python/mkdocs-1.0.1 )
- static? (
- >=app-arch/lz4-1.8.0[static-libs]
- >=app-arch/zstd-1.3.4[static-libs]
- client? (
- sys-libs/ncurses:0=[static-libs]
- sys-libs/readline:0=[static-libs]
- )
- dev-libs/capnproto[static-libs]
- dev-libs/libltdl[static-libs]
- sys-libs/libunwind:0[static-libs]
- sys-libs/zlib[static-libs]
- || (
- dev-db/unixODBC[static-libs]
- dev-libs/poco[odbc]
- )
- dev-libs/icu[static-libs]
- dev-libs/glib[static-libs]
- >=dev-libs/boost-1.65.0[static-libs]
- dev-libs/openssl[static-libs]
- dev-db/mysql-connector-c[static-libs]
- kafka? ( dev-libs/librdkafka[static-libs] )
- )
-
- sys-libs/libtermcap-compat
- dev-util/patchelf
- >=sys-devel/lld-6.0.0
- >=sys-devel/gcc-7.0
- >=sys-devel/clang-6.0
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}"
-
-_clang_fullversion() {
- local ver="$1"; shift
- set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__")
- eval echo "$ver"
-}
-
-clang-fullversion() {
- _clang_fullversion '$1.$2.$3' "$@"
-}
-
-clang-version() {
- _clang_fullversion '$1.$2' "$@"
-}
-
-clang-major-version() {
- _clang_fullversion '$1' "$@"
-}
-
-clang-minor-version() {
- _clang_fullversion '$2' "$@"
-}
-
-clang-micro-version() {
- _clang_fullversion '$3' "$@"
-}
-
-pkg_pretend() {
- if [[ $(tc-getCC) == clang ]]; then
- if [[ $(clang-major-version) -lt 6 ]]; then
- eerror "Compilation with clang older than 6.0 is not supported"
- die "Too old clang found"
- fi
- :
- elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then
- eerror "Compilation with gcc older than 7.2 is not supported"
- die "Too old gcc found"
- fi
-}
-
-src_unpack() {
- default_src_unpack
- [[ ${PV} == 9999 ]] && return 0
- cd "${S}/contrib" || die "failed to cd to contrib"
- mkdir -p cctz zstd || die "failed to create directories"
- tar --strip-components=1 -C cctz -xf "${DISTDIR}/cctz-${CCTZ_COMMIT}.tar.gz" || die "failed to unpack cctz"
-}
-
-src_prepare() {
- eapply_user
- cmake-utils_src_prepare
-}
-src_configure() {
- local mycmakeargs=(
- -DENABLE_POCO_MONGODB="$(usex mongodb)"
- -DENABLE_RDKAFKA="$(usex kafka)"
- -DENABLE_TESTS="$(usex test)"
- -DUSE_STATIC_LIBRARIES="$(usex static)"
- -DMAKE_STATIC_LIBRARIES="$(usex static)"
- -DUSE_MYSQL="$(usex mysql)"
- -DENABLE_CLICKHOUSE_SERVER="$(usex server)"
- -DENABLE_CLICKHOUSE_CLIENT="$(usex client)"
- -DENABLE_CLICKHOUSE_LOCAL="$(usex tools)"
- -DENABLE_CLICKHOUSE_BENCHMARK="$(usex tools)"
- -DENABLE_CLICKHOUSE_PERFORMANCE="$(usex tools)"
- -DENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG="$(usex tools)"
- -DENABLE_CLICKHOUSE_COMPRESSOR="$(usex tools)"
- -DENABLE_CLICKHOUSE_COPIER="$(usex tools)"
- # As of now, clickhouse fails to build if odbc is disabled
- -DENABLE_ODBC=True
- -DENABLE_CLICKHOUSE_ODBC_BRIDGE=True
- -DENABLE_CLICKHOUSE_ALL=OFF
- -DUSE_INTERNAL_SSL_LIBRARY=False
- -DUSE_INTERNAL_CITYHASH_LIBRARY=ON # Clickhouse explicitly requires bundled patched cityhash
- -DUNBUNDLED=ON
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- if ! use test; then
- rm -rf "${D}/usr/share/clickhouse-test" || die "failed to remove tests"
- fi
-
- if use doc; then
- pushd "${S}/docs/tools" || die "Failed to enter docs build directory"
- ./build.py || die "Failed to build docs"
- popd || die "Failed to exit docs build directory"
-
- dodoc -r "${S}/docs/build"
- fi
-
- if use server; then
- newinitd "${FILESDIR}"/clickhouse-server.initd clickhouse-server
- systemd_dounit "${FILESDIR}"/clickhouse-server.service
- fi
-
- keepdir /var/log/clickhouse-server
- chown clickhouse:clickhouse "${D}"/var/log/clickhouse-server
-}
-
-pkg_preinst() {
- if use server; then
- enewgroup clickhouse
- enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse
- fi
-}
diff --git a/dev-db/clickhouse/files/clickhouse-server.confd b/dev-db/clickhouse/files/clickhouse-server.confd
deleted file mode 100644
index 0e7344672b4b..000000000000
--- a/dev-db/clickhouse/files/clickhouse-server.confd
+++ /dev/null
@@ -1,4 +0,0 @@
-user="clickhouse"
-group="clickhouse"
-logdir="/var/log/clickhouse-server"
-
diff --git a/dev-db/clickhouse/files/clickhouse-server.initd b/dev-db/clickhouse/files/clickhouse-server.initd
deleted file mode 100644
index 5e787c0c1fa6..000000000000
--- a/dev-db/clickhouse/files/clickhouse-server.initd
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-pidfile="/run/clickhouse-server.pid"
-command_background=1
-command="/usr/bin/clickhouse-server"
-start_stop_daemon_args="--user clickhouse --group clickhouse \
- --chdir /etc/clickhouse-server \
- -1 /var/log/clickhouse-server/stdout.log \
- -2 /var/log/clickhouse-server/stderr.log"
-
-depend() {
- need net
- after mongodb
-}
diff --git a/dev-db/clickhouse/files/clickhouse-server.initd-r1 b/dev-db/clickhouse/files/clickhouse-server.initd-r1
deleted file mode 100644
index efc11f5e54c0..000000000000
--- a/dev-db/clickhouse/files/clickhouse-server.initd-r1
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-user="clickhouse"
-group="clickhouse"
-logdir="/var/log/clickhouse-server"
-pidfile="/run/clickhouse-server.pid"
-command_background=1
-command="/usr/bin/clickhouse-server"
-start_stop_daemon_args="--user ${user} --group ${group} \
- --chdir /etc/clickhouse-server \
- -1 ${logdir}/stdout.log \
- -2 ${logdir}/stderr.log"
-
-depend() {
- need net
- after mongodb
-}
-
-start_pre() {
- checkpath -m 0755 -o "${user}:${group}" -d "${logdir}"
-}
diff --git a/dev-db/clickhouse/files/clickhouse-server.service b/dev-db/clickhouse/files/clickhouse-server.service
deleted file mode 100644
index 64d2cbacf6ec..000000000000
--- a/dev-db/clickhouse/files/clickhouse-server.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=ClickHouse Server (analytic DBMS for big data)
-
-[Service]
-Type=simple
-User=clickhouse
-Group=clickhouse
-Restart=always
-RestartSec=30
-ExecStart=/usr/bin/clickhouse-server --config=/etc/clickhouse-server/config.xml
-LimitCORE=infinity
-LimitNOFILE=500000
-
-[Install]
-WantedBy=multi-user.target
diff --git a/dev-db/clickhouse/metadata.xml b/dev-db/clickhouse/metadata.xml
deleted file mode 100644
index bb224e97f7c5..000000000000
--- a/dev-db/clickhouse/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
- yandex/Clickhouse
-
-
-
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild
index 91e9ba93b995..de5885c92ec9 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild
@@ -12,7 +12,7 @@ else
MY_PV=${PV/_b/-b}
SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz"
S="${WORKDIR%/}/${PN}-${MY_PV}-src"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc ~x86"
fi
inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index b3d4665e8124..6c786db69ba3 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -2,5 +2,7 @@ DIST mongodb-src-r3.6.13.tar.gz 40853787 BLAKE2B de9621de4f570d569df5cfe026ea5da
DIST mongodb-src-r3.6.17.tar.gz 40932592 BLAKE2B 94bbb943fd929318a2b32344cb4574243ad234d1cd14ffef864d7fd2d60841866fd5a1966eae8f14266a9648deb62b7b55386d41338b515d5e6849e980143d42 SHA512 b4d9e9bfc7ff886532641058c99da29420d1aa472cb4cf2b254e0fd0af5ecc72ac8bf28dcd55ab738b799b00132ffacddd154dea37ccfbf459c7cc603c2582e0
DIST mongodb-src-r4.0.12.tar.gz 49937644 BLAKE2B 81044a6d68be6420d30fb2d7386ff29871a696cad94ce5977c1aba60c2ce80e18ccb86492c1947a359ef124332ea82ac3cb0fb73a68f51904a008fdf911aa055 SHA512 802eaf57d56c5e8e217344f10104a201acb6f5abef0065fc1bb8e6ceef13fe489b7ae46ed0d55b5bad50fe3579860b1c1471d224b51b0f15f968278cb5f6a47a
DIST mongodb-src-r4.0.16.tar.gz 50091501 BLAKE2B a383f9fef8e5b2ceda9646dfc4f4f46bc3bee66be45e94a846b1a7ce859826273812d4ce11aa96d1766071bf5fb422771bf2176350145deae99e64e59c164e38 SHA512 90458dea29a4c9a3078e1f13ffd2163911bf5a5f42884553ad9b3c2a2fafea2f73e506640c78f55f27bc16551582ad22244437356b89786fef383ce4b24bb617
+DIST mongodb-src-r4.0.19.tar.gz 50126414 BLAKE2B 2691e2a9c8833ff9a086b28fd137bc8e8f10d58570117657c7cc01edbf61568ae62f58440d72e8711de98b9fc6868c1095b4ee88eb7b0eb63ea45ce19e842edd SHA512 57032a009ea7e79de4cac496a2d1266b83b99cc45eb9f1169be2fcdca1ed2003a659ceedf9eafbd4aa7fc5b3b0513066a5d712af7666cee5a897b2a2d7dd30cb
DIST mongodb-src-r4.2.3.tar.gz 61565615 BLAKE2B 695310a497e57f1c735f175f5b321c93cda376ec734bb08d4cabbd562a865b327f529560220be9c22f571cc70af333a77f0116f04c7f7e3a40f275ab53ab1bf9 SHA512 60e9091cfab4a189a937dfa7ce232eb6ead2ca192c916579f4fb5da2040aa340ae9de0ea8c7a4ccb0edcfdbdf6e666144657f171c3f23c0a62bccf27cd351c69
DIST mongodb-src-r4.2.6.tar.gz 61671088 BLAKE2B 7f2b6240b05639d2bbe37ea148cbb225b30813879f71a5fc3c135ef7debd58edf75abe925d00f9ff96dc6a75a525b4504e25254b0046326069c05bb1dfd60827 SHA512 117c910807a8363aab6b899b436a4b06564b6e53abfa7f0fe6e01c1e242401ab5a3634d9edc5e0a5e2d548a480c90b70ac492eb199b3f2476d9045a78e376af8
+DIST mongodb-src-r4.2.8.tar.gz 61730247 BLAKE2B f1d98b8ac8f62c0c7aff100ef663bb20345de0e77e0ff420817db0843fe735b58af8075578a7f8d83cc9dc4e597c95ae09f89ce7a21cf8146ff15bcb11eba924 SHA512 163fce480762bd377d6c78b661bfe51fc883223a5309a68f9556e1bafb99e26e476d81dbe6de825d90469e835442be097be630ca9678e54b9d09091e0b5d67c4
diff --git a/dev-db/mongodb/mongodb-4.0.19.ebuild b/dev-db/mongodb/mongodb-4.0.19.ebuild
new file mode 100644
index 000000000000..651219492475
--- /dev/null
+++ b/dev-db/mongodb/mongodb-4.0.19.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+SCONS_MIN_VERSION="2.5.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 SSPL-1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug kerberos libressl lto mms-agent ssl test +tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="acct-group/mongodb
+ acct-user/mongodb
+ >=app-arch/snappy-1.1.3
+ >=dev-cpp/yaml-cpp-0.5.3:=
+ >=dev-libs/boost-1.60:=[threads(+)]
+ >=dev-libs/libpcre-8.41[cxx]
+ dev-libs/snowball-stemmer
+ net-libs/libpcap
+ >=sys-libs/zlib-1.2.11:=
+ kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+ mms-agent? ( app-admin/mms-agent )
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep '
+ test? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+ >=dev-util/scons-2.5.0[${PYTHON_USEDEP}]
+ dev-python/cheetah[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/typing[${PYTHON_USEDEP}]
+ ')
+ sys-libs/ncurses:0=
+ sys-libs/readline:0=
+ debug? ( dev-util/valgrind )"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
+ "${FILESDIR}/${PN}-4.0.0-no-compass.patch"
+ "${FILESDIR}/${PN}-4.0.12-boost-1.71-cxxabi-include.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ if ver_test "$REPLACING_VERSIONS" -lt 3.6; then
+ ewarn "To upgrade from a version earlier than the 3.6-series, you must"
+ ewarn "successively upgrade major releases until you have upgraded"
+ ewarn "to 3.6-series. Then upgrade to 4.0 series."
+ else
+ ewarn "Be sure to set featureCompatibilityVersion to 3.6 before upgrading."
+ fi
+ fi
+}
+
+python_check_deps() {
+ if use test; then
+ has_version "dev-python/pymongo[${PYTHON_USEDEP}]" ||
+ return 1
+ fi
+
+ has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/cheetah[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/typing[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+ default
+
+ # remove bundled libs
+ rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
+
+ # remove compass
+ rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+ # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+ # --use-system-icu fails tests
+ # --use-system-tcmalloc is strongly NOT recommended:
+ scons_opts=(
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+
+ --disable-warnings-as-errors
+ --use-system-boost
+ --use-system-pcre
+ --use-system-snappy
+ --use-system-stemmer
+ --use-system-yaml
+ --use-system-zlib
+ )
+
+ use debug && scons_opts+=( --dbg=on )
+ use kerberos && scons_opts+=( --use-sasl-client )
+ use lto && scons_opts+=( --lto=on )
+ use ssl && scons_opts+=( --ssl )
+
+ # respect mongoDB upstream's basic recommendations
+ # see bug #536688 and #526114
+ if ! use debug; then
+ filter-flags '-m*'
+ filter-flags '-O?'
+ fi
+
+ default
+}
+
+src_compile() {
+ escons "${scons_opts[@]}" core tools
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+ "${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
+}
+
+src_install() {
+ escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+ doman debian/mongo*.1
+ dodoc README docs/building.md
+
+ newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+ newinitd "${FILESDIR}/mongos.initd-r3" mongos
+ newconfd "${FILESDIR}/mongos.confd-r3" mongos
+
+ insinto /etc
+ newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+ newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ # see bug #526114
+ pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+ local x
+ for x in /var/{lib,log}/${PN}; do
+ diropts -m0750 -o mongodb -g mongodb
+ keepdir "${x}"
+ done
+}
+
+pkg_postinst() {
+ ewarn "Make sure to read the release notes and follow the upgrade process:"
+ ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+ ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/mongodb/mongodb-4.2.8.ebuild b/dev-db/mongodb/mongodb-4.2.8.ebuild
new file mode 100644
index 000000000000..b88bcf9c846f
--- /dev/null
+++ b/dev-db/mongodb/mongodb-4.2.8.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+SCONS_MIN_VERSION="2.5.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 SSPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="debug kerberos libressl lto ssl test +tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="acct-group/mongodb
+ acct-user/mongodb
+ >=app-arch/snappy-1.1.3
+ >=dev-cpp/yaml-cpp-0.6.2:=
+ >=dev-libs/boost-1.70:=[threads(+)]
+ >=dev-libs/libpcre-8.42[cxx]
+ app-arch/zstd
+ dev-libs/snowball-stemmer
+ net-libs/libpcap
+ >=sys-libs/zlib-1.2.11:=
+ kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep '
+ test? ( dev-python/pymongo[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] )
+ >=dev-util/scons-2.5.0[${PYTHON_USEDEP}]
+ dev-python/cheetah3[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ ')
+ sys-libs/ncurses:0=
+ sys-libs/readline:0=
+ debug? ( dev-util/valgrind )"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.2.0-fix-scons.patch"
+ "${FILESDIR}/${PN}-4.0.0-no-compass.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+python_check_deps() {
+ if use test; then
+ has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1
+ has_version "dev-python/requests[${PYTHON_USEDEP}]" || return 1
+ fi
+
+ has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/psutil[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ if ver_test "$REPLACING_VERSIONS" -lt 4.0; then
+ ewarn "To upgrade from a version earlier than the 4.0-series, you must"
+ ewarn "successively upgrade major releases until you have upgraded"
+ ewarn "to 4.0-series. Then upgrade to 4.2 series."
+ else
+ ewarn "Be sure to set featureCompatibilityVersion to 4.0 before upgrading."
+ fi
+ fi
+}
+
+src_prepare() {
+ default
+
+ # remove bundled libs
+ rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*,zstandard-*} || die
+
+ # remove compass
+ rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+ # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+ # --use-system-icu fails tests
+ # --use-system-tcmalloc is strongly NOT recommended:
+ scons_opts=(
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+
+ --disable-warnings-as-errors
+ --use-system-boost
+ --use-system-pcre
+ --use-system-snappy
+ --use-system-stemmer
+ --use-system-yaml
+ --use-system-zlib
+ --use-system-zstd
+ )
+
+ use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300
+ use debug && scons_opts+=( --dbg=on )
+ use kerberos && scons_opts+=( --use-sasl-client )
+ use lto && scons_opts+=( --lto=on )
+ use ssl && scons_opts+=( --ssl )
+
+ # respect mongoDB upstream's basic recommendations
+ # see bug #536688 and #526114
+ if ! use debug; then
+ filter-flags '-m*'
+ filter-flags '-O?'
+ fi
+
+ default
+}
+
+src_compile() {
+ escons "${scons_opts[@]}" core tools
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+ "${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
+}
+
+src_install() {
+ escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+ doman debian/mongo*.1
+ dodoc README docs/building.md
+
+ newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+ newinitd "${FILESDIR}/mongos.initd-r3" mongos
+ newconfd "${FILESDIR}/mongos.confd-r3" mongos
+
+ insinto /etc
+ newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+ newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ # see bug #526114
+ pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+ local x
+ for x in /var/{lib,log}/${PN}; do
+ diropts -m0750 -o mongodb -g mongodb
+ keepdir "${x}"
+ done
+}
+
+pkg_postinst() {
+ ewarn "Make sure to read the release notes and follow the upgrade process:"
+ ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+ ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/percona-xtrabackup/Manifest b/dev-db/percona-xtrabackup/Manifest
index c28ac1fe3a41..f81887d0dc01 100644
--- a/dev-db/percona-xtrabackup/Manifest
+++ b/dev-db/percona-xtrabackup/Manifest
@@ -1,4 +1,5 @@
DIST boost_1_59_0.tar.gz 83709983 BLAKE2B 8c6676fa05fa401a6ecb3b890d95aceb4421ec48dd0eab38ce8d170c618e177c82dc67a165938f6be1a01daab24ce41888f5442dbc19ad3dd41368a01a6f89e4 SHA512 05fdbe5637543defdbc630b921515425885593d16db14534ed7b9aa60925ade8fb598d50cb894aed6dae688e789047216daa1bf03fa1aeb6b531060d9dae52ae
-DIST boost_1_69_0.tar.gz 111710205 BLAKE2B 4a6d151ba10553641045a08bf4658c165862e05903b48bc700437104be468070785c67eed6dfcf1ed0923d5cf583a684b448e2a985e201bda298a3b839e62407 SHA512 89da45aca0774f68f897434882e8ec58f0673807c3a862315b90e893be90184722c098ad5822b89602b98ac3cc5a9f89c807079fd0f7e9c3f97be0d415414014
+DIST boost_1_70_0.tar.gz 116000903 BLAKE2B aefeddf5671295ae46fcfed033cef37cca1c70f88d7d3305636e0add98c277fc8170c7e3e0de58ff83a64389b5b430b81077b6852da5941aa4867845a7b08554 SHA512 3d8800d0aa864fb5484a5339ab75dee9bceca063122108e92d971f1d1295a9f09399b2dd88b117da7f0c4558b4f9fb1494eda1e3035498557bbe90e8f058668f
DIST percona-xtrabackup-2.4.15.tar.gz 57357749 BLAKE2B fcc64736230636a3a5584a300229e0507f00bcd64a3d0b8e00f834b15ec757347a55a85521dd0aea939761c3a26b1ef99466ff7e633133b8088cd290bd835444 SHA512 789b6870d3ad06861126f67190717ffb31224628d1b9631ec5f39d0a41b3c66aaf2127e3ec4b38d3e8f7858a1438a74f0e89b07b9f4248b637b2ed39143ab599
-DIST percona-xtrabackup-8.0.7.tar.gz 149143566 BLAKE2B 0a6c832f44725230023c01b50ed3d188358e7d2ba073422652a258cdf416b9d3c2a18bda4730bc5d9eb77aab17612bf93204fc2838c521e90b8571706a31d3c6 SHA512 9947b4a943f52e4d07fbde4d3b590146da19b94ce40305fc0230fc67c39e93fa4f3a30a55029cdcdb582cce7efe93831164a96f985d19d1f7b64a75aea552f47
+DIST percona-xtrabackup-2.4.20.tar.gz 59782001 BLAKE2B 25deaa3044d89d6f884734bbaee20004d792f4b0bf86bd0d456177cd2b149c29af13900b32e29f92c04cf810b34584ec2d9a74b443be27b8c7dca54b330ced99 SHA512 bac5d276bb78209eacc34ea9950dc128a636c549795b6b071597ac3c8a43fefe9db085a42827b8176647affc2fcfc6caa51462dbc0ae7a1a716ba6fdc9092478
+DIST percona-xtrabackup-8.0.13.tar.gz 272887474 BLAKE2B d0ac4c602c7c3197ca0a7c361f9658bd2da00bdac5c6dc0a4d56b92e04e4e6c86f22b70e7cf2b375f121983ea7f134edae93116c91945b2c3314a51565033ae5 SHA512 b1fdb0dea1c8b6e39b5451153f01c8ce0dcf411fd88fe8f9f686e562e0950ff9270a39574230ada928b734cc8bb4517da0f01310e75d5c9beba0e35cfeaa11ff
diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.20-fix-gcc10.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.20-fix-gcc10.patch
new file mode 100644
index 000000000000..8987082d1f9c
--- /dev/null
+++ b/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.20-fix-gcc10.patch
@@ -0,0 +1,26 @@
+diff --git a/sql/mysqld.cc b/sql/mysqld.cc
+index 3801448b..83098498 100644
+--- a/sql/mysqld.cc
++++ b/sql/mysqld.cc
+@@ -625,7 +625,7 @@ struct system_variables global_system_variables;
+ struct system_variables max_system_variables;
+ struct system_status_var global_status_var;
+
+-MY_TMPDIR mysql_tmpdir_list;
++extern MY_TMPDIR mysql_tmpdir_list;
+ MY_BITMAP temp_pool;
+
+ CHARSET_INFO *system_charset_info, *files_charset_info ;
+diff --git a/storage/innobase/xtrabackup/src/xbstream.c b/storage/innobase/xtrabackup/src/xbstream.c
+index 611f8c04..f0c57588 100644
+--- a/storage/innobase/xtrabackup/src/xbstream.c
++++ b/storage/innobase/xtrabackup/src/xbstream.c
+@@ -55,7 +55,7 @@ datasink_t datasink_xbstream;
+ datasink_t datasink_compress;
+ datasink_t datasink_tmpfile;
+ datasink_t datasink_encrypt;
+-datasink_t datasink_buffer;
++extern datasink_t datasink_buffer;
+
+ static run_mode_t opt_mode;
+ static char * opt_directory = NULL;
diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.13-remove-rpm.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.13-remove-rpm.patch
new file mode 100644
index 000000000000..759598637a82
--- /dev/null
+++ b/dev-db/percona-xtrabackup/files/percona-xtrabackup-8.0.13-remove-rpm.patch
@@ -0,0 +1,32 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1b9865e2..e3c82cdd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -181,27 +181,6 @@ ENDIF()
+ OPTION(FORCE_UNSUPPORTED_COMPILER "Disable compiler version checks" OFF)
+ MARK_AS_ADVANCED(WITHOUT_SERVER FORCE_UNSUPPORTED_COMPILER)
+
+-# Use 'uname -r' and 'rpm -qf /' to figure out host system.
+-# For Docker images we cannot trust uname, so use rpm instead.
+-IF(UNIX)
+- FIND_PROGRAM(MY_UNAME uname /bin /usr/bin /usr/local/bin /sbin)
+- IF(MY_UNAME)
+- EXECUTE_PROCESS(COMMAND ${MY_UNAME} -s
+- OUTPUT_VARIABLE MY_HOST_SYSTEM_NAME
+- OUTPUT_STRIP_TRAILING_WHITESPACE
+- RESULT_VARIABLE MY_UNAME_RESULT
+- )
+- ENDIF()
+- FIND_PROGRAM(MY_RPM rpm /bin /usr/bin)
+- IF(MY_RPM)
+- EXECUTE_PROCESS(COMMAND ${MY_RPM} -qf /
+- OUTPUT_VARIABLE MY_HOST_FILESYSTEM_NAME
+- OUTPUT_STRIP_TRAILING_WHITESPACE
+- RESULT_VARIABLE MY_RPM_RESULT
+- )
+- ENDIF()
+-ENDIF()
+-
+ IF(CMAKE_HOST_UNIX AND NOT FORCE_UNSUPPORTED_COMPILER
+ AND NOT CMAKE_C_COMPILER AND NOT CMAKE_CXX_COMPILER)
+ # Cannot INCLUDE(CMakeDetermineSystem) prior to PROJECT initialization below.
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.20.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.20.ebuild
new file mode 100644
index 000000000000..f15f04741bfc
--- /dev/null
+++ b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.20.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Hot backup utility for MySQL based servers"
+HOMEPAGE="https://www.percona.com/software/mysql-database/percona-xtrabackup"
+SRC_URI="https://www.percona.com/downloads/Percona-XtraBackup-2.4/Percona-XtraBackup-${PV}/source/tarball/${P}.tar.gz
+ mirror://sourceforge/boost/boost_1_59_0.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ app-arch/lz4:0=
+ app-editors/vim-core
+ dev-libs/libaio
+ dev-libs/libedit
+ dev-libs/libev
+ dev-libs/libevent:0=
+ dev-libs/libgcrypt:0=
+ dev-libs/libgpg-error
+ dev-python/sphinx
+ net-misc/curl
+ sys-libs/zlib:="
+
+RDEPEND="
+ ${DEPEND}
+ !dev-db/percona-xtrabackup-bin
+ dev-perl/DBD-mysql"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.4.6-remove-boost-version-check.patch
+ "${FILESDIR}"/${PN}-2.4.20-fix-gcc10.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_CONFIG=xtrabackup_release
+ -DBUILD_SHARED_LIBS=OFF
+ -DWITH_BOOST="${WORKDIR}/boost_1_59_0"
+ -DWITH_EDITLINE=system
+ -DWITH_LIBEVENT=system
+ -DWITH_LZ4=system
+ -DWITH_SSL=bundled # uses yassl, which isn't packaged
+ -DWITH_ZLIB=system
+ -DWITH_PIC=ON
+ )
+
+ local CMAKE_BUILD_TYPE="Release"
+ cmake_src_configure
+}
+
+src_install() {
+ local p="${BUILD_DIR}/storage/innobase/xtrabackup"
+
+ dobin "${p}"/src/{xbcloud/xbcloud,xbcrypt,xbstream,xtrabackup}
+ dosym xtrabackup /usr/bin/innobackupex
+
+ einstalldocs
+ doman "${p}"/doc/source/build/man/*
+}
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.7.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.13.ebuild
similarity index 87%
rename from dev-db/percona-xtrabackup/percona-xtrabackup-8.0.7.ebuild
rename to dev-db/percona-xtrabackup/percona-xtrabackup-8.0.13.ebuild
index 3776aa32ffd3..edbb5af4c04a 100644
--- a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.7.ebuild
+++ b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.13.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"
@@ -7,7 +7,7 @@ CMAKE_MAKEFILE_GENERATOR="emake"
inherit cmake flag-o-matic
-BOOST_VER="1_69_0"
+BOOST_VER="1_70_0"
MY_PV="$(ver_rs 2 '-')"
DESCRIPTION="Hot backup utility for MySQL based servers"
@@ -42,6 +42,10 @@ RDEPEND="
!dev-db/percona-xtrabackup-bin
dev-perl/DBD-mysql"
+PATCHES=(
+ "${FILESDIR}/${PN}-8.0.13-remove-rpm.patch"
+)
+
src_configure() {
local mycmakeargs=(
-DBUILD_CONFIG=xtrabackup_release
@@ -59,5 +63,7 @@ src_install() {
dobin "${p}"/xbcloud_osenv
dobin "${BUILD_DIR}"/runtime_output_directory/{xbcloud,xbcrypt,xbstream,xtrabackup}
+ dolib.so "${BUILD_DIR}"/plugin_output_directory/{keyring_file.so,keyring_vault.so}
+
doman "${p}"/doc/source/build/man/*
}
diff --git a/dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild b/dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild
index eed8e84a6d17..af6ff97a5db8 100644
--- a/dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild
+++ b/dev-db/sqlitestudio/sqlitestudio-3.2.1-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
PLOCALES="de es fr it pl pt_BR ro_RO ru sk zh_CN"
-
inherit desktop l10n qmake-utils xdg
DESCRIPTION="Powerful cross-platform SQLite database manager"
@@ -15,9 +14,9 @@ KEYWORDS="~amd64 ~x86"
LICENSE="GPL-3"
SLOT="0"
IUSE="cli cups tcl test"
-RESTRICT="!test? ( test )"
REQUIRED_USE="test? ( cli )"
+RESTRICT="!test? ( test )"
RDEPEND="
dev-db/sqlite:3
@@ -37,6 +36,10 @@ DEPEND="${RDEPEND}
dev-qt/qtconcurrent:5
test? ( dev-qt/qttest:5 )
"
+BDEPEND="
+ dev-qt/linguist-tools:5
+"
+
PATCHES=( "${FILESDIR}"/${P}-libressl.patch )
S="${WORKDIR}"
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 1fb6c59ba6ca..9b847eab57fb 100644
Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ
diff --git a/dev-embedded/zmac/zmac-1.3-r1.ebuild b/dev-embedded/zmac/zmac-1.3-r1.ebuild
index bb78b19a8768..ce0ee4a4f916 100644
--- a/dev-embedded/zmac/zmac-1.3-r1.ebuild
+++ b/dev-embedded/zmac/zmac-1.3-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
@@ -6,8 +6,8 @@ EAPI=7
inherit toolchain-funcs
DESCRIPTION="Z80 macro cross-assembler"
-HOMEPAGE="http://www.tim-mann.org/trs80resources.html"
-SRC_URI="http://www.tim-mann.org/trs80/${PN}${PV//.}.zip"
+HOMEPAGE="https://www.tim-mann.org/trs80resources.html"
+SRC_URI="https://www.tim-mann.org/trs80/${PN}${PV//.}.zip"
LICENSE="public-domain"
SLOT="0"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 11ba690b9b47..39f437a22ebb 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/duktape/Manifest b/dev-lang/duktape/Manifest
index 0e73eafa9fca..7099c24cff5b 100644
--- a/dev-lang/duktape/Manifest
+++ b/dev-lang/duktape/Manifest
@@ -1,2 +1,2 @@
-DIST duktape-2.2.1.tar.xz 966496 BLAKE2B fc458035fea9b3c5f26ac538b0ddb19ca0f93b8d20e3d51b3428e72a18797c15e6aeb6111ff05818e54529f199084b2803582d54b19040d16e58462405889449 SHA512 af78a1680cb796e1eedca78264a9c3344cd8149b3c54dc5109f21a0c65ee24097f6f18eceefbf336cda9eda7cb347a0484badfe765f3b93e1c1620b099999f25
DIST duktape-2.4.0.tar.xz 1027744 BLAKE2B 9fb74b0586a5ccf5ef80d69955ab0ddb94428d463e300a558b5ab6e279d2c416b794434466604caa80581883df85f889694af1dd3ea0aaa4a3d53babb855f3ef SHA512 be6b7c73ae7c3419e8ced375fcff9680946e780b71d30e3be4e4e3b4b3a2710aa8f86530081c64958507a11fc215cacc5409c7d3a1d30b757838a00c748fa281
+DIST duktape-2.5.0.tar.xz 1031188 BLAKE2B 15d9190e9c723bacf8249ea31bf528793ca06e86d2697648192fee50b4ba2f7cf091e1392ac14a7a5c35b05a3ff5f200e0318cc8a4b873ad26f0c97683a2cb72 SHA512 230e298a91cb48407d7c2a4b7c85cf9d53151d550e2fd7ba6cb8f9115682abce295fb78a3c3cd22b4812ce86944dd6d28c2b25c3845668a17232e3a08ea63837
diff --git a/dev-lang/duktape/duktape-2.2.1.ebuild b/dev-lang/duktape/duktape-2.5.0-r1.ebuild
similarity index 78%
rename from dev-lang/duktape/duktape-2.2.1.ebuild
rename to dev-lang/duktape/duktape-2.5.0-r1.ebuild
index 311fee357a5a..096bdf229105 100644
--- a/dev-lang/duktape/duktape-2.2.1.ebuild
+++ b/dev-lang/duktape/duktape-2.5.0-r1.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
+
+inherit toolchain-funcs
DESCRIPTION="Embeddable Javascript engine"
HOMEPAGE="https://duktape.org"
@@ -9,7 +11,7 @@ SRC_URI="https://duktape.org/${P}.tar.xz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
IUSE=""
DEPEND=""
@@ -19,7 +21,7 @@ src_prepare() {
eapply_user
# Set install path
- sed -i "s#INSTALL_PREFIX=/usr/local#INSTALL_PREFIX=${D::-1}/usr#" \
+ sed -i "s#INSTALL_PREFIX = /usr/local#INSTALL_PREFIX = ${D%/}/usr#" \
Makefile.sharedlibrary || die "failed to set install path"
# Edit pkgconfig
@@ -33,6 +35,10 @@ src_prepare() {
mv Makefile.sharedlibrary Makefile || die "failed to rename makefile"
}
+src_compile() {
+ emake CC="$(tc-getCC)"
+}
+
src_install() {
dodir /usr/$(get_libdir)
dodir /usr/include
diff --git a/dev-lang/ispc/Manifest b/dev-lang/ispc/Manifest
index 20f32b7fe6cb..09380cb968c4 100644
--- a/dev-lang/ispc/Manifest
+++ b/dev-lang/ispc/Manifest
@@ -1 +1,2 @@
+DIST ispc-1.13.0.tar.gz 19202295 BLAKE2B 5fae81429acbda0d65d33e56609d05fb8b5a7db6dd0af5ff779d1e8954f6a98d1fcb0f7ecf0c1b9813630026557c21c2a70bfc87ed75959a8bd24e06fcd2e351 SHA512 d23c127beb9bb17e1ad2509f9ad51dd660c473458b939a6b64ca7f6319b3c2f25318ea2ceac00e4100a059f3f67fb97b6973f18e3432c82ff9691f2a08d15d5d
DIST ispc-1.9.2.tar.gz 19283765 BLAKE2B 500cca8a69a78ad9a21dc1e39dcb3ed01730e78deed61e4871ce5a9761829c80ac7b1b987d8e8a48c34b67ac96692b2c5026cfb5059a32c71e228c73550584eb SHA512 77a66086cbfd6c4dc855b3137a270cc40f24829255639aee5f562b0831c21938157667b20cfadc660cd67525c47e2e73b46692f7a11bf0c834dc60b69d40d76d
diff --git a/dev-lang/ispc/files/ispc-1.13.0-cmake-gentoo-release.patch b/dev-lang/ispc/files/ispc-1.13.0-cmake-gentoo-release.patch
new file mode 100644
index 000000000000..b89e61504008
--- /dev/null
+++ b/dev-lang/ispc/files/ispc-1.13.0-cmake-gentoo-release.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 13e66268..27ff8364 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -137,7 +137,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin )
+
+ if(CMAKE_BUILD_TYPE)
+ # Validate build type
+- set(CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo")
++ set(CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo;Gentoo")
+
+ string(FIND "${CONFIGURATION_TYPES}" "${CMAKE_BUILD_TYPE}" MATCHED_CONFIG)
+ if (${MATCHED_CONFIG} EQUAL -1)
diff --git a/dev-lang/ispc/files/ispc-1.13.0-llvm-10.patch b/dev-lang/ispc/files/ispc-1.13.0-llvm-10.patch
new file mode 100644
index 000000000000..6911a76d9e18
--- /dev/null
+++ b/dev-lang/ispc/files/ispc-1.13.0-llvm-10.patch
@@ -0,0 +1,106 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 13e66268..27ff8364 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -218,7 +218,7 @@ if (WASM_ENABLED)
+ list(APPEND ISPC_TARGETS wasm-i32x4)
+ endif()
+
+-set(CLANG_LIBRARY_LIST clangFrontend clangDriver clangSerialization clangParse clangSema clangAnalysis clangAST clangBasic clangEdit clangLex)
++set(CLANG_LIBRARY_LIST clang clang-cpp)
+ set(LLVM_COMPONENTS engine ipo bitreader bitwriter instrumentation linker option)
+
+ if (${LLVM_VERSION_NUMBER} VERSION_GREATER_EQUAL "10.0.0")
+@@ -402,11 +402,8 @@ if (ISPC_USE_ASAN)
+ endif()
+
+ # Link against Clang libraries
+-foreach(clangLib ${CLANG_LIBRARY_LIST})
+- find_library(${clangLib}Path NAMES ${clangLib} HINTS ${LLVM_LIBRARY_DIRS})
+- list(APPEND CLANG_LIBRARY_FULL_PATH_LIST ${${clangLib}Path})
+-endforeach()
+-target_link_libraries(${PROJECT_NAME} ${CLANG_LIBRARY_FULL_PATH_LIST})
++find_package(Clang REQUIRED)
++target_link_libraries(${PROJECT_NAME} ${CLANG_LIBRARY_LIST})
+
+ # Link against LLVM libraries
+ target_link_libraries(${PROJECT_NAME} ${LLVM_LIBRARY_LIST})
+diff --git a/src/llvmutil.cpp b/src/llvmutil.cpp
+index 06fab989..57a7130f 100644
+--- a/src/llvmutil.cpp
++++ b/src/llvmutil.cpp
+@@ -42,6 +42,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
-
- junghans@gentoo.org
- Christoph Junghans (proxy)
-
proxy-maint@gentoo.org
Proxy Maintainers
diff --git a/net-misc/openvswitch/files/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch b/net-misc/openvswitch/files/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch
deleted file mode 100644
index 1f77ab54b0ad..000000000000
--- a/net-misc/openvswitch/files/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From b89f391203c4420eb454cb321e799a64de809f52 Mon Sep 17 00:00:00 2001
-From: Yousong Zhou
-Date: Fri, 3 May 2019 15:03:24 +0000
-Subject: [PATCH 5/5] datapath: conntrack: fix include for
- IP6_DEFRAG_CONNTRACK_IN
-
-The enum definition is now inside include/net/ipv6_frag.h since upstream commit
-70b095c ("ipv6: remove dependency of nf_defrag_ipv6 on ipv6 module") which was
-backported to stable trees (4.9, 4.14, 4.19) only these days.
-
-The error message
-
- CC [M] /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.o
- /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c: In function 'handle_fragments':
- /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:8: error: variable 'user' has initializer but incomplete type
- enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone;
- ^~~~~~~~~~~~~~~~
- /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:32: error: 'IP6_DEFRAG_CONNTRACK_IN' undeclared (first use in this function); did you mean 'IP_DEFRAG_CONNTRACK_IN'?
- enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone;
- ^~~~~~~~~~~~~~~~~~~~~~~
- IP_DEFRAG_CONNTRACK_IN
- /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:32: note: each undeclared identifier is reported only once for each function it appears in
- /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:25: error: storage size of 'user' isn't known
- enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone;
- ^~~~
- /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:25: warning: unused variable 'user' [-Wunused-variable]
- scripts/Makefile.build:326: recipe for target '/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.o' failed
-
-Reference: https://github.com/openwrt/packages/issues/8548#issuecomment-488871090
-Signed-off-by: Yousong Zhou
----
- datapath/conntrack.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/datapath/conntrack.c b/datapath/conntrack.c
-index a7dc9e0c3..69bda5a9c 100644
---- a/datapath/conntrack.c
-+++ b/datapath/conntrack.c
-@@ -31,6 +31,7 @@
- #include
- #include
- #include
-+#include
-
- #ifdef CONFIG_NF_NAT_NEEDED
- #include
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index ebc7ae13ace0..02885337b775 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -1,2 +1,3 @@
DIST putty-0.73.tar.gz 2459115 BLAKE2B 594ad1ebd66bdb27ac8d297525c0c5d846f8a15f7c9c5e750da8a57b08367b5c94a9d1439d6a42862e7e7b7a7d7c0dea285e9197fa45651d9eb12757b57e82a7 SHA512 4ada4b8c6d68be44afede2676bc661fedfd1ea0b574b8232ad9aaa6f3a48baa9f4f0ded2955b3f2677a14db85a508f53c965cb00fcd7538a1ed9844031f0c5e5
+DIST putty-0.74.tar.gz 2476513 BLAKE2B 3b3acd8ce1deb5d1659dd2ce77c9e7316e2c639c5f0e962c472b109afc1a54854d30123c4732f9b9e8ba28d9324508894faaa78f3b484c99c0063d1ea2f499b7 SHA512 0da86849ea764cd88643bd2c1984ac7211ae72dd7c41232307b1960a29ca9518044b022d87c60272d6db71a3357026862a112bedb90ee732b41494fca3acde9b
DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71
diff --git a/net-misc/putty/putty-0.74.ebuild b/net-misc/putty/putty-0.74.ebuild
new file mode 100644
index 000000000000..07d0f147a344
--- /dev/null
+++ b/net-misc/putty/putty-0.74.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools desktop toolchain-funcs xdg-utils
+
+DESCRIPTION="A Free Telnet/SSH Client"
+HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc +gtk gtk2 ipv6 gssapi"
+SRC_URI="
+ https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2
+ https://the.earth.li/~sgtatham/${PN}/${PV}/${P}.tar.gz
+"
+
+RDEPEND="
+ !net-misc/pssh
+ gtk? (
+ dev-libs/glib:2
+ x11-libs/gdk-pixbuf
+ x11-libs/libX11
+ x11-libs/pango
+ gtk2? ( x11-libs/gtk+:2 )
+ !gtk2? ( x11-libs/gtk+:3[X] )
+ )
+ gssapi? ( virtual/krb5 )
+"
+DEPEND="
+ ${RDEPEND}
+ dev-lang/perl
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ default
+
+ sed -i \
+ -e 's|-Werror||g' \
+ configure.ac || die
+
+ eautoreconf
+}
+
+src_configure() {
+ cd "${S}"/unix || die
+ econf \
+ $(use_with gssapi) \
+ $(usex gtk --with-gtk= --without-gtk $(usex gtk2 2 3 ) )
+}
+
+src_compile() {
+ emake -C "${S}"/doc
+ emake -C "${S}"/unix AR=$(tc-getAR) $(usex ipv6 '' COMPAT=-DNO_IPV6)
+}
+
+src_install() {
+ dodoc doc/puttydoc.txt
+
+ if use doc; then
+ docinto html
+ dodoc doc/*.html
+ fi
+
+ cd "${S}"/unix || die
+ default
+
+ if use gtk ; then
+ for i in 16 22 24 32 48 64 128 256; do
+ newicon -s ${i} "${WORKDIR}"/${PN}-icons/${PN}-${i}.png ${PN}.png
+ done
+
+ # install desktop file provided by Gustav Schaffter in #49577
+ make_desktop_entry ${PN} PuTTY ${PN} Network
+ fi
+}
+
+pkg_postinst() {
+ use gtk && xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ use gtk && xdg_icon_cache_update
+}
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.8.4.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.8.4.ebuild
index dacf415d4e71..34216e4b9ac2 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.8.4.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.8.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/ra
LICENSE="GPL-2 MPL-1.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE=""
RESTRICT="test"
diff --git a/net-misc/rdate/Manifest b/net-misc/rdate/Manifest
index 44b2fcc82bae..412fbf81d9c1 100644
--- a/net-misc/rdate/Manifest
+++ b/net-misc/rdate/Manifest
@@ -1 +1,2 @@
+DIST rdate-1.10.tar.gz 19159 BLAKE2B 71c858b5eb10b07a2974fcb463a91808fc59582dfce786dc936370b3fc2122bfe72cc32cb3635a1e77ec663fd44712852ab85d8ba46702d1e222ec63ad46f3bb SHA512 7a7647102b5663218fff6c1364b83250a199a0169adf40db87a49709aa24c3b1fae5acf01732d5432fcb2883d29a24b2ae38cf5333ff75075e5d7a6fd90e7146
DIST rdate-1.4.tar.gz 11500 BLAKE2B 705324648f30685135d3ba3936b05a82bc6a027d3d1c407950cb7631858f6d9dba34f97f065482988caf4a68addc3ba122fe475cfd1684c526f5224113657ac3 SHA512 ea9d62af3aa58fb7bb2bdce257cc23758f103ac056e4d6a8b44be0e41c44dff49e78bdb03789e3bf2957e74997c2f1c0376fdc659b4f39d89e43ef139a51f996
diff --git a/net-misc/rdate/rdate-1.10.ebuild b/net-misc/rdate/rdate-1.10.ebuild
new file mode 100644
index 000000000000..56ca14a4561b
--- /dev/null
+++ b/net-misc/rdate/rdate-1.10.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P=openrdate
+
+DESCRIPTION="Use TCP or UDP to retrieve the current time of another machine"
+HOMEPAGE="https://github.com/resurrecting-open-source-projects/openrdate"
+SRC_URI="https://github.com/resurrecting-open-source-projects/${MY_P}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-4"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-libs/libbsd"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/${MY_P}-${PV}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_install() {
+ default
+ newinitd "${FILESDIR}"/rdate-initd-1.4-r3 rdate
+ newconfd "${FILESDIR}"/rdate-confd rdate
+}
diff --git a/net-misc/remmina/files/remmina-1.4.5-with-examples.patch b/net-misc/remmina/files/remmina-1.4.5-with-examples.patch
new file mode 100644
index 000000000000..10ac35744d7f
--- /dev/null
+++ b/net-misc/remmina/files/remmina-1.4.5-with-examples.patch
@@ -0,0 +1,37 @@
+--- /dev/null
++++ b/net-misc/remmina/files/remmina-1.4.6-with-examples.patch
+@@ -0,0 +1,34 @@
++diff -Nupr a/plugins/tool_hello_world/plugin.c b/plugins/tool_hello_world/plugin.c
++--- a/plugins/tool_hello_world/plugin.c 2020-06-08 22:07:44.000000000 +0200
+++++ b/plugins/tool_hello_world/plugin.c 2020-06-10 20:18:48.495507560 +0200
++@@ -42,17 +42,19 @@
++ #include
++
++ static RemminaPluginService *remmina_plugin_service = NULL;
+++#define remmina_plugin_debug(fmt, ...) remmina_plugin_service->_remmina_debug(__func__, fmt __VA_OPT__(,) __VA_ARGS__)
+++
++
++ static void remmina_plugin_tool_init(RemminaProtocolWidget *gp)
++ {
++ TRACE_CALL(__func__);
++- remmina_plugin_service->_debug("[%s] Plugin init", PLUGIN_NAME);
+++ remmina_plugin_debug("[%s] Plugin init", PLUGIN_NAME);
++ }
++
++ static gboolean remmina_plugin_tool_open_connection(RemminaProtocolWidget *gp)
++ {
++ TRACE_CALL(__func__);
++- remmina_plugin_service->_debug("[%s] Plugin open connection", PLUGIN_NAME);
+++ remmina_plugin_debug("[%s] Plugin open connection", PLUGIN_NAME);
++
++ GtkDialog *dialog;
++ dialog = GTK_DIALOG(gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL | GTK_DIALOG_USE_HEADER_BAR,
++@@ -65,7 +67,7 @@ static gboolean remmina_plugin_tool_open
++ static gboolean remmina_plugin_tool_close_connection(RemminaProtocolWidget *gp)
++ {
++ TRACE_CALL(__func__);
++- remmina_plugin_service->_debug("[%s] Plugin close connection", PLUGIN_NAME);
+++ remmina_plugin_debug("[%s] Plugin close connection", PLUGIN_NAME);
++ remmina_plugin_service->protocol_plugin_emit_signal(gp, "disconnect");
++ return FALSE;
++ }
diff --git a/net-misc/remmina/remmina-1.4.5.ebuild b/net-misc/remmina/remmina-1.4.5.ebuild
index f247dfe1992a..04a7d55f4b70 100644
--- a/net-misc/remmina/remmina-1.4.5.ebuild
+++ b/net-misc/remmina/remmina-1.4.5.ebuild
@@ -58,6 +58,7 @@ DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
S="${WORKDIR}/${MY_P}"
src_prepare() {
+ eapply "${FILESDIR}"/${P}-with-examples.patch
cmake_src_prepare
xdg_src_prepare
}
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index bda6efcb431e..cd247855aa07 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -1,3 +1,3 @@
-DIST rsync-3.1.3.tar.gz 905908 BLAKE2B 616a1f3239327a28b881310f5f249c90b8bcdb05091279cd62f9cb4e35a8428c7cdd9b89e711ba124601a738f0deb9bfbebafba7fd88b72866476138a9f8c75a SHA512 8385f4c0ea37e7a1da3cf45794154f5bc4d1c49bc625ba3b5f85adaf3eafe6d71c15bdcb1410bde731e5d4c19aff3331606637462fa27a68dc3e13192dd78f99
DIST rsync-3.2.0.tar.gz 1048009 BLAKE2B 641be077a88958a09b083fd9658ae7f40ce3565bee1959f0c7ef82c61356a070e7ca1e0ceeb96b7a1b31a5ee031a84733ade3965aaa93f9e18795df16a6c1460 SHA512 01a109e1e061bb7f4734b694e1f15a83efdd8fcb1995e5eeea75a8d245eead4412c09b37b0fcdfe522e368673768e4fa5ed8891ccf3ae42f60293e4e68d506c2
DIST rsync-3.2.1.tar.gz 1051665 BLAKE2B de1ee047b9a378cd16fceb188d0a2e14e78751c8295263e183888b464ced9263be600bbb04b7793d48e7aa1fd2ab0709d717234f346cc6a5a028c3daddcb019e SHA512 80d639ab56a993de8016115fe15794bb9aa7012e4a8300402954760566a821c230af9dcdb19143d70663497a830289212ce329fb0c4fd5c4b6f392d850e5fd8c
+DIST rsync-3.2.2pre1.tar.gz 1055617 BLAKE2B 4035c77f9e86a84bfd173903f5f6d4a954344b4eb1d1b267c1a86a5a74bd61d190f9fbcffa0b838278b89b29ebce47244eafc05d012753ae1b3a5d77682de3f2 SHA512 a8f1ddc62307615f9173cbe45ee4b2f6eab93833441ab76582b0226f44b58bb18f2e2cb0ce03092c8b4c153b4ae616ccf2c15411003360857611383b05aca25e
diff --git a/net-misc/rsync/rsync-3.1.3.ebuild b/net-misc/rsync/rsync-3.1.3.ebuild
deleted file mode 100644
index b5837aee1603..000000000000
--- a/net-misc/rsync/rsync-3.1.3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic prefix systemd
-
-DESCRIPTION="File transfer program to keep remote files into sync"
-HOMEPAGE="https://rsync.samba.org/"
-SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
-[[ "${PV}" = *_pre* ]] && SRC_URI="https://rsync.samba.org/ftp/rsync/src-previews/${P/_/}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-[[ ${PV} = *_pre* ]] || \
-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="acl examples iconv ipv6 static stunnel xattr"
-
-LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
- xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
- >=dev-libs/popt-1.5[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- iconv? ( virtual/libiconv )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-
-S="${WORKDIR}/${P/_/}"
-
-src_configure() {
- use static && append-ldflags -static
- local myeconfargs=(
- --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
- --without-included-popt
- $(use_enable acl acl-support)
- $(use_enable iconv)
- $(use_enable ipv6)
- $(use_enable xattr xattr-support)
- )
- econf "${myeconfargs[@]}"
- touch proto.h-tstamp #421625
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
- newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
-
- dodoc NEWS OLDNEWS README TODO tech_report.tex
-
- insinto /etc
- newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/rsyncd.logrotate rsyncd
-
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
-
- # Install stunnel helpers
- if use stunnel ; then
- emake DESTDIR="${D}" install-ssl-client
- emake DESTDIR="${D}" install-ssl-daemon
- fi
-
- # Install the useful contrib scripts
- if use examples ; then
- exeinto /usr/share/rsync
- doexe support/*
- rm -f "${ED%/}"/usr/share/rsync/{Makefile*,*.c}
- fi
-
- eprefixify "${ED%/}"/etc/{,xinetd.d}/rsyncd*
-
- systemd_dounit "${FILESDIR}/rsyncd.service"
-}
-
-pkg_postinst() {
- if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
- "${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
- ewarn "You have disabled chroot support in your rsyncd.conf. This"
- ewarn "is a security risk which you should fix. Please check your"
- ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
- fi
- if use stunnel ; then
- einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
- einfo
- einfo "You maybe have to update the certificates configured in"
- einfo "${EROOT}/etc/stunnel/rsync.conf"
- fi
-}
diff --git a/net-misc/rsync/rsync-3.2.0-r1.ebuild b/net-misc/rsync/rsync-3.2.0-r1.ebuild
index 334b1e917382..d74e0fca5bbc 100644
--- a/net-misc/rsync/rsync-3.2.0-r1.ebuild
+++ b/net-misc/rsync/rsync-3.2.0-r1.ebuild
@@ -16,7 +16,7 @@ else
SRC_DIR="src-previews"
else
SRC_DIR="src"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~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 ~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"
fi
SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"
S="${WORKDIR}/${P/_/}"
diff --git a/net-misc/rsync/rsync-3.2.1.ebuild b/net-misc/rsync/rsync-3.2.1.ebuild
index 7bd6a4121f2d..c02794fd0b9b 100644
--- a/net-misc/rsync/rsync-3.2.1.ebuild
+++ b/net-misc/rsync/rsync-3.2.1.ebuild
@@ -16,7 +16,7 @@ else
SRC_DIR="src-previews"
else
SRC_DIR="src"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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 ~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"
fi
SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"
S="${WORKDIR}/${P/_/}"
diff --git a/net-misc/rsync/rsync-3.2.2_pre1.ebuild b/net-misc/rsync/rsync-3.2.2_pre1.ebuild
new file mode 100644
index 000000000000..c02794fd0b9b
--- /dev/null
+++ b/net-misc/rsync/rsync-3.2.2_pre1.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic prefix systemd
+
+DESCRIPTION="File transfer program to keep remote files into sync"
+HOMEPAGE="https://rsync.samba.org/"
+if [[ "${PV}" == *9999 ]] ; then
+ PYTHON_COMPAT=( python3_{6,7,8} )
+ inherit autotools git-r3 python-any-r1
+ EGIT_REPO_URI="https://github.com/WayneD/rsync.git"
+else
+ if [[ "${PV}" == *_pre* ]] ; then
+ SRC_DIR="src-previews"
+ else
+ SRC_DIR="src"
+ 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"
+ fi
+ SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"
+ S="${WORKDIR}/${P/_/}"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE_CPU_FLAGS_X86=" sse2"
+IUSE="acl examples iconv ipv6 libressl lz4 ssl static stunnel system-zlib xattr xxhash zstd"
+IUSE+=" ${IUSE_CPU_FLAGS_X86// / cpu_flags_x86_}"
+
+LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
+ lz4? ( app-arch/lz4[static-libs(+)] )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+ libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+ )
+ system-zlib? ( sys-libs/zlib[static-libs(+)] )
+ xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
+ xxhash? ( dev-libs/xxhash[static-libs(+)] )
+ zstd? ( app-arch/zstd[static-libs(+)] )
+ >=dev-libs/popt-1.5[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+ iconv? ( virtual/libiconv )"
+DEPEND="${RDEPEND}
+ static? ( ${LIB_DEPEND} )"
+
+if [[ "${PV}" == *9999 ]] ; then
+ BDEPEND="${PYTHON_DEPS}
+ $(python_gen_any_dep '
+ dev-python/commonmark[${PYTHON_USEDEP}]
+ ')"
+fi
+
+# Only required for live ebuild
+python_check_deps() {
+ has_version "dev-python/commonmark[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+ default
+ if [[ "${PV}" == *9999 ]] ; then
+ eaclocal -I m4
+ eautoconf -o configure.sh
+ eautoheader && touch config.h.in
+ fi
+}
+
+src_configure() {
+ use static && append-ldflags -static
+ local myeconfargs=(
+ --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
+ --without-included-popt
+ $(use_enable acl acl-support)
+ $(use_enable iconv)
+ $(use_enable ipv6)
+ $(use_enable lz4)
+ $(use_enable ssl openssl)
+ $(use_with !system-zlib included-zlib)
+ $(use_enable xattr xattr-support)
+ $(use_enable xxhash)
+ $(use_enable zstd)
+ )
+
+ if [[ "${ARCH}" == "amd64" ]] ; then
+ # SIMD is only available for x86_64 right now (#728868)
+ myeconfargs+=( $(use_enable cpu_flags_x86_sse2 simd) )
+ else
+ myeconfargs+=( --disable-simd )
+ fi
+
+ econf "${myeconfargs[@]}"
+ [[ "${PV}" == *9999 ]] || touch proto.h-tstamp #421625
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
+ newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
+
+ dodoc NEWS.md README.md TODO tech_report.tex
+
+ insinto /etc
+ newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/rsyncd.logrotate rsyncd
+
+ insinto /etc/xinetd.d
+ newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
+
+ # Install stunnel helpers
+ if use stunnel ; then
+ emake DESTDIR="${D}" install-ssl-daemon
+ fi
+
+ # Install the useful contrib scripts
+ if use examples ; then
+ exeinto /usr/share/rsync
+ doexe support/*
+ rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
+ fi
+
+ eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
+
+ systemd_dounit "${FILESDIR}/rsyncd.service"
+}
+
+pkg_postinst() {
+ if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
+ "${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
+ ewarn "You have disabled chroot support in your rsyncd.conf. This"
+ ewarn "is a security risk which you should fix. Please check your"
+ ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
+ fi
+ if use stunnel ; then
+ einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
+ einfo
+ einfo "You maybe have to update the certificates configured in"
+ einfo "${EROOT}/etc/stunnel/rsync.conf"
+ fi
+ if use system-zlib ; then
+ ewarn "Using system-zlib is incompatible with =rsync-3.1.1 built with bundled zlib,"
+ ewarn "and the --compress option, add --new-compress (-zz)."
+ ewarn
+ ewarn "For syncing the portage tree, add:"
+ ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf"
+ fi
+}
diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index 42b53f66ab74..9d833b7346d1 100644
Binary files a/net-nntp/Manifest.gz and b/net-nntp/Manifest.gz differ
diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index 92e4571130df..74a6e591077d 100644
--- a/net-nntp/sabnzbd/Manifest
+++ b/net-nntp/sabnzbd/Manifest
@@ -1 +1,2 @@
DIST SABnzbd-2.3.9-src.tar.gz 2738773 BLAKE2B fbb765732c0aab6a47a4d4827d21b1b029c6d40c1c6c335692964210dc4c389e94cd1cdca45bfb3fb8c2fa9adc84f33df0fe3d23a0e4f9143a095eec042a5cf0 SHA512 10a39db9ad7f6d441166da97194b7a281aacd1900f7687bca72c6c2b555114bc2bbdaaba51cb9fcec57aa1b782f20609a07528484ad911ffd9f9eabb54a324fa
+DIST SABnzbd-3.0.0RC1-src.tar.gz 2762495 BLAKE2B 5b623e8cc141426459f3d62c3652df41559946a0fd691163428e7b10dfda5518e9701b1a250ed0a7cda6bfda705869ee6a038184ba8f86cfea70d9ea2d09d613 SHA512 00205b1cb4a74455fc48b0ce0579e6849d08b1cedb28ab01f53da8f37bd75268ced201c9e0510ffdf7b51eee6e666e73bec01f537e1ecbdb7f3f6115422b3074
diff --git a/net-nntp/sabnzbd/files/sabnzbd-r1.ini b/net-nntp/sabnzbd/files/sabnzbd-r1.ini
new file mode 100644
index 000000000000..5ccd7e19ca37
--- /dev/null
+++ b/net-nntp/sabnzbd/files/sabnzbd-r1.ini
@@ -0,0 +1,12 @@
+__version__ = 19
+[misc]
+log_dir = /var/log/sabnzbd
+admin_dir = /var/lib/sabnzbd/admin
+cache_dir = /var/lib/sabnzbd/cache
+complete_dir = /var/lib/sabnzbd/complete
+download_dir = /var/lib/sabnzbd/download
+dirscan_dir = /var/lib/sabnzbd/dirscan
+nzb_backup_dir = /var/lib/sabnzbd/backup
+auto_browser = 0
+host = ::
+port = 8080
diff --git a/net-nntp/sabnzbd/files/sabnzbd-r1.initd b/net-nntp/sabnzbd/files/sabnzbd-r1.initd
new file mode 100644
index 000000000000..eff3352a90b4
--- /dev/null
+++ b/net-nntp/sabnzbd/files/sabnzbd-r1.initd
@@ -0,0 +1,71 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+PIDFILE="/run/sabnzbd/sabnzbd.pid"
+
+depend() {
+ use dns
+}
+
+get_var() {
+ grep -P -o -m 1 "(?<=^${1} = ).*" "${SABNZBD_CONFIGFILE}" || echo 0
+}
+
+start() {
+ ebegin "Starting SABnzbd"
+
+ checkpath -q -d -o ${SABNZBD_USER}:${SABNZBD_GROUP} -m 0770 "$(dirname "${PIDFILE}")"
+
+ start-stop-daemon \
+ --quiet \
+ --start \
+ --user ${SABNZBD_USER} \
+ --group ${SABNZBD_GROUP} \
+ --pidfile "${PIDFILE}" \
+ --wait 1000 \
+ --exec /usr/share/sabnzbd/SABnzbd.py \
+ -- \
+ --config-file "${SABNZBD_CONFIGFILE}" \
+ --logging "${SABNZBD_LOGGING}" \
+ --daemon \
+ --pidfile "${PIDFILE}"
+
+ eend $?
+}
+
+stop() {
+ local protocol="http"
+ local host="$(get_var "host")"
+ local port="$(get_var "port")"
+
+ if [ $(get_var "enable_https") -eq 1 ]; then
+ protocol="https"
+ port="$(get_var "https_port")"
+ fi
+
+ case "${host}" in
+ *:*) host="[${host}]" ;;
+ esac
+
+ local url="${protocol}://${host}:${port}/sabnzbd/api?mode=shutdown"
+
+ if [ $(get_var "disable_api_key") -eq 0 ]; then
+ url="${url}&apikey=$(get_var "api_key")"
+ fi
+
+ local signals="TERM/1/KILL/1"
+
+ ebegin "Stopping SABnzbd"
+
+ if [ "$(wget -o /dev/null -t 1 -O - -T 10 "${url}")" = "ok" ]; then
+ signals="NULL/5/${signals}"
+ fi
+
+ start-stop-daemon \
+ --stop \
+ --pidfile "${PIDFILE}" \
+ --retry "${signals}"
+
+ eend $?
+}
diff --git a/net-nntp/sabnzbd/sabnzbd-3.0.0_rc1.ebuild b/net-nntp/sabnzbd/sabnzbd-3.0.0_rc1.ebuild
new file mode 100644
index 000000000000..afa365fd3af6
--- /dev/null
+++ b/net-nntp/sabnzbd/sabnzbd-3.0.0_rc1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+# Require python-2 with sqlite USE flag
+PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_REQ_USE="sqlite"
+
+inherit python-single-r1 systemd
+
+MY_PV="${PV/_rc/RC}"
+MY_PV="${MY_PV//_pre*}"
+
+MY_P="${PN/sab/SAB}-${MY_PV}"
+
+DESCRIPTION="Binary newsgrabber with web-interface"
+HOMEPAGE="https://sabnzbd.org/"
+SRC_URI="https://github.com/sabnzbd/sabnzbd/releases/download/${MY_PV}/${MY_P}-src.tar.gz"
+
+# Sabnzbd is GPL-2 but bundles software with the following licenses.
+LICENSE="GPL-2 BSD LGPL-2 MIT BSD-1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+7za +rar unzip"
+
+# Sabnzbd is installed to /usr/share/ as upstream makes it clear they should not
+# be in python's sitedir. See: https://sabnzbd.org/wiki/advanced/unix-packaging
+
+COMMON_DEPS="
+ acct-user/sabnzbd
+ acct-group/sabnzbd
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+ dev-python/cheetah3[${PYTHON_MULTI_USEDEP}]
+ dev-python/cherrypy[${PYTHON_MULTI_USEDEP}]
+ dev-python/configobj[${PYTHON_MULTI_USEDEP}]
+ dev-python/cryptography[${PYTHON_MULTI_USEDEP}]
+ dev-python/feedparser[${PYTHON_MULTI_USEDEP}]
+ dev-python/notify2[${PYTHON_MULTI_USEDEP}]
+ dev-python/portend[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/sabyenc-3.3.1[${PYTHON_MULTI_USEDEP}]
+ ')
+"
+
+DEPEND="${COMMON_DEPS}"
+
+RDEPEND="
+ ${COMMON_DEPS}
+ >=app-arch/par2cmdline-0.4
+ net-misc/wget
+ 7za? ( app-arch/p7zip )
+ rar? ( || ( app-arch/unrar app-arch/rar ) )
+ unzip? ( >=app-arch/unzip-5.5.2 )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ MY_HOMEDIR="/var/lib/${PN}"
+ python-single-r1_pkg_setup
+}
+
+src_install() {
+ local d
+
+ for d in email icons interfaces locale po sabnzbd scripts tools; do
+ insinto "/usr/share/${PN}/${d}"
+ doins -r ${d}/*
+ done
+
+ exeinto "/usr/share/${PN}"
+ doexe SABnzbd.py
+
+ python_fix_shebang "${ED}/usr/share/${PN}"
+ python_optimize "${ED}/usr/share/${PN}"
+
+ newinitd "${FILESDIR}/${PN}-r1.initd" "${PN}"
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+
+ diropts -o "${PN}" -g "${PN}"
+ dodir "/etc/${PN}"
+ keepdir "/var/log/${PN}"
+
+ insinto "/etc/${PN}"
+ insopts -m 0600 -o "${PN}" -g "${PN}"
+ newins "${FILESDIR}"/${PN}-r1.ini ${PN}.ini
+
+ dodoc {ABOUT,ISSUES}.txt README.mkd licenses/*
+
+ systemd_newunit "${FILESDIR}"/sabnzbd_at.service 'sabnzbd@.service'
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ # This is a new installation
+ einfo "Default directory: ${MY_HOMEDIR}"
+ einfo
+ einfo "To add a user to the sabnzbd group so it can edit SABnzbd+ files, run:"
+ einfo
+ einfo " usermod -a -G sabnzbd "
+ einfo
+ einfo "By default, SABnzbd will listen on TCP port 8080."
+ else
+ local v
+ for v in ${REPLACING_VERSIONS}; do
+ if ver_test "${v}" -lt 3; then
+ ewarn
+ ewarn "Due to changes in this release, the queue will be converted when ${PN}"
+ ewarn "is started for the first time. Job order, settings and data will be"
+ ewarn "preserved, but all jobs will be unpaused and URLs that did not finish"
+ ewarn "fetching before the upgrade will be lost!"
+ ewarn
+ break
+ fi
+ done
+ fi
+}
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 2aac4986d5c2..546e4fd4defe 100644
Binary files a/net-print/Manifest.gz and b/net-print/Manifest.gz differ
diff --git a/net-print/brlaser/brlaser-6.ebuild b/net-print/brlaser/brlaser-6.ebuild
index 1faee9ad08d7..df8a0251088f 100644
--- a/net-print/brlaser/brlaser-6.ebuild
+++ b/net-print/brlaser/brlaser-6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pdewacht/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
DEPEND="net-print/cups"
RDEPEND="
diff --git a/net-print/cnijfilter2/cnijfilter2-5.50.ebuild b/net-print/cnijfilter2/cnijfilter2-5.50.ebuild
index b8e27bb386da..99edb10a5be2 100644
--- a/net-print/cnijfilter2/cnijfilter2-5.50.ebuild
+++ b/net-print/cnijfilter2/cnijfilter2-5.50.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit autotools
@@ -21,13 +21,25 @@ DEPEND="virtual/libusb:1
net-print/cups"
RDEPEND="${DEPEND}"
+QA_FLAGS_IGNORED=(
+ "/usr/lib.*/libcnbpnet30.so.1.0.0"
+ "/usr/lib.*/libcnbpcnclapicom2.so.5.0.0"
+ "/usr/lib.*/libcnnet2.so.1.2.4"
+ "/usr/lib.*/libcnbpnet20.so.1.0.0"
+ /usr/bin/cnijlgmon3
+)
+
S="${WORKDIR}"/${MY_P}
-PATCHES=( "${FILESDIR}"/${PN}-5.20-gentoo.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.20-gentoo.patch
+ "${FILESDIR}"/${P}-gentoo.patch
+ "${FILESDIR}"/${PN}-5.80-cflags.patch
+)
src_prepare() {
default
- DIRS="cmdtocanonij2 cnijbe2 lgmon3 rastertocanonij tocanonij tocnpwg"
+ DIRS="cmdtocanonij2 cmdtocanonij3 cnijbe2 lgmon3 rastertocanonij tocanonij tocnpwg"
LIBDIR=com/libs_bin$(usex amd64 64 32)
for d in ${DIRS}; do
mv "${d}"/configure.{in,ac} || die
@@ -40,6 +52,7 @@ src_prepare() {
echo "SUBDIRS= ${DIRS}" >> Makefile.am
sed -i \
-e "/^CFLAGS/d" \
+ cnijbe2/src/Makefile.am \
*/configure.ac || die
eautoreconf
cd ${LIBDIR}
@@ -53,7 +66,7 @@ src_prepare() {
}
src_configure() {
- LDFLAGS="-L"${S}"/${LIBDIR}" econf --enable-progpath="${EPREFIX}/usr/bin"
+ LDFLAGS="-L${S}/${LIBDIR} ${LDFLAGS}" econf --enable-progpath="${EPREFIX}/usr/bin"
}
src_install() {
diff --git a/net-print/cnijfilter2/files/cnijfilter2-5.50-gentoo.patch b/net-print/cnijfilter2/files/cnijfilter2-5.50-gentoo.patch
new file mode 100644
index 000000000000..a7322bbce860
--- /dev/null
+++ b/net-print/cnijfilter2/files/cnijfilter2-5.50-gentoo.patch
@@ -0,0 +1,8 @@
+--- a/cmdtocanonij3/filter/Makefile.am.old 2018-01-14 18:14:20.645473030 +0100
++++ b/cmdtocanonij3/filter/Makefile.am 2018-01-14 18:14:36.078219959 +0100
+@@ -1,4 +1,4 @@
+-filterdir=$(libdir)/cups/filter
++filterdir=$(libexecdir)/cups/filter
+
+ filter_PROGRAMS= cmdtocanonij3
+
diff --git a/net-print/cups-filters/cups-filters-9999.ebuild b/net-print/cups-filters/cups-filters-9999.ebuild
index 7abb7a7fcbf0..651c4dab158f 100644
--- a/net-print/cups-filters/cups-filters-9999.ebuild
+++ b/net-print/cups-filters/cups-filters-9999.ebuild
@@ -31,11 +31,9 @@ RDEPEND="
media-libs/freetype:2
media-libs/lcms:2
>=net-print/cups-1.7.3
- !<=net-print/cups-1.5.9999
sys-devel/bc
sys-libs/zlib
dbus? ( sys-apps/dbus )
- foomatic? ( !net-print/foomatic-filters )
jpeg? ( virtual/jpeg:0 )
ldap? ( net-nds/openldap )
pdf? ( app-text/mupdf )
diff --git a/net-print/cups-filters/metadata.xml b/net-print/cups-filters/metadata.xml
index 8c940c947b64..4a6a4ace1fb1 100644
--- a/net-print/cups-filters/metadata.xml
+++ b/net-print/cups-filters/metadata.xml
@@ -9,9 +9,6 @@
Build the included foomatic-rip printer driver. Strongly recommended.
-
- Let cups-browsed automatically set up IPP network printers by default.
-
Enable PCLm support
diff --git a/net-print/cups/files/cups-2.2.0-dont-compress-manpages.patch b/net-print/cups/files/cups-2.2.0-dont-compress-manpages.patch
deleted file mode 100644
index 7b61b39f16ad..000000000000
--- a/net-print/cups/files/cups-2.2.0-dont-compress-manpages.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- cups-2.2.0/config-scripts/cups-manpages.m4
-+++ cups-2.2.0/config-scripts/cups-manpages.m4
-@@ -53,10 +53,10 @@
- ;;
- Linux* | GNU* | Darwin*)
- # Linux, GNU Hurd, and macOS
-- MAN1EXT=1.gz
-- MAN5EXT=5.gz
-- MAN7EXT=7.gz
-- MAN8EXT=8.gz
-+ MAN1EXT=1
-+ MAN5EXT=5
-+ MAN7EXT=7
-+ MAN8EXT=8
- MAN8DIR=8
- ;;
- *)
diff --git a/net-print/cups/metadata.xml b/net-print/cups/metadata.xml
index eefca8bd29d2..487c6ec99fc7 100644
--- a/net-print/cups/metadata.xml
+++ b/net-print/cups/metadata.xml
@@ -9,12 +9,6 @@
Do not install lp... binaries so cups and lprng can coexist.
-
- Add support for the Python interpeter in the web server CGIs.
-
-
- Add support for the Java interpeter in the web server CGIs.
-
cpe:/a:apple:cups
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 9171230e5e5f..1d97e71dacd9 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/libreswan/files/libreswan-3.32-nss-compat.patch b/net-vpn/libreswan/files/libreswan-3.32-nss-compat.patch
new file mode 100644
index 000000000000..09f71a9f907c
--- /dev/null
+++ b/net-vpn/libreswan/files/libreswan-3.32-nss-compat.patch
@@ -0,0 +1,23 @@
+Add compatibility setting for NSS
+
+https://github.com/libreswan/libreswan/commit/65a497959a0e1ca615341109eaad5e75723839d6
+
+We patch a different file because a later commit moved the setting to this file.
+
+diff --git a/lib/libswan/ike_alg_encrypt_nss_gcm_ops.c b/lib/libswan/ike_alg_encrypt_nss_gcm_ops.c
+index 93a027089a..571913cc1e 100644
+--- a/lib/libswan/ike_alg_encrypt_nss_gcm_ops.c
++++ b/lib/libswan/ike_alg_encrypt_nss_gcm_ops.c
+@@ -16,6 +16,12 @@
+ #include
+ #include
+
++/*
++ * Special advise from Bob Relyea - needs to go before any nss include
++ *
++ */
++#define NSS_PKCS11_2_0_COMPAT 1
++
+ #include "lswlog.h"
+ #include "lswnss.h"
+ #include "prmem.h"
diff --git a/net-vpn/libreswan/libreswan-3.32-r1.ebuild b/net-vpn/libreswan/libreswan-3.32-r1.ebuild
new file mode 100644
index 000000000000..594a265b4671
--- /dev/null
+++ b/net-vpn/libreswan/libreswan-3.32-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 systemd toolchain-funcs
+
+SRC_URI="https://download.libreswan.org/${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+DESCRIPTION="IPsec implementation for Linux, fork of Openswan"
+HOMEPAGE="https://libreswan.org/"
+
+LICENSE="GPL-2 BSD-4 RSA DES"
+SLOT="0"
+IUSE="caps curl dnssec ldap pam seccomp selinux systemd test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ dev-libs/gmp:0=
+ dev-libs/libevent:0=
+ dev-libs/nspr
+ >=dev-libs/nss-3.42
+ >=sys-kernel/linux-headers-4.19
+ caps? ( sys-libs/libcap-ng )
+ curl? ( net-misc/curl )
+ dnssec? ( >=net-dns/unbound-1.9.1-r1:= net-libs/ldns )
+ ldap? ( net-nds/openldap )
+ pam? ( sys-libs/pam )
+ seccomp? ( sys-libs/libseccomp )
+ selinux? ( sys-libs/libselinux )
+ systemd? ( sys-apps/systemd:0= )
+"
+BDEPEND="
+ app-text/docbook-xml-dtd:4.1.2
+ app-text/xmlto
+ dev-libs/nss
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig
+ test? ( dev-python/setproctitle )
+"
+RDEPEND="${DEPEND}
+ dev-libs/nss[utils(+)]
+ sys-apps/iproute2
+ !net-vpn/strongswan
+ selinux? ( sec-policy/selinux-ipsec )
+"
+
+usetf() {
+ usex "$1" true false
+}
+
+PATCHES=( "${FILESDIR}/${PN}-3.30-ip-path.patch" "${FILESDIR}/${P}-nss-compat.patch" )
+
+src_prepare() {
+ sed -i -e 's:/sbin/runscript:/sbin/openrc-run:' initsystems/openrc/ipsec.init.in || die
+ sed -i -e '/^install/ s/postcheck//' -e '/^doinstall/ s/oldinitdcheck//' initsystems/systemd/Makefile || die
+ default
+}
+
+src_configure() {
+ tc-export AR CC
+ export INC_USRLOCAL=/usr
+ export INC_MANDIR=share/man
+ export FINALEXAMPLECONFDIR=/usr/share/doc/${PF}
+ export FINALDOCDIR=/usr/share/doc/${PF}/html
+ export INITSYSTEM=openrc
+ export INC_RCDIRS=
+ export INC_RCDEFAULT=/etc/init.d
+ export USERCOMPILE=
+ export USERLINK=
+ export USE_DNSSEC=$(usetf dnssec)
+ export USE_LABELED_IPSEC=$(usetf selinux)
+ export USE_LIBCAP_NG=$(usetf caps)
+ export USE_LIBCURL=$(usetf curl)
+ export USE_LINUX_AUDIT=$(usetf selinux)
+ export USE_LDAP=$(usetf ldap)
+ export USE_SECCOMP=$(usetf seccomp)
+ export USE_SYSTEMD_WATCHDOG=$(usetf systemd)
+ export SD_WATCHDOGSEC=$(usex systemd 200 0)
+ export USE_XAUTHPAM=$(usetf pam)
+ export DEBUG_CFLAGS=
+ export OPTIMIZE_CFLAGS=
+ export WERROR_CFLAGS=
+}
+
+src_compile() {
+ emake all
+ emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" all
+}
+
+src_test() {
+ : # integration tests only that require set of kvms to be set up
+}
+
+src_install() {
+ default
+ emake -C initsystems INITSYSTEM=systemd SYSTEMUNITDIR="$(systemd_get_systemunitdir)" SYSTEMTMPFILESDIR="/usr/lib/tmpfiles.d" DESTDIR="${D}" install
+
+ echo "include /etc/ipsec.d/*.secrets" > "${D}"/etc/ipsec.secrets
+ fperms 0600 /etc/ipsec.secrets
+
+ dodoc -r docs
+
+ find "${D}" -type d -empty -delete || die
+}
+
+pkg_postinst() {
+ local IPSEC_CONFDIR=${ROOT}/etc/ipsec.d
+ if [[ ! -f ${IPSEC_CONFDIR}/cert8.db && ! -f ${IPSEC_CONFDIR}/cert9.db ]] ; then
+ ebegin "Setting up NSS database in ${IPSEC_CONFDIR} with empty password"
+ certutil -N -d "${IPSEC_CONFDIR}" --empty-password
+ eend $?
+ einfo "To set a password: certutil -W -d sql:${IPSEC_CONFDIR}"
+ fi
+}
diff --git a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.12.ebuild b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.12.ebuild
index 513bba285b9a..936a26c2ca5c 100644
--- a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.12.ebuild
+++ b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.12.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
IUSE="gtk test"
RESTRICT="!test? ( test )"
diff --git a/net-vpn/wireguard-tools/wireguard-tools-1.0.20200319.ebuild b/net-vpn/wireguard-tools/wireguard-tools-1.0.20200319.ebuild
index 032aeb86f93d..07fee8d91012 100644
--- a/net-vpn/wireguard-tools/wireguard-tools-1.0.20200319.ebuild
+++ b/net-vpn/wireguard-tools/wireguard-tools-1.0.20200319.ebuild
@@ -11,7 +11,6 @@ HOMEPAGE="https://www.wireguard.com/"
if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://git.zx2c4.com/wireguard-tools"
- KEYWORDS=""
else
SRC_URI="https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${PV}.tar.xz"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
diff --git a/net-vpn/wireguard-tools/wireguard-tools-1.0.20200513.ebuild b/net-vpn/wireguard-tools/wireguard-tools-1.0.20200513.ebuild
index 7a83df0991b6..03f8ee952c5c 100644
--- a/net-vpn/wireguard-tools/wireguard-tools-1.0.20200513.ebuild
+++ b/net-vpn/wireguard-tools/wireguard-tools-1.0.20200513.ebuild
@@ -11,10 +11,9 @@ HOMEPAGE="https://www.wireguard.com/"
if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://git.zx2c4.com/wireguard-tools"
- KEYWORDS=""
else
SRC_URI="https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${PV}.tar.xz"
- 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"
fi
LICENSE="GPL-2"
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 0894190bb6f1..5eac1fcd9e29 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/blueman/blueman-2.1.3.ebuild b/net-wireless/blueman/blueman-2.1.3.ebuild
index 8144b23c4cc1..28a0cb5e101c 100644
--- a/net-wireless/blueman/blueman-2.1.3.ebuild
+++ b/net-wireless/blueman/blueman-2.1.3.ebuild
@@ -12,11 +12,11 @@ HOMEPAGE="https://github.com/blueman-project/blueman"
if [[ ${PV} == "9999" ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"
- KEYWORDS=""
+ KEYWORDS="~arm ~arm64"
else
SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV/_/.}/${P/_/.}.tar.xz"
S=${WORKDIR}/${P/_/.}
- KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
fi
# icons are GPL-2
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index e295a9404542..63befd38b346 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/arm/armv7a/package.mask b/profiles/arch/arm/armv7a/package.mask
index ea16b137362b..0f744267ab9b 100644
--- a/profiles/arch/arm/armv7a/package.mask
+++ b/profiles/arch/arm/armv7a/package.mask
@@ -1,6 +1,10 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# Sam James (2020-06-24)
+# Valgrind works on ARMv7
+-dev-util/valgrind
+
# James Le Cuirot (2016-01-09)
# This is built for armv6 so unmask against the wider arm mask.
-dev-java/oracle-jdk-bin
diff --git a/profiles/arch/arm/armv7a/use.mask b/profiles/arch/arm/armv7a/use.mask
index 25991f5fd76d..764a6e7881c5 100644
--- a/profiles/arch/arm/armv7a/use.mask
+++ b/profiles/arch/arm/armv7a/use.mask
@@ -14,3 +14,7 @@
-cpu_flags_arm_vfpv3
-cpu_flags_arm_vfpv4
-cpu_flags_arm_vfp-d32
+
+# Sam James (2020-06-24)
+# Valgrind works on ARMv7
+-valgrind
diff --git a/profiles/arch/arm/package.mask b/profiles/arch/arm/package.mask
index 25107630e0b6..55b8688549df 100644
--- a/profiles/arch/arm/package.mask
+++ b/profiles/arch/arm/package.mask
@@ -1,6 +1,11 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Sam James (2020-06-24)
+# Valgrind lacks support for < ARMv7
+# https://valgrind.org/info/platforms.html
+dev-util/valgrind
+
# Bernardo Meurer (2019-09-28)
# Requires app-crypt/tpm2-tss which is pending ~arm vide
# https://bugs.gentoo.org/695758
diff --git a/profiles/arch/arm/use.mask b/profiles/arch/arm/use.mask
index feb40f29c013..e19b0240a5fd 100644
--- a/profiles/arch/arm/use.mask
+++ b/profiles/arch/arm/use.mask
@@ -8,6 +8,11 @@
-cpu_flags_arm_iwmmxt
-cpu_flags_arm_iwmmxt2
+# Sam James (2020-06-24)
+# Valgrind lacks support for < ARMv7
+# https://valgrind.org/info/platforms.html
+valgrind
+
# Matt Turner (2020-02-02)
# Neither dev-python/pymongo nor dev-libs/mongo-c-driver are keyworded
mongodb
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 531fa62f4ad7..ac3815a08433 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,15 @@
# This file is only for generic masks. For arch-specific masks (i.e.
# mask everywhere, unmask on arch/*) use arch/base.
+# Mart Raudsepp (2020-06-28)
+# media-video/pipewire:0/0.3 is ongoing work, 0.2 on mutter-3.34
+# is not worth trying to get to work.
+x11-wm/mutter screencast
+
+# Stephan Hartmann (2020-06-28)
+# Mostly intended for development and not for general use.
+>=www-client/chromium-84 headless
+
# Mikle Kolyada (2020-06-21)
# Multiple runtime crashes, see bug #724672
media-gfx/inkscape jemalloc
diff --git a/profiles/desc/sane_backends.desc b/profiles/desc/sane_backends.desc
index 0e6808352690..e78df8a25857 100644
--- a/profiles/desc/sane_backends.desc
+++ b/profiles/desc/sane_backends.desc
@@ -29,6 +29,7 @@ dmc - SANE_BACKENDS setting for building the dmc backend
epjitsu - SANE_BACKENDS setting for building the epjitsu backend
epson - SANE_BACKENDS setting for building the epson backend
epson2 - SANE_BACKENDS setting for building the epson2 backend
+escl - SANE_BACKENDS setting for building the escl backend
fujitsu - SANE_BACKENDS setting for building the fujitsu backend
genesys - SANE_BACKENDS setting for building the genesys backend
gt68xx - SANE_BACKENDS setting for building the gt68xx backend
@@ -69,6 +70,7 @@ plustek_pp - SANE_BACKENDS setting for building the plustek_pp backend
pnm - SANE_BACKENDS settings for building the pnm test backend, considered a possible security risk
qcam - SANE_BACKENDS setting for building the qcam backend
ricoh - SANE_BACKENDS setting for building the ricoh backend
+ricoh2 - SANE_BACKENDS setting for building the ricoh2 backend
rts8891 - SANE_BACKENDS setting for building the rts8891 backend
s9036 - SANE_BACKENDS setting for building the s9036 backend
sceptre - SANE_BACKENDS setting for building the sceptre backend
diff --git a/profiles/package.deprecated b/profiles/package.deprecated
index 5aa919465f83..91187be21389 100644
--- a/profiles/package.deprecated
+++ b/profiles/package.deprecated
@@ -17,14 +17,6 @@
#--- END OF EXAMPLES ---
-# Sergei Trofimovich (2020-06-26)
-# Deprecated.
-# - optional python:2.7 dependency should be dropped if no reverse
-# dependencies are using it.
-# - mandatory python:2.7 depepndency will require package porting
-# or package removal if no reverse dependencies are using it.
-dev-lang/python:2.7
-
# Andreas Sturmlechner (2020-05-17)
# Abandoned upstream, countless bugs. Removal tracked in bug #659616
sys-power/pm-utils
diff --git a/profiles/package.mask b/profiles/package.mask
index bcef65cd4cea..030cd11c8f2d 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,30 @@
#--- END OF EXAMPLES ---
+# Andreas Sturmlechner (2020-06-28)
+# WIP PipeWire ebuild, breaks all current revdeps in ebuild repository
+# sys-apps/xdg-desktop-portal-1.7.2 depends on masked PipeWire >=0.3
+~media-video/pipewire-0.3.6
+~sys-apps/xdg-desktop-portal-1.7.2
+
+# Mikle Kolyada (2020-06-28)
+# Obsolete package.
+# Does not build.
+# Dead upstream and only gentoo ships it.
+# Removal in 30 days.
+app-misc/scope
+
+# Mart Raudsepp (2020-06-27)
+# Disappeared upstream and download locations. Potential replacements:
+# media-sound/quimup, xfce-extra/xfce4-mpc-plugin, media-sound/xfmpc
+# Bug 729822. Removal in 30 days.
+media-sound/guimup
+
+# Mikle Kolyada (2020-06-26)
+# Has been a part of dev-texlive/texlive-pictures
+# for a long time. Removal in 30 days.
+dev-tex/circuit_macros
+
# Andreas Sturmlechner (2020-06-25)
# Stuck on Python 2, no maintainer; rgain3 fork available for sb. taking over
# at https://github.com/chaudum/rgain - masked for removal in 30 days.
@@ -251,12 +275,6 @@ dev-ruby/did_you_mean:2.4
# Removal in 30 days.
app-text/xindy
-# Aaron Bauman (2020-06-07)
-# py2 only. dead upstream. m-n. rdep.
-# Masked for removal in 15 days
-net-misc/charm
-sys-cluster/polysh
-
# Jonas Stein (2020-06-07)
# Last rite unusable package.
# Removal after 2020-08-01
@@ -417,30 +435,6 @@ games-util/pogo-manager-bin
net-p2p/bisq
sci-mathematics/geogebra
-# Michał Górny (2020-03-29)
-# Unmaintained, seriously outdated, vulnerable. Multiple bugs reported.
-# Stuck on Python 3.6.
-# Removal in 30 days. Bug #711702.
-app-metrics/buildbot-prometheus
- (2020-03-28)
-# In Linux ~4.18, IPX (Internetwork Packet eXchange) protocol and
-# NCPFS (NetWare Core Protocol Filesystem) support was removed due
-# to lack of maintenance. Due to both being dead from a technology
-# standpoint and lack of any upstream activity, mask the below
-# packages and remove in 75 days.
-# Bug #681820
-net-fs/ncpfs
-net-misc/ipx-utils
-
# Georgy Yakovlev (2020-03-27)
# Vulnerable old version of icedtea-web #711392
# new version is not packaged yet
@@ -511,12 +505,6 @@ www-plugins/passff
=app-editors/emacs-27.0.50_pre*
~app-editors/emacs-27.0.90
-# David Seifert (2019-12-08)
-# Unmaintained, build hangs, tons of other build failures, missing
-# dependencies. Bug #663794, #666916, #666922, #667062, #678068,
-# #681678, #684420, #694488. Removal in 30 days.
-dev-db/clickhouse
-
# Lars Wendler (2019-11-14)
# Breaks archives containing relative paths
# when being called with --no-absolute-filenames
diff --git a/profiles/updates/1Q-2018 b/profiles/updates/1Q-2018
index 7e9994d3a46c..1919388c157a 100644
--- a/profiles/updates/1Q-2018
+++ b/profiles/updates/1Q-2018
@@ -13,7 +13,6 @@ move app-admin/nginx-vts-exporter app-metrics/nginx-vts-exporter
move app-admin/prom2json app-metrics/prom2json
move net-analyzer/prometheus app-metrics/prometheus
move net-analyzer/prometheus-alertmanager app-metrics/alertmanager
-move dev-util/buildbot-prometheus app-metrics/buildbot-prometheus
move net-analyzer/prometheus-node_exporter app-metrics/node_exporter
move net-analyzer/prometheus-blackbox_exporter app-metrics/blackbox_exporter
move net-analyzer/prometheus-snmp_exporter app-metrics/snmp_exporter
diff --git a/profiles/updates/2Q-2020 b/profiles/updates/2Q-2020
index dec182293987..41f95c93bbee 100644
--- a/profiles/updates/2Q-2020
+++ b/profiles/updates/2Q-2020
@@ -9,3 +9,4 @@ move mail-filter/pypolicyd-spf mail-filter/spf-engine
move dev-python/mimeparse dev-python/python-mimeparse
move app-misc/cargo-license dev-util/cargo-license
move dev-python/argon2_cffi dev-python/argon2-cffi
+move gnome-extra/nautilus-actions gnome-extra/filemanager-actions
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index c9cef46fc818..0febb3f16a45 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1327,12 +1327,6 @@ dev-cpp/libjson-rpc-cpp:redis-server - Build support for Redis server using dev-
dev-cpp/libjson-rpc-cpp:stubgen - Build header stub code generator (needed for development and when pregenerated headers are not bundled)
dev-cpp/sourcetrail:examples - Install example projects.
dev-db/aerospike-server-community:tools - Install extra tools
-dev-db/clickhouse:client - Build CLI client.
-dev-db/clickhouse:kafka - Enables support for kafka consumer.
-dev-db/clickhouse:mongodb - Enabled support for MongoDB-based dictionaries
-dev-db/clickhouse:server - Build server.
-dev-db/clickhouse:tools - Build various tools, like benchmark, copier, etc.
-dev-db/clickhouse:zookeeper - Enable support for clustering (based on Zookeeper).
dev-db/etcd:server - Installs etcd daemon
dev-db/firebird:server - Install the server components of Firebird, not just the client
dev-db/firebird:xinetd - Install ClassicServer
@@ -3422,6 +3416,9 @@ gnome-extra/evolution-data-server:berkdb - sys-libs/db support needed to migrate
gnome-extra/evolution-data-server:gnome-online-accounts - Enable net-libs/gnome-online-accounts based Google authentication support
gnome-extra/evolution-data-server:oauth - Enable internal OAuth2 authentication support for Google and Outlook.com. If gnome-online-accounts is enabled and used, this is not necessary, but both can be supported at the same time with different setup at runtime
gnome-extra/evolution-data-server:weather - Enable optional weather calendar support
+gnome-extra/filemanager-actions:caja - Install the mate-base/caja extension
+gnome-extra/filemanager-actions:nautilus - Install the gnome-base/nautilus extension
+gnome-extra/filemanager-actions:nemo - Install the gnome-extra/nemo extension
gnome-extra/gnome-color-manager:packagekit - Enable support for the distro-neutral package manager GUI PackageKit
gnome-extra/gnome-commander:chm - Enable metadata support for Microsoft Compiled HTML Help files
gnome-extra/gnome-commander:gsf - Add metadata support for OLE, OLE2 and ODF
@@ -4799,6 +4796,7 @@ media-sound/split2flac:flake - Add support for Flake, alternative FLAC encoder
media-sound/split2flac:mac - Add support for Monkey's Audio files
media-sound/split2flac:replaygain - Support for Replay Gain metadata, for relative volume adjustment
media-sound/spotify:pax_kernel - Triggers a paxmarking of the main Spotify binary
+media-sound/spotify:pulseaudio - Constrols the dependency on pulseaudio or apulse
media-sound/spotify:systray - Pulls in dependencies needed for systray support on some desktop environments
media-sound/supercollider:emacs - Enable the SCEL user interface
media-sound/supercollider:gedit - Enable the SCED user interface
@@ -5105,6 +5103,10 @@ media-video/orion:mpv - Use the media-video/mpv player (upstream default)
media-video/orion:qtav - Use the media-libs/qtav player
media-video/orion:qtmedia - Use the dev-qt/qtmultimedia
media-video/peek:keybinder - Enable support for global hotkeys using dev-libs/keybinder
+media-video/pipewire:alsa - Install PipeWire alsa device for playback and record
+media-video/pipewire:jack - Enable SPA JACK plugin and emulation to be able to run JACK applications on top of PipeWire
+media-video/pipewire:pulseaudio - Enable emulation to be able to run PulseAudio applications on top of PipeWire
+media-video/pipewire:vulkan - Enable vulkan spa plugin integration
media-video/qmplay2:audiofilters - Build with AudioFilters module
media-video/qmplay2:avdevice - Build FFmpeg module with libavdevice suport
media-video/qmplay2:avresample - Use libavresample instead of libswresample
@@ -5595,6 +5597,7 @@ net-dns/pdns:remote - Use a generic socket or pipe as a backend (via JSON RPC re
net-dns/pdns:sodium - Use dev-libs/libsodium for cryptography
net-dns/pdns:tinydns - Use a TinyDNS CDB database as backend.
net-dns/pdns:tools - Build optional tools (dnsscan, dnsscope, etc..).
+net-dns/pdns-recursor:dnstap - Enable support for dnstap
net-dns/pdns-recursor:protobuf - Enable support for dev-libs/protobuf.
net-dns/pdns-recursor:sodium - Use dev-libs/libsodium for cryptography
net-dns/pdnsd:isdn - Linux-only: check status of ippp interfaces with ISDN-specific system calls.
@@ -6830,11 +6833,8 @@ net-p2p/xmr-stak-rx:cuda - Enable NVIDIA CUDA toolkit support
net-p2p/xmr-stak-rx:hwloc - Enable CPU affinity support via hwloc
net-p2p/xmr-stak-rx:opencl - Enable OpenCL support
net-p2p/xmr-stak-rx:webserver - Enable internal webserver
-net-print/cups:java - Add support for the Java interpeter in the web server CGIs.
net-print/cups:lprng-compat - Do not install lp... binaries so cups and lprng can coexist.
-net-print/cups:python - Add support for the Python interpeter in the web server CGIs.
net-print/cups-filters:foomatic - Build the included foomatic-rip printer driver. Strongly recommended.
-net-print/cups-filters:ipp_autosetup - Let cups-browsed automatically set up IPP network printers by default.
net-print/cups-filters:pclm - Enable PCLm support
net-print/dymo-cups-drivers:usb_modeswitch - Include usb_modeswitch for some hardware (bug #601242)
net-print/fax4cups:efax - Install net-misc/efax backend
@@ -8706,6 +8706,8 @@ www-apps/wordpress:themes - Installs themes (including default theme)
www-client/chromium:closure-compile - Enable closure type-checking for Chrome's web technology-based UI. Requires Java.
www-client/chromium:component-build - Split build into more shared libraries to speed up linking. Mostly intended for debugging and development, NOT RECOMMENDED for general use.
www-client/chromium:hangouts - Enable support for Google Hangouts features such as screen sharing
+www-client/chromium:headless - Build Ozone only with headless backend, NOT RECOMMENDED for general use.
+www-client/chromium:ozone - Enable Ozone platform abstraction layer with X11 backend.
www-client/chromium:pic - Disable optimized assembly code that is not PIC friendly
www-client/chromium:proprietary-codecs - Enable proprietary codecs like H.264, MP3
www-client/chromium:suid - Build the SUID sandbox, which is only needed on CONFIG_USER_NS=n kernels
@@ -8713,6 +8715,7 @@ www-client/chromium:system-ffmpeg - Use system ffmpeg instead of the bundled one
www-client/chromium:system-icu - Use system icu instead of the bundled one
www-client/chromium:system-libvpx - Use system libvpx instead of the bundled one
www-client/chromium:tcmalloc - Use bundled tcmalloc instead of system malloc
+www-client/chromium:wayland - Enable Wayland backend for Ozone.
www-client/chromium:widevine - Unsupported closed-source DRM capability (required by Netflix VOD)
www-client/dillo:xembed - Enable X11 XEmbed support
www-client/elinks:bittorrent - Enable support for the BitTorrent protocol
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 75f38829bccf..4693b6c7ca80 100644
Binary files a/sci-astronomy/Manifest.gz and b/sci-astronomy/Manifest.gz differ
diff --git a/sci-astronomy/wcslib/wcslib-5.16.ebuild b/sci-astronomy/wcslib/wcslib-5.16.ebuild
index 31cf8e9f6f92..a82492d1c42e 100644
--- a/sci-astronomy/wcslib/wcslib-5.16.ebuild
+++ b/sci-astronomy/wcslib/wcslib-5.16.ebuild
@@ -8,7 +8,7 @@ FORTRAN_NEEDED=fortran
inherit fortran-2
DESCRIPTION="Astronomical World Coordinate System transformations library"
-HOMEPAGE="http://www.atnf.csiro.au/people/mcalabre/WCS/"
+HOMEPAGE="https://www.atnf.csiro.au/people/mcalabre/WCS/"
SRC_URI="ftp://ftp.atnf.csiro.au/pub/software/${PN}/${P}.tar.bz2"
SLOT="0/5"
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 8739fb0cfa34..47701b13d982 100644
Binary files a/sci-chemistry/Manifest.gz and b/sci-chemistry/Manifest.gz differ
diff --git a/sci-chemistry/pymol-plugins-promol/pymol-plugins-promol-3.0.2-r1.ebuild b/sci-chemistry/pymol-plugins-promol/pymol-plugins-promol-3.0.2-r1.ebuild
index d1c826850f60..6cd842f3703d 100644
--- a/sci-chemistry/pymol-plugins-promol/pymol-plugins-promol-3.0.2-r1.ebuild
+++ b/sci-chemistry/pymol-plugins-promol/pymol-plugins-promol-3.0.2-r1.ebuild
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python2_7 )
inherit python-r1
DESCRIPTION="Fast and accurate regognition of active sites"
-HOMEPAGE="http://www.rit.edu/cos/ezviz/ProMOL_dl.html"
-SRC_URI="http://www.rit.edu/cos/ezviz/ProMOL.zip -> ${P}.zip"
+HOMEPAGE="https://www.rit.edu/cos/ezviz/ProMOL_dl.html"
+SRC_URI="https://www.rit.edu/cos/ezviz/ProMOL.zip -> ${P}.zip"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index fe728e603e1d..cea1f8e5c59c 100644
Binary files a/sci-electronics/Manifest.gz and b/sci-electronics/Manifest.gz differ
diff --git a/sci-electronics/gsmc/gsmc-1.1-r2.ebuild b/sci-electronics/gsmc/gsmc-1.1-r2.ebuild
index 5db3aef6c286..a6d86fb2c36b 100644
--- a/sci-electronics/gsmc/gsmc-1.1-r2.ebuild
+++ b/sci-electronics/gsmc/gsmc-1.1-r2.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"
@@ -6,8 +6,8 @@ EAPI="5"
inherit autotools eutils
DESCRIPTION="A GTK program for doing Smith Chart calculations"
-HOMEPAGE="http://www.qsl.net/ik5nax/"
-SRC_URI="http://www.qsl.net/ik5nax/${P}.tar.gz"
+HOMEPAGE="https://www.qsl.net/ik5nax/"
+SRC_URI="https://www.qsl.net/ik5nax/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/sci-electronics/splat/splat-1.4.2.ebuild b/sci-electronics/splat/splat-1.4.2.ebuild
index 9514bcfdaf4d..e498c4b7c91b 100644
--- a/sci-electronics/splat/splat-1.4.2.ebuild
+++ b/sci-electronics/splat/splat-1.4.2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
inherit eutils toolchain-funcs
DESCRIPTION="RF Signal Propagation, Loss, And Terrain analysis tool"
-HOMEPAGE="http://www.qsl.net/kd2bd/splat.html"
-SRC_URI="http://www.qsl.net/kd2bd/${P}.tar.bz2"
+HOMEPAGE="https://www.qsl.net/kd2bd/splat.html"
+SRC_URI="https://www.qsl.net/kd2bd/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/sci-electronics/systemc/systemc-2.3.1-r1.ebuild b/sci-electronics/systemc/systemc-2.3.1-r1.ebuild
index bd72930845c8..118bb843f610 100644
--- a/sci-electronics/systemc/systemc-2.3.1-r1.ebuild
+++ b/sci-electronics/systemc/systemc-2.3.1-r1.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
@@ -7,8 +7,8 @@ inherit eutils toolchain-funcs autotools-utils
MY_P="${P}a"
DESCRIPTION="A C++ based modeling platform for VLSI and system-level co-design"
-HOMEPAGE="http://accellera.org/community/systemc"
-SRC_URI="http://accellera.org/images/downloads/standards/${PN}/${MY_P}.tar.gz"
+HOMEPAGE="https://accellera.org/community/systemc"
+SRC_URI="https://accellera.org/images/downloads/standards/${PN}/${MY_P}.tar.gz"
SLOT="0"
LICENSE="Apache-2.0"
diff --git a/sci-electronics/voacapl/voacapl-0.6.7.ebuild b/sci-electronics/voacapl/voacapl-0.6.7.ebuild
index e27ac2262c93..4f6b0eb4b26d 100644
--- a/sci-electronics/voacapl/voacapl-0.6.7.ebuild
+++ b/sci-electronics/voacapl/voacapl-0.6.7.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"
@@ -6,8 +6,8 @@ EAPI="5"
inherit fortran-2
DESCRIPTION="HF propagation prediction tool"
-HOMEPAGE="http://www.qsl.net/hz1jw/voacapl/index.html"
-SRC_URI="http://www.qsl.net/hz1jw/${PN}/downloads/${P}.tar.gz"
+HOMEPAGE="https://www.qsl.net/hz1jw/voacapl/index.html"
+SRC_URI="https://www.qsl.net/hz1jw/${PN}/downloads/${P}.tar.gz"
LICENSE="all-rights-reserved"
SLOT="0"
diff --git a/sci-electronics/voacapl/voacapl-0.7.2.ebuild b/sci-electronics/voacapl/voacapl-0.7.2.ebuild
index 4c91aec529b5..d50e3b75f800 100644
--- a/sci-electronics/voacapl/voacapl-0.7.2.ebuild
+++ b/sci-electronics/voacapl/voacapl-0.7.2.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="6"
@@ -6,8 +6,8 @@ EAPI="6"
inherit fortran-2
DESCRIPTION="HF propagation prediction tool"
-HOMEPAGE="http://www.qsl.net/hz1jw/voacapl/index.html"
-SRC_URI="http://www.qsl.net/hz1jw/${PN}/downloads/${P}.tar.gz"
+HOMEPAGE="https://www.qsl.net/hz1jw/voacapl/index.html"
+SRC_URI="https://www.qsl.net/hz1jw/${PN}/downloads/${P}.tar.gz"
LICENSE="all-rights-reserved"
SLOT="0"
diff --git a/sci-electronics/xnec2c/xnec2c-3.5.1.ebuild b/sci-electronics/xnec2c/xnec2c-3.5.1.ebuild
index 96831025485f..8bcf439db3cf 100644
--- a/sci-electronics/xnec2c/xnec2c-3.5.1.ebuild
+++ b/sci-electronics/xnec2c/xnec2c-3.5.1.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
@@ -6,8 +6,8 @@ EAPI=5
inherit autotools eutils
DESCRIPTION="A GTK+ graphical interactive version of nec2c"
-HOMEPAGE="http://www.qsl.net/5b4az/pages/nec2.html"
-SRC_URI="http://www.qsl.net/5b4az/pkg/nec2/xnec2c/${P}.tar.bz2"
+HOMEPAGE="https://www.qsl.net/5b4az/pages/nec2.html"
+SRC_URI="https://www.qsl.net/5b4az/pkg/nec2/xnec2c/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 9caca4ee7458..0e489edfa04e 100644
Binary files a/sci-geosciences/Manifest.gz and b/sci-geosciences/Manifest.gz differ
diff --git a/sci-geosciences/osm-gps-map/osm-gps-map-1.1.0.ebuild b/sci-geosciences/osm-gps-map/osm-gps-map-1.1.0.ebuild
index 2fcde8616055..504900c0a3fa 100644
--- a/sci-geosciences/osm-gps-map/osm-gps-map-1.1.0.ebuild
+++ b/sci-geosciences/osm-gps-map/osm-gps-map-1.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nzjrs/${PN}/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="static-libs"
RDEPEND="
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 1bc464451c79..deb4d28129d7 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/hdf/hdf-4.2.11.ebuild b/sci-libs/hdf/hdf-4.2.11.ebuild
index a167bc4da9fd..e898f4d07374 100644
--- a/sci-libs/hdf/hdf-4.2.11.ebuild
+++ b/sci-libs/hdf/hdf-4.2.11.ebuild
@@ -10,8 +10,8 @@ inherit fortran-2 toolchain-funcs autotools flag-o-matic ltprune
MYP=${P/_p/-patch}
DESCRIPTION="General purpose library and format for storing scientific data"
-HOMEPAGE="http://www.hdfgroup.org/hdf4.html"
-SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2"
+HOMEPAGE="https://www.hdfgroup.org/hdf4.html"
+SRC_URI="https://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2"
SLOT="0"
LICENSE="NCSA-HDF"
diff --git a/sci-libs/hdf/hdf-4.2.13-r1.ebuild b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
index d50d336f6fcf..ae60cc865d33 100644
--- a/sci-libs/hdf/hdf-4.2.13-r1.ebuild
+++ b/sci-libs/hdf/hdf-4.2.13-r1.ebuild
@@ -10,8 +10,8 @@ inherit fortran-2 toolchain-funcs autotools flag-o-matic ltprune
MYP=${P/_p/-patch}
DESCRIPTION="General purpose library and format for storing scientific data"
-HOMEPAGE="http://www.hdfgroup.org/hdf4.html"
-SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2"
+HOMEPAGE="https://www.hdfgroup.org/hdf4.html"
+SRC_URI="https://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2"
SLOT="0"
LICENSE="NCSA-HDF"
diff --git a/sci-libs/hdf/hdf-4.2.13.ebuild b/sci-libs/hdf/hdf-4.2.13.ebuild
index 39f741106714..feefb99d01aa 100644
--- a/sci-libs/hdf/hdf-4.2.13.ebuild
+++ b/sci-libs/hdf/hdf-4.2.13.ebuild
@@ -10,8 +10,8 @@ inherit fortran-2 toolchain-funcs autotools flag-o-matic ltprune
MYP=${P/_p/-patch}
DESCRIPTION="General purpose library and format for storing scientific data"
-HOMEPAGE="http://www.hdfgroup.org/hdf4.html"
-SRC_URI="http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2"
+HOMEPAGE="https://www.hdfgroup.org/hdf4.html"
+SRC_URI="https://www.hdfgroup.org/ftp/HDF/HDF_Current/src/${MYP}.tar.bz2"
SLOT="0"
LICENSE="NCSA-HDF"
diff --git a/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild b/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
index ef906aa6eefc..c2f1f217d63a 100644
--- a/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
+++ b/sci-libs/hdf5/hdf5-1.10.5-r1.ebuild
@@ -11,8 +11,8 @@ MY_P="${PN}-${PV/_p/-patch}"
MAJOR_P="${PN}-$(ver_cut 1-2)"
DESCRIPTION="General purpose library and file format for storing scientific data"
-HOMEPAGE="http://www.hdfgroup.org/HDF5/"
-SRC_URI="http://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_P}.tar.bz2"
+HOMEPAGE="https://www.hdfgroup.org/HDF5/"
+SRC_URI="https://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_P}.tar.bz2"
LICENSE="NCSA-HDF"
SLOT="0/${PV%%_p*}"
diff --git a/sci-libs/hdf5/hdf5-1.10.5.ebuild b/sci-libs/hdf5/hdf5-1.10.5.ebuild
index d812cce90d46..9d3676dd8897 100644
--- a/sci-libs/hdf5/hdf5-1.10.5.ebuild
+++ b/sci-libs/hdf5/hdf5-1.10.5.ebuild
@@ -11,8 +11,8 @@ MY_P=${PN}-${PV/_p/-patch}
MAJOR_P=${PN}-$(ver_cut 1-2)
DESCRIPTION="General purpose library and file format for storing scientific data"
-HOMEPAGE="http://www.hdfgroup.org/HDF5/"
-SRC_URI="http://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_P}.tar.bz2"
+HOMEPAGE="https://www.hdfgroup.org/HDF5/"
+SRC_URI="https://www.hdfgroup.org/ftp/HDF5/releases/${MAJOR_P}/${MY_P}/src/${MY_P}.tar.bz2"
LICENSE="NCSA-HDF"
SLOT="0/${PV%%_p*}"
diff --git a/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild b/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild
index 33d7fc5c0a26..43b17b8974b1 100644
--- a/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild
+++ b/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild
@@ -8,7 +8,7 @@ inherit eutils fortran-2 toolchain-funcs
MY_P="${PN}${PV//.}"
DESCRIPTION="FORTRAN/C device-independent scientific graphic library"
-HOMEPAGE="http://www.astro.caltech.edu/~tjp/pgplot/"
+HOMEPAGE="https://www.astro.caltech.edu/~tjp/pgplot/"
SRC_URI="ftp://ftp.astro.caltech.edu/pub/pgplot/${MY_P}.tar.gz"
SLOT="0"
diff --git a/sci-libs/szip/szip-2.1-r2.ebuild b/sci-libs/szip/szip-2.1-r2.ebuild
index 7e5ab7936ab2..da08b6a5c3c9 100644
--- a/sci-libs/szip/szip-2.1-r2.ebuild
+++ b/sci-libs/szip/szip-2.1-r2.ebuild
@@ -4,7 +4,7 @@
EAPI=6
DESCRIPTION="Extended-Rice lossless compression algorithm implementation"
-HOMEPAGE="http://www.hdfgroup.org/doc_resource/SZIP/"
+HOMEPAGE="https://www.hdfgroup.org/doc_resource/SZIP/"
SRC_URI="ftp://ftp.hdfgroup.org/lib-external/${PN}/${PV}/src/${P}.tar.gz"
LICENSE="szip"
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index e3265b291314..0f63eaa3c275 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sci-mathematics/pari/pari-2.11.4.ebuild b/sci-mathematics/pari/pari-2.11.4.ebuild
index 564ed9639a71..2d485e215644 100644
--- a/sci-mathematics/pari/pari-2.11.4.ebuild
+++ b/sci-mathematics/pari/pari-2.11.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/6"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
IUSE="data doc fltk gmp test threads X"
RESTRICT="!test? ( test )"
@@ -61,7 +61,11 @@ src_configure() {
# sysdatadir installs a pari.cfg stuff which is informative only.
# It is supposed to be for "architecture-dependent" data.
# It needs to be easily discoverable for downstream packages such as gp2c.
- ./Configure \
+ # We set LD to "" so that it is set to the value of the compiler used
+ # which is how a normal end user is expected to configure it. pari's build
+ # system do not cope very well with a naked linker, it is expecting a
+ # compiler driver. See https://bugs.gentoo.org/722090
+ LD="" ./Configure \
--prefix="${EPREFIX}"/usr \
--datadir="${EPREFIX}/usr/share/${PN}" \
--libdir="${EPREFIX}/usr/$(get_libdir)" \
diff --git a/sci-mathematics/petsc/petsc-3.13.0.ebuild b/sci-mathematics/petsc/petsc-3.13.0.ebuild
index 961ff927f725..6823bc877764 100644
--- a/sci-mathematics/petsc/petsc-3.13.0.ebuild
+++ b/sci-mathematics/petsc/petsc-3.13.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7,8} )
inherit flag-o-matic fortran-2 python-any-r1 toolchain-funcs
DESCRIPTION="Portable, Extensible Toolkit for Scientific Computation"
-HOMEPAGE="http://www.mcs.anl.gov/petsc/"
+HOMEPAGE="https://www.mcs.anl.gov/petsc/"
SRC_URI="http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/${P}.tar.gz"
LICENSE="BSD-2"
diff --git a/sci-mathematics/petsc/petsc-3.13.1.ebuild b/sci-mathematics/petsc/petsc-3.13.1.ebuild
index 961ff927f725..6823bc877764 100644
--- a/sci-mathematics/petsc/petsc-3.13.1.ebuild
+++ b/sci-mathematics/petsc/petsc-3.13.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7,8} )
inherit flag-o-matic fortran-2 python-any-r1 toolchain-funcs
DESCRIPTION="Portable, Extensible Toolkit for Scientific Computation"
-HOMEPAGE="http://www.mcs.anl.gov/petsc/"
+HOMEPAGE="https://www.mcs.anl.gov/petsc/"
SRC_URI="http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/${P}.tar.gz"
LICENSE="BSD-2"
diff --git a/sci-mathematics/polymake/polymake-3.0_p2.ebuild b/sci-mathematics/polymake/polymake-3.0_p2.ebuild
index c14cf1c5a3fd..179fb83a8924 100644
--- a/sci-mathematics/polymake/polymake-3.0_p2.ebuild
+++ b/sci-mathematics/polymake/polymake-3.0_p2.ebuild
@@ -7,7 +7,7 @@ inherit eutils flag-o-matic
DESCRIPTION="research tool for polyhedral geometry and combinatorics"
SRC_URI="https://polymake.org/lib/exe/fetch.php/download/polymake-3.0r2.tar.bz2"
-HOMEPAGE="http://polymake.org"
+HOMEPAGE="https://polymake.org"
IUSE="+cdd lrs ppl bliss group +libnormaliz singular libpolymake"
@@ -80,7 +80,7 @@ src_install() {
}
pkg_postinst() {
- elog "Docs can be found on http://www.polymake.org/doku.php/documentation"
+ elog "Docs can be found on https://www.polymake.org/doku.php/documentation"
elog " "
elog "Support for jreality is missing, sorry (see bug #346073)."
elog " "
diff --git a/sci-mathematics/singular/singular-4.0.2.ebuild b/sci-mathematics/singular/singular-4.0.2.ebuild
index 7467031e0e48..7ed8bc1ce712 100644
--- a/sci-mathematics/singular/singular-4.0.2.ebuild
+++ b/sci-mathematics/singular/singular-4.0.2.ebuild
@@ -14,9 +14,9 @@ MY_DIR=$(replace_all_version_separators '-' ${MY_DIR2})
MY_SHARE_DIR="${WORKDIR}"/share/
DESCRIPTION="Computer algebra system for polynomial computations"
-HOMEPAGE="http://www.singular.uni-kl.de/"
-SRC_URI="http://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}.tar.gz
- http://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}-share.tar.gz"
+HOMEPAGE="https://www.singular.uni-kl.de/"
+SRC_URI="https://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}.tar.gz
+ https://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}-share.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/sci-mathematics/singular/singular-4.0.3.ebuild b/sci-mathematics/singular/singular-4.0.3.ebuild
index 4be89de36674..fcfd823ae4d9 100644
--- a/sci-mathematics/singular/singular-4.0.3.ebuild
+++ b/sci-mathematics/singular/singular-4.0.3.ebuild
@@ -13,9 +13,9 @@ MY_DIR=$(replace_all_version_separators '-' ${MY_DIR2})
# This is where the share tarball unpacks to
DESCRIPTION="Computer algebra system for polynomial computations"
-HOMEPAGE="http://www.singular.uni-kl.de/"
-SRC_URI="http://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}.tar.gz
- http://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}-share.tar.gz"
+HOMEPAGE="https://www.singular.uni-kl.de/"
+SRC_URI="https://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}.tar.gz
+ https://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}-share.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/sci-mathematics/slepc/slepc-3.13.1.ebuild b/sci-mathematics/slepc/slepc-3.13.1.ebuild
index be2d085dd6cb..003f1453e563 100644
--- a/sci-mathematics/slepc/slepc-3.13.1.ebuild
+++ b/sci-mathematics/slepc/slepc-3.13.1.ebuild
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python3_{6,7,8} )
inherit eutils flag-o-matic python-any-r1 toolchain-funcs
DESCRIPTION="Scalable Library for Eigenvalue Problem Computations"
-HOMEPAGE="http://slepc.upv.es/"
-SRC_URI="http://slepc.upv.es/download/distrib/${P}.tar.gz"
+HOMEPAGE="https://slepc.upv.es/"
+SRC_URI="https://slepc.upv.es/download/distrib/${P}.tar.gz"
LICENSE="LGPL-3"
SLOT="0"
diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index 71e3c08f820c..6dd891ffd679 100644
Binary files a/sci-misc/Manifest.gz and b/sci-misc/Manifest.gz differ
diff --git a/sci-misc/vitables/vitables-3.0.0-r1.ebuild b/sci-misc/vitables/vitables-3.0.0-r1.ebuild
index c25d11326d4c..a39e483b2048 100644
--- a/sci-misc/vitables/vitables-3.0.0-r1.ebuild
+++ b/sci-misc/vitables/vitables-3.0.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit distutils-r1
MY_P=ViTables-${PV}
DESCRIPTION="A graphical tool for browsing / editing files in both PyTables and HDF5 formats"
-HOMEPAGE="http://vitables.org/"
+HOMEPAGE="https://vitables.org/"
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-3"
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index bf7072ef5a08..d9570d57a7c0 100644
Binary files a/sci-visualization/Manifest.gz and b/sci-visualization/Manifest.gz differ
diff --git a/sci-visualization/epix/epix-1.2.11-r2.ebuild b/sci-visualization/epix/epix-1.2.11-r2.ebuild
index 803e8966b92b..7d479a0bc449 100644
--- a/sci-visualization/epix/epix-1.2.11-r2.ebuild
+++ b/sci-visualization/epix/epix-1.2.11-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=5
@@ -6,8 +6,8 @@ EAPI=5
inherit elisp-common bash-completion-r1 autotools eutils
DESCRIPTION="2- and 3-D plotter for creating images (to be used in LaTeX)"
-HOMEPAGE="http://mathcs.holycross.edu/~ahwang/current/ePiX.html"
-SRC_URI="http://mathcs.holycross.edu/~ahwang/epix/${P}_withpdf.tar.bz2"
+HOMEPAGE="https://mathcs.holycross.edu/~ahwang/current/ePiX.html"
+SRC_URI="https://mathcs.holycross.edu/~ahwang/epix/${P}_withpdf.tar.bz2"
SLOT="0"
LICENSE="GPL-2"
diff --git a/sci-visualization/gnuplot/gnuplot-5.2.8.ebuild b/sci-visualization/gnuplot/gnuplot-5.2.8.ebuild
index b38b2fc31c42..dcfe1b097f8c 100644
--- a/sci-visualization/gnuplot/gnuplot-5.2.8.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-5.2.8.ebuild
@@ -17,7 +17,7 @@ if [[ -z ${PV%%*9999} ]]; then
else
MY_P="${P/_/.}"
SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~ppc ~ppc64 ~s390 sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="gnuplot"
diff --git a/sci-visualization/gnuplot/metadata.xml b/sci-visualization/gnuplot/metadata.xml
index 6442566e482f..b258754a4c25 100644
--- a/sci-visualization/gnuplot/metadata.xml
+++ b/sci-visualization/gnuplot/metadata.xml
@@ -5,10 +5,6 @@
ulm@gentoo.org
Ulrich Müller
-
- junghans@gentoo.org
- Christoph Junghans
-
sci@gentoo.org
Gentoo Science Project
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 004ad87b9d7b..adfdeed981c9 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/accountsservice/accountsservice-0.6.55.ebuild b/sys-apps/accountsservice/accountsservice-0.6.55.ebuild
index 8b9e10e0aa64..696a59ead8c6 100644
--- a/sys-apps/accountsservice/accountsservice-0.6.55.ebuild
+++ b/sys-apps/accountsservice/accountsservice-0.6.55.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="doc consolekit elogind gtk-doc +introspection selinux systemd"
REQUIRED_USE="^^ ( consolekit elogind systemd )"
diff --git a/sys-apps/file/file-5.39-r2.ebuild b/sys-apps/file/file-5.39-r2.ebuild
new file mode 100644
index 000000000000..204826c0d4d5
--- /dev/null
+++ b/sys-apps/file/file-5.39-r2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_OPTIONAL=1
+
+inherit autotools distutils-r1 libtool toolchain-funcs multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/glensc/file.git"
+ inherit git-r3
+else
+ SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
+ 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"
+fi
+
+DESCRIPTION="identify a file's format by scanning binary data for patterns"
+HOMEPAGE="https://www.darwinsys.com/file/"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="bzip2 lzma python seccomp static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+ bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+ lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+ python? ( !dev-python/python-magic )
+ seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.39-portage_sandbox.patch" #713710 #728978
+ "${FILESDIR}/${P}-add-missing-termios.patch" #728416
+)
+
+src_prepare() {
+ default
+ eautoreconf
+ elibtoolize
+
+ # don't let python README kill main README #60043
+ mv python/README.md python/README.python.md || die
+ sed 's@README.md@README.python.md@' -i python/setup.py || die #662090
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --enable-fsect-man5
+ $(use_enable bzip2 bzlib)
+ $(use_enable lzma xzlib)
+ $(use_enable seccomp libseccomp)
+ $(use_enable static-libs static)
+ $(use_enable zlib)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+build_src_configure() {
+ local myeconfargs=(
+ --disable-shared
+ --disable-libseccomp
+ --disable-bzlib
+ --disable-xzlib
+ --disable-zlib
+ )
+ tc-env_build econf "${myeconfargs[@]}"
+}
+
+need_build_file() {
+ # when cross-compiling, we need to build up our own file
+ # because people often don't keep matching host/target
+ # file versions #362941
+ tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
+}
+
+src_configure() {
+ local ECONF_SOURCE=${S}
+
+ if need_build_file; then
+ mkdir -p "${WORKDIR}"/build || die
+ cd "${WORKDIR}"/build || die
+ build_src_configure
+ fi
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+ if multilib_is_native_abi ; then
+ emake
+ else
+ cd src || die
+ emake magic.h #586444
+ emake libmagic.la
+ fi
+}
+
+src_compile() {
+ if need_build_file; then
+ emake -C "${WORKDIR}"/build/src magic.h #586444
+ emake -C "${WORKDIR}"/build/src file
+ local -x PATH="${WORKDIR}/build/src:${PATH}"
+ fi
+ multilib-minimal_src_compile
+
+ if use python ; then
+ cd python || die
+ distutils-r1_src_compile
+ fi
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi ; then
+ default
+ else
+ emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
+ fi
+}
+
+multilib_src_install_all() {
+ dodoc ChangeLog MAINT README
+
+ # Required for `file -C`
+ dodir /usr/share/misc/magic
+ insinto /usr/share/misc/magic
+ doins -r magic/Magdir/*
+
+ if use python ; then
+ cd python || die
+ distutils-r1_src_install
+ fi
+ find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/sys-apps/file/files/file-5.39-add-missing-termios.patch b/sys-apps/file/files/file-5.39-add-missing-termios.patch
new file mode 100644
index 000000000000..e6cba0d4c28c
--- /dev/null
+++ b/sys-apps/file/files/file-5.39-add-missing-termios.patch
@@ -0,0 +1,27 @@
+From 769e9868c17a471323b81b12cab851c9fd22baf4 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev
+Date: Mon, 15 Jun 2020 14:18:45 -0700
+Subject: [PATCH] add missing termios.h include
+
+on ppc, TCGETS relies on struct termios being complete, on other
+architectures it does not.
+so termios.h should be included before ioctl.h
+---
+ src/seccomp.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/seccomp.c b/src/seccomp.c
+index e667adf..296f5b3 100644
+--- a/src/seccomp.c
++++ b/src/seccomp.c
+@@ -33,6 +33,7 @@ FILE_RCSID("@(#)$File: seccomp.c,v 1.15 2020/05/30 23:56:26 christos Exp $")
+ #if HAVE_LIBSECCOMP
+ #include /* libseccomp */
+ #include /* prctl */
++#include
+ #include
+ #include
+ #include
+--
+2.27.0
+
diff --git a/sys-apps/xdg-desktop-portal/Manifest b/sys-apps/xdg-desktop-portal/Manifest
index cc68c2db6f09..7e453754e2f4 100644
--- a/sys-apps/xdg-desktop-portal/Manifest
+++ b/sys-apps/xdg-desktop-portal/Manifest
@@ -1 +1,2 @@
DIST xdg-desktop-portal-1.6.0.tar.xz 453516 BLAKE2B 13ffcb21de6b61ddeb0782dcfc7b684287e54f94b9494b19589178594d1383a15048b8f9aeed7fb1260c3a2c967b267061d1db401085a686938c8629de8824c3 SHA512 7a0c702851762a55326142cb6b470205775284e0f749620ae6b648f216afcd684f8b20500339680b42812f628634344c9e826ab7cf13dd918fdbf733381d44ce
+DIST xdg-desktop-portal-1.7.2.tar.xz 468140 BLAKE2B 6f2e92f79424f79e778db9c1bf94555332f1f88ef42f84e477c8784be74ce8e2cf924f34da5e17d78359bd493370dcee62aec77f60c9df5cf3475d745f3e4d8e SHA512 fac64281e89d8bf17c6f1b3751c159d9ca6c2896b71bb83622411bf2dc9b7813974d19902c81c3576b325c98edf4dae22ccc3fe290e32f717730b6aa3afbdc12
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.6.0-r1.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.6.0-r2.ebuild
similarity index 95%
rename from sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.6.0-r1.ebuild
rename to sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.6.0-r2.ebuild
index 52c483a59a5b..777122093897 100644
--- a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.6.0-r1.ebuild
+++ b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.6.0-r2.ebuild
@@ -19,8 +19,8 @@ BDEPEND="
sys-devel/gettext
virtual/pkgconfig
doc? (
- app-text/xmlto
app-text/docbook-xml-dtd:4.3
+ app-text/xmlto
)
"
DEPEND="
@@ -29,7 +29,7 @@ DEPEND="
media-libs/fontconfig
sys-fs/fuse:0
geolocation? ( >=app-misc/geoclue-2.5.3:2.0 )
- screencast? ( media-video/pipewire:= )
+ screencast? ( media-video/pipewire:0/0.2 )
"
RDEPEND="${DEPEND}
sys-apps/dbus
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.7.2.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.7.2.ebuild
new file mode 100644
index 000000000000..5037ce682d40
--- /dev/null
+++ b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.7.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="Desktop integration portal"
+HOMEPAGE="https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal"
+SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="doc geolocation screencast"
+
+BDEPEND="
+ dev-util/gdbus-codegen
+ sys-devel/gettext
+ virtual/pkgconfig
+ doc? (
+ app-text/docbook-xml-dtd:4.3
+ app-text/xmlto
+ )
+"
+DEPEND="
+ dev-libs/glib:2
+ dev-libs/json-glib
+ media-libs/fontconfig
+ sys-fs/fuse:0
+ geolocation? ( >=app-misc/geoclue-2.5.3:2.0 )
+ screencast? ( >=media-video/pipewire-0.3:= )
+"
+RDEPEND="${DEPEND}
+ sys-apps/dbus
+"
+
+src_configure() {
+ local myeconfargs=(
+ --with-systemduserunitdir="$(systemd_get_userunitdir)"
+ $(use_enable doc docbook-docs)
+ $(use_enable geolocation geoclue)
+ $(use_enable screencast pipewire)
+ --disable-libportal # not packaged
+ )
+ econf "${myeconfargs[@]}"
+}
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 4099c5d60b0b..31f11ad49db8 100644
Binary files a/sys-block/Manifest.gz and b/sys-block/Manifest.gz differ
diff --git a/sys-block/f3/f3-7.2.ebuild b/sys-block/f3/f3-7.2.ebuild
index cbf537f43586..9888e5edfae8 100644
--- a/sys-block/f3/f3-7.2.ebuild
+++ b/sys-block/f3/f3-7.2.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
SRC_URI="https://github.com/AltraMayor/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~arm64 x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
LICENSE="GPL-3+"
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 0f09269539f6..db6ec08dc830 100644
Binary files a/sys-boot/Manifest.gz and b/sys-boot/Manifest.gz differ
diff --git a/sys-boot/udk/files/2018-makefile.template b/sys-boot/udk/files/2018-makefile.template
deleted file mode 100644
index 049a94facd81..000000000000
--- a/sys-boot/udk/files/2018-makefile.template
+++ /dev/null
@@ -1,41 +0,0 @@
-TOP := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
-BASE_NAME = «MODULE»
-EXEC = «MODULE».efi
-SRC = $(shell find $(TOP) -type f -name '*.c')
-OBJ = $(SRC:.c=.o)
-INC_DIR = /usr/include/«PACKAGE_NAME»
-LIB_DIR = «LIB_DIR»
-DEST_DIR_DEBUG = .
-«STATIC_LIBS»
-
-EFI_LDS = «EFI_LDS»
-«MODULE_TYPE»
-«VARIABLES»
-
-comma:= ,
-empty:=
-space:= $(empty) $(empty)
-
-all: $(EXEC)
-
-%.efi: $(OBJ)
- $(DLINK) -o $(@:.efi=.dll) $(DLINK_FLAGS) \
- -Wl,--script,$(EFI_LDS) -Wl,--defsym=PECOFF_HEADER_SIZE=«PECOFF_HEADER_SIZE» \
- -Wl,$(subst $(space),$(comma),--start-group $(STATIC_LIBRARY_FILES)$^ --end-group)
- $(OBJCOPY) $(OBJCOPY_FLAGS) $(@:.efi=.dll)
- $(CP) $(@:.efi=.dll) $(@:.efi=.debug)
- $(OBJCOPY) --strip-unneeded -R .eh_frame $(@:.efi=.dll)
- $(OBJCOPY) --add-gnu-debuglink=$(@:.efi=.debug) $(@:.efi=.dll)
- $(GENFW) -e $(MODULE_TYPE) -o $@ $(@:.efi=.dll) $(GENFW_FLAGS)
- $(RM) $(@:.efi=.dll)
-
-%.o: %.c
- $(CC) $(CC_FLAGS) -I$(INC_DIR) -iquote$(TOP) -c -o $@ $^
-
-clean:
- $(RM) *.o
-
-mrproper: clean
- $(RM) $(EXEC) $(EXEC:.efi=.debug)
-
-.PHONY: all clean mrproper
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 1d2d1ddd5812..f0c7f1355299 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index f3022f2a86fa..8c2cc97fb017 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -1,3 +1,4 @@
DIST ceph-12.2.12.tar.gz 77467762 BLAKE2B a5224432121db9ef49c1e22771d847399df2f7881cd9c2e185eca12096efb79d21578659d248eb5bae678924983d57452d370e23ab7e78663764d7bea834a461 SHA512 e694c9a8c1f9836c08fb74b54423bdc16d4900252e34643c56cf1a615d4dacddfb13df06a6a9f68bb9d438f5f07069ed358f9fa4b5a362640a3046f9c7722dcc
+DIST ceph-14.2.10.tar.gz 129274835 BLAKE2B b3f14897db478418b982281bf367a0c497cdfa8991a73e277b5582663c159550f3eff5bdc78a506e267eae8d59c59b19b8a9294802cb532fd7dfa9f612ed0e53 SHA512 5ec95b933a360183f89404446c5e1912a81853dfb1134bb8868bc6675a0185420c2bf1eba72308014a008f617aeb8733d51eb8c8eea5d472c32514cf483f4ea6
DIST ceph-14.2.9.tar.gz 128419205 BLAKE2B bace7469d9066a3da7320a0eb894013fae5b7139c15679dddae7df28c593a1029956234a1ba0d3bbdf1639e3a975aa776c695efefb915113a16099c80d563675 SHA512 0a26372d0037c32fe1d24be880e272fcce5089b02adfb0e791e0406155f6e66c913fa43762028f49c1fa3f30c6c8d819c521dd11702a37cc7040dfd3097c068e
DIST ceph-15.2.3.tar.gz 147807898 BLAKE2B ff5e9707cf05e22af718ee177cce87ea9913b1b78d7ba17589f2c7fdaea0a7a27dd1f7b8e9947a095ed74106b6b19258fd8be259100624032f3a6e8ce5243390 SHA512 0378365863bcb86e62d64a2eff91e39a91218eabfb126dae74185e1fe52b21a3d5113f885ddb8076551f2f069435e18b24417bf70f29f23e21fac7065e412912
diff --git a/sys-cluster/ceph/ceph-14.2.10.ebuild b/sys-cluster/ceph/ceph-14.2.10.ebuild
new file mode 100644
index 000000000000..b9bca5dfb763
--- /dev/null
+++ b/sys-cluster/ceph/ceph-14.2.10.ebuild
@@ -0,0 +1,392 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+CMAKE_MAKEFILE_GENERATOR=emake
+
+DISTUTILS_OPTIONAL=1
+
+inherit check-reqs bash-completion-r1 cmake-utils distutils-r1 flag-o-matic \
+ multiprocessing python-r1 udev readme.gentoo-r1 toolchain-funcs \
+ systemd tmpfiles
+
+if [[ ${PV} == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ceph/ceph.git"
+ SRC_URI=""
+else
+ SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
+ KEYWORDS="~amd64 ~ppc64"
+fi
+
+DESCRIPTION="Ceph distributed filesystem"
+HOMEPAGE="https://ceph.com/"
+
+LICENSE="Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain"
+SLOT="0"
+
+CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
+
+IUSE="babeltrace +cephfs custom-cflags diskprediction dpdk fuse grafana jemalloc
+ kafka kerberos ldap libressl lttng +mgr numa +openssl rabbitmq +radosgw +ssl
+ spdk system-boost systemd +tcmalloc test xfs zfs"
+IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
+
+COMMON_DEPEND="
+ acct-group/ceph
+ acct-user/ceph
+ virtual/libudev:=
+ app-arch/bzip2:=
+ app-arch/lz4:=
+ app-arch/snappy:=
+ app-arch/zstd:=
+ app-shells/bash:0
+ app-misc/jq:=
+ dev-libs/crypto++:=
+ dev-libs/leveldb:=[snappy,tcmalloc(-)?]
+ dev-libs/libaio:=
+ dev-libs/libnl:3=
+ dev-libs/libxml2:=
+ dev-libs/xmlsec:=[!openssl?,!libressl?]
+ dev-cpp/yaml-cpp:=
+ dev-libs/nss:=
+ dev-libs/protobuf:=
+ net-dns/c-ares:=
+ net-libs/gnutls:=
+ sys-auth/oath-toolkit:=
+ sys-apps/coreutils
+ sys-apps/grep
+ sys-apps/hwloc:=
+ sys-apps/keyutils:=
+ sys-apps/util-linux:=
+ sys-apps/sed
+ sys-apps/util-linux
+ sys-libs/libcap-ng:=
+ sys-libs/ncurses:0=
+ sys-libs/zlib:=
+ sys-process/numactl:=
+ x11-libs/libpciaccess:=
+ babeltrace? ( dev-util/babeltrace )
+ fuse? ( sys-fs/fuse:0= )
+ jemalloc? ( dev-libs/jemalloc:= )
+ !jemalloc? ( >=dev-util/google-perftools-2.6.1:= )
+ kafka? ( dev-libs/librdkafka:= )
+ kerberos? ( virtual/krb5 )
+ ldap? ( net-nds/openldap:= )
+ lttng? ( dev-util/lttng-ust:= )
+ rabbitmq? ( net-libs/rabbitmq-c:= )
+ radosgw? (
+ dev-libs/expat:=
+ openssl? (
+ dev-libs/openssl:=
+ net-misc/curl:=[curl_ssl_openssl]
+ )
+ libressl? (
+ dev-libs/libressl:=
+ net-misc/curl:=[curl_ssl_libressl]
+ )
+ )
+ ssl? (
+ openssl? ( dev-libs/openssl:= )
+ libressl? ( dev-libs/libressl:= )
+ )
+ system-boost? ( =dev-libs/boost-1.72*[threads,context,python,${PYTHON_USEDEP}] )
+ xfs? ( sys-fs/xfsprogs:= )
+ zfs? ( sys-fs/zfs:= )
+ ${PYTHON_DEPS}
+"
+BDEPEND="
+ amd64? ( dev-lang/yasm )
+ x86? ( dev-lang/yasm )
+ app-arch/cpio
+ >=dev-util/cmake-3.5.0
+ dev-python/cython[${PYTHON_USEDEP}]
+ dev-python/sphinx
+ dev-util/cunit
+ dev-util/gperf
+ dev-util/ragel
+ dev-util/valgrind
+ sys-apps/coreutils
+ sys-apps/findutils
+ sys-apps/grep
+ sys-apps/sed
+ sys-apps/which
+ sys-devel/bc
+ sys-devel/patch
+ virtual/pkgconfig
+ test? (
+ dev-python/coverage[${PYTHON_USEDEP}]
+ dev-python/virtualenv[${PYTHON_USEDEP}]
+ dev-python/requests-mock[${PYTHON_USEDEP}]
+ sys-apps/grep[pcre]
+ sys-fs/btrfs-progs
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ app-admin/sudo
+ net-misc/socat
+ sys-apps/gptfdisk
+ >=sys-apps/smartmontools-7.0
+ sys-block/parted
+ sys-fs/cryptsetup
+ sys-fs/lsscsi
+ sys-fs/lvm2[-device-mapper-only(-)]
+ virtual/awk
+ dev-python/bcrypt[${PYTHON_USEDEP}]
+ dev-python/cherrypy[${PYTHON_USEDEP}]
+ dev-python/flask[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/pecan[${PYTHON_USEDEP}]
+ dev-python/prettytable[${PYTHON_USEDEP}]
+ dev-python/pyopenssl[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/werkzeug[${PYTHON_USEDEP}]
+ mgr? (
+ dev-python/more-itertools[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/pyjwt[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/routes[${PYTHON_USEDEP}]
+ diskprediction? (
+ $(python_gen_cond_dep '/dev/null || die
+ emake VERBOSE=1 clean
+ emake VERBOSE=1 all
+
+ # python modules are only compiled with "make install" so we need to do this to
+ # prevent doing a bunch of compilation in src_install
+ DESTDIR="${T}" emake VERBOSE=1 install
+ popd >/dev/null || die
+}
+
+src_compile() {
+ cmake-utils_src_make VERBOSE=1 all
+
+ # we have to do this here to prevent from building everything multiple times
+ python_copy_sources
+ python_foreach_impl python_compile
+}
+
+src_test() {
+ make check || die "make check failed"
+}
+
+python_install() {
+ local CMAKE_USE_DIR="${S}"
+ pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
+ DESTDIR="${ED}" emake VERBOSE=1 install
+ popd >/dev/null || die
+
+ python_optimize
+}
+
+src_install() {
+ cmake-utils_src_install
+ python_foreach_impl python_install
+
+ find "${ED}" -name '*.la' -type f -delete || die
+
+ exeinto /usr/$(get_libdir)/ceph
+ newexe "${BUILD_DIR}/bin/init-ceph" init-ceph
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
+
+ keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
+
+ fowners -R ceph:ceph /var/log/ceph
+
+ newinitd "${FILESDIR}/rbdmap.initd" rbdmap
+ newinitd "${FILESDIR}/${PN}.initd-r12" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
+
+ insinto /etc/sysctl.d
+ newins "${FILESDIR}"/sysctld 90-${PN}.conf
+
+ use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
+
+ # units aren't installed by the build system unless systemd is enabled
+ # so no point installing these with the USE flag disabled
+ if use systemd; then
+ systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
+ "ceph-mds@.service"
+
+ systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
+ "ceph-osd@.service"
+
+ fi
+
+ udev_dorules udev/*.rules
+ newtmpfiles "${FILESDIR}"/ceph-tmpfilesd ${PN}.conf
+
+ readme.gentoo_create_doc
+
+ python_setup
+
+ # bug #630232
+ sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \
+ || die "sed failed"
+
+ python_fix_shebang "${ED}"/usr/{,s}bin/
+
+ # python_fix_shebang apparently is not idempotent
+ local shebang_regex='(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]'
+ grep -r -E -l --null "${shebang_regex}" "${ED}"/usr/{s,}bin/ \
+ | xargs --null --no-run-if-empty -- sed -i -r "s:${shebang_regex}:\1:" || die
+
+ local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* )
+ dostrip -x "${rados_classes[@]#${ED}}"
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
diff --git a/sys-cluster/ceph/files/ceph-14.2.10-missing-includes.patch b/sys-cluster/ceph/files/ceph-14.2.10-missing-includes.patch
new file mode 100644
index 000000000000..59663028cfa4
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-14.2.10-missing-includes.patch
@@ -0,0 +1,26 @@
+diff --git a/src/common/bit_str.h b/src/common/bit_str.h
+index c4c24f6a75..b5631e8b84 100644
+--- a/src/common/bit_str.h
++++ b/src/common/bit_str.h
+@@ -14,6 +14,8 @@
+ #ifndef CEPH_COMMON_BIT_STR_H
+ #define CEPH_COMMON_BIT_STR_H
+
++#include
++#include
+ #include
+
+ namespace ceph {
+diff --git a/src/librbd/api/PoolMetadata.h b/src/librbd/api/PoolMetadata.h
+index 977ce3638d..8d982879aa 100644
+--- a/src/librbd/api/PoolMetadata.h
++++ b/src/librbd/api/PoolMetadata.h
+@@ -8,6 +8,8 @@
+ #include "include/rados/librados_fwd.hpp"
+
+ #include
++#include
++#include
+
+ namespace librbd {
+
diff --git a/sys-cluster/ceph/files/ceph-14.2.10-python-warnings.patch b/sys-cluster/ceph/files/ceph-14.2.10-python-warnings.patch
new file mode 100644
index 000000000000..8be3e509a1cf
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-14.2.10-python-warnings.patch
@@ -0,0 +1,31 @@
+diff --git a/src/pybind/ceph_volume_client.py b/src/pybind/ceph_volume_client.py
+index 7d7e5b49e4..9a1ba80e69 100644
+--- a/src/pybind/ceph_volume_client.py
++++ b/src/pybind/ceph_volume_client.py
+@@ -355,7 +355,7 @@ class CephFSVolumeClient(object):
+ continue
+
+ (group_id, volume_id) = volume.split('/')
+- group_id = group_id if group_id is not 'None' else None
++ group_id = group_id if group_id != 'None' else None
+ volume_path = VolumePath(group_id, volume_id)
+ access_level = volume_data['access_level']
+
+@@ -378,7 +378,7 @@ class CephFSVolumeClient(object):
+ if vol_meta['auths'][auth_id] == want_auth:
+ continue
+
+- readonly = True if access_level is 'r' else False
++ readonly = True if access_level == 'r' else False
+ self._authorize_volume(volume_path, auth_id, readonly)
+
+ # Recovered from partial auth updates for the auth ID's access
+@@ -1120,7 +1120,7 @@ class CephFSVolumeClient(object):
+
+ # Construct auth caps that if present might conflict with the desired
+ # auth caps.
+- unwanted_access_level = 'r' if want_access_level is 'rw' else 'rw'
++ unwanted_access_level = 'r' if want_access_level == 'rw' else 'rw'
+ unwanted_mds_cap = 'allow {0} path={1}'.format(unwanted_access_level, path)
+ if namespace:
+ unwanted_osd_cap = 'allow {0} pool={1} namespace={2}'.format(
diff --git a/sys-cluster/ceph/files/ceph-14.2.5-boost-1.6-python-sonames.patch b/sys-cluster/ceph/files/ceph-14.2.5-boost-1.6-python-sonames.patch
deleted file mode 100644
index 318844f6c025..000000000000
--- a/sys-cluster/ceph/files/ceph-14.2.5-boost-1.6-python-sonames.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1e9ebfbb41..1a858a6e3f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -649,7 +649,7 @@ set(BOOST_HEADER_COMPONENTS container)
-
- if(WITH_MGR)
- list(APPEND BOOST_COMPONENTS
-- python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR})
-+ python-${MGR_PYTHON_VERSION_MAJOR}.${MGR_PYTHON_VERSION_MINOR})
- endif()
- if(WITH_BOOST_CONTEXT)
- list(APPEND BOOST_COMPONENTS context coroutine)
-diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake
-index f46cc0d485..3cc6340b2c 100644
---- a/cmake/modules/BuildBoost.cmake
-+++ b/cmake/modules/BuildBoost.cmake
-@@ -205,7 +205,7 @@ macro(build_boost version)
- endif()
- add_dependencies(Boost::${c} Boost)
- if(c MATCHES "^python")
-- set(c "python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
-+ set(c "python-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
- endif()
- if(Boost_USE_STATIC_LIBS)
- set(Boost_${upper_c}_LIBRARY
diff --git a/sys-cluster/ceph/files/ceph-14.2.5-boost-sonames.patch b/sys-cluster/ceph/files/ceph-14.2.5-boost-sonames.patch
deleted file mode 100644
index d8c26bcdfe21..000000000000
--- a/sys-cluster/ceph/files/ceph-14.2.5-boost-sonames.patch
+++ /dev/null
@@ -1,471 +0,0 @@
-diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake
-index f46cc0d485..39bb081b1b 100644
---- a/cmake/modules/BuildBoost.cmake
-+++ b/cmake/modules/BuildBoost.cmake
-@@ -199,13 +199,13 @@ macro(build_boost version)
- foreach(c ${Boost_BUILD_COMPONENTS})
- string(TOUPPER ${c} upper_c)
- if(Boost_USE_STATIC_LIBS)
-- add_library(Boost::${c} STATIC IMPORTED)
-+ add_library(Boost_${c} STATIC IMPORTED)
- else()
-- add_library(Boost::${c} SHARED IMPORTED)
-+ add_library(Boost_${c} SHARED IMPORTED)
- endif()
-- add_dependencies(Boost::${c} Boost)
-+ add_dependencies(Boost_${c} Boost)
- if(c MATCHES "^python")
-- set(c "python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
-+ set(c "python-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
- endif()
- if(Boost_USE_STATIC_LIBS)
- set(Boost_${upper_c}_LIBRARY
-@@ -215,7 +215,7 @@ macro(build_boost version)
- ${install_dir}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}boost_${c}${CMAKE_SHARED_LIBRARY_SUFFIX})
- endif()
- unset(buildid)
-- set_target_properties(Boost::${c} PROPERTIES
-+ set_target_properties(Boost_${c} PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}"
- IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
- IMPORTED_LOCATION "${Boost_${upper_c}_LIBRARY}")
-@@ -224,19 +224,19 @@ macro(build_boost version)
- foreach(c ${Boost_BUILD_COMPONENTS})
- if(Boost_${c}_DEPENDENCIES)
- foreach(dep ${Boost_${c}_DEPENDENCIES})
-- list(APPEND dependencies Boost::${dep})
-+ list(APPEND dependencies Boost_${dep})
- endforeach()
-- set_target_properties(Boost::${c} PROPERTIES
-+ set_target_properties(Boost_${c} PROPERTIES
- INTERFACE_LINK_LIBRARIES "${dependencies}")
- unset(dependencies)
- endif()
- endforeach()
-
- # for header-only libraries
-- add_library(Boost::boost INTERFACE IMPORTED)
-- set_target_properties(Boost::boost PROPERTIES
-+ add_library(Boost_boost INTERFACE IMPORTED)
-+ set_target_properties(Boost_boost PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}")
-- add_dependencies(Boost::boost Boost)
-+ add_dependencies(Boost_boost Boost)
- find_package_handle_standard_args(Boost DEFAULT_MSG
- Boost_INCLUDE_DIRS Boost_LIBRARIES)
- mark_as_advanced(Boost_LIBRARIES BOOST_INCLUDE_DIRS)
-@@ -253,7 +253,7 @@ function(maybe_add_boost_dep target)
- get_filename_component(ext ${src} EXT)
- # assuming all cxx source files include boost header(s)
- if(ext MATCHES ".cc|.cpp|.cxx")
-- add_dependencies(${target} Boost::boost)
-+ add_dependencies(${target} Boost_boost)
- return()
- endif()
- endforeach()
-diff --git a/cmake/modules/FindBoost.cmake b/cmake/modules/FindBoost.cmake
-index e2525b8934..e728e5a9d2 100644
---- a/cmake/modules/FindBoost.cmake
-+++ b/cmake/modules/FindBoost.cmake
-@@ -340,10 +340,6 @@ macro(_Boost_ADJUST_LIB_VARS basename)
-
- if(Boost_${basename}_LIBRARY AND Boost_${basename}_HEADER)
- set(Boost_${basename}_FOUND ON)
-- if("x${basename}" STREQUAL "xTHREAD" AND NOT TARGET Threads::Threads)
-- string(APPEND Boost_ERROR_REASON_THREAD " (missing dependency: Threads)")
-- set(Boost_THREAD_FOUND OFF)
-- endif()
- endif()
-
- endif()
-@@ -919,7 +915,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
- if (NOT _boost_DEPS_STRING)
- set(_boost_DEPS_STRING "(none)")
- endif()
-- # message(STATUS "Dependencies for Boost::${component}: ${_boost_DEPS_STRING}")
-+ # message(STATUS "Dependencies for Boost_${component}: ${_boost_DEPS_STRING}")
- endfunction()
-
- #
-@@ -1003,7 +999,7 @@ function(_Boost_COMPONENT_HEADERS component _hdrs)
- if (NOT _boost_HDRS_STRING)
- set(_boost_HDRS_STRING "(none)")
- endif()
-- # message(STATUS "Headers for Boost::${component}: ${_boost_HDRS_STRING}")
-+ # message(STATUS "Headers for Boost_${component}: ${_boost_HDRS_STRING}")
- endfunction()
-
- #
-@@ -1051,7 +1047,7 @@ endfunction()
-
- #
- # Some boost libraries may require particular set of compler features.
--# The very first one was `boost::fiber` introduced in Boost 1.62.
-+# The very first one was `boost_fiber` introduced in Boost 1.62.
- # One can check required compiler features of it in
- # - `${Boost_ROOT}/libs/fiber/build/Jamfile.v2`;
- # - `${Boost_ROOT}/libs/context/build/Jamfile.v2`.
-@@ -1178,7 +1174,7 @@ else()
- # _Boost_COMPONENT_HEADERS. See the instructions at the top of
- # _Boost_COMPONENT_DEPENDENCIES.
- set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
-- "1.70.0" "1.70" "1.69.0" "1.69"
-+ "1.71.0" "1.71" "1.70.0" "1.70" "1.69.0" "1.69"
- "1.68.0" "1.68" "1.67.0" "1.67" "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65"
- "1.64.0" "1.64" "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60"
- "1.59.0" "1.59" "1.58.0" "1.58" "1.57.0" "1.57" "1.56.0" "1.56" "1.55.0" "1.55"
-@@ -1235,10 +1231,10 @@ endif()
- # on all platforms to keep end user code free from platform dependent
- # code. Also provide convenience targets to disable autolinking and
- # enable dynamic linking.
--if(NOT TARGET Boost::diagnostic_definitions)
-- add_library(Boost::diagnostic_definitions INTERFACE IMPORTED)
-- add_library(Boost::disable_autolinking INTERFACE IMPORTED)
-- add_library(Boost::dynamic_linking INTERFACE IMPORTED)
-+if(NOT TARGET boost_diagnostic_definitions)
-+ add_library(boost_diagnostic_definitions INTERFACE IMPORTED)
-+ add_library(boost_disable_autolinking INTERFACE IMPORTED)
-+ add_library(boost_dynamic_linking INTERFACE IMPORTED)
- endif()
- if(WIN32)
- # In windows, automatic linking is performed, so you do not have
-@@ -1259,11 +1255,11 @@ if(WIN32)
- # code to emit a #pragma message each time a library is selected
- # for linking.
- set(Boost_LIB_DIAGNOSTIC_DEFINITIONS "-DBOOST_LIB_DIAGNOSTIC")
-- set_target_properties(Boost::diagnostic_definitions PROPERTIES
-+ set_target_properties(boost_diagnostic_definitions PROPERTIES
- INTERFACE_COMPILE_DEFINITIONS "BOOST_LIB_DIAGNOSTIC")
-- set_target_properties(Boost::disable_autolinking PROPERTIES
-+ set_target_properties(boost_disable_autolinking PROPERTIES
- INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_NO_LIB")
-- set_target_properties(Boost::dynamic_linking PROPERTIES
-+ set_target_properties(boost_dynamic_linking PROPERTIES
- INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_DYN_LINK")
- endif()
-
-@@ -1738,7 +1734,7 @@ if("thread" IN_LIST Boost_FIND_COMPONENTS)
- else()
- set(_Boost_find_quiet "")
- endif()
-- find_package(Threads ${_Boost_find_quiet})
-+ find_package(boost_thread ${_Boost_find_quiet})
- unset(_Boost_find_quiet)
- endif()
-
-@@ -2079,61 +2075,61 @@ endif()
-
- if(Boost_FOUND)
- # For header-only libraries
-- if(NOT TARGET Boost::boost)
-- add_library(Boost::boost INTERFACE IMPORTED)
-+ if(NOT TARGET Boost_boost)
-+ add_library(Boost_boost INTERFACE IMPORTED)
- if(Boost_INCLUDE_DIRS)
-- set_target_properties(Boost::boost PROPERTIES
-+ set_target_properties(Boost_boost PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}")
- endif()
- endif()
-
- foreach(COMPONENT ${Boost_FIND_COMPONENTS})
-- if(_Boost_IMPORTED_TARGETS AND NOT TARGET Boost::${COMPONENT})
-+ if(_Boost_IMPORTED_TARGETS AND NOT TARGET Boost_${COMPONENT})
- string(TOUPPER ${COMPONENT} UPPERCOMPONENT)
- if(Boost_${UPPERCOMPONENT}_FOUND)
- if(Boost_USE_STATIC_LIBS)
-- add_library(Boost::${COMPONENT} STATIC IMPORTED)
-+ add_library(Boost_${COMPONENT} STATIC IMPORTED)
- else()
- # Even if Boost_USE_STATIC_LIBS is OFF, we might have static
- # libraries as a result.
-- add_library(Boost::${COMPONENT} UNKNOWN IMPORTED)
-+ add_library(Boost_${COMPONENT} UNKNOWN IMPORTED)
- endif()
- if(Boost_INCLUDE_DIRS)
-- set_target_properties(Boost::${COMPONENT} PROPERTIES
-+ set_target_properties(Boost_${COMPONENT} PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}")
- endif()
- if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY}")
-- set_target_properties(Boost::${COMPONENT} PROPERTIES
-+ set_target_properties(Boost_${COMPONENT} PROPERTIES
- IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
- IMPORTED_LOCATION "${Boost_${UPPERCOMPONENT}_LIBRARY}")
- endif()
- if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}")
-- set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY
-+ set_property(TARGET Boost_${COMPONENT} APPEND PROPERTY
- IMPORTED_CONFIGURATIONS RELEASE)
-- set_target_properties(Boost::${COMPONENT} PROPERTIES
-+ set_target_properties(Boost_${COMPONENT} PROPERTIES
- IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX"
- IMPORTED_LOCATION_RELEASE "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}")
- endif()
- if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}")
-- set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY
-+ set_property(TARGET Boost_${COMPONENT} APPEND PROPERTY
- IMPORTED_CONFIGURATIONS DEBUG)
-- set_target_properties(Boost::${COMPONENT} PROPERTIES
-+ set_target_properties(Boost_${COMPONENT} PROPERTIES
- IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX"
- IMPORTED_LOCATION_DEBUG "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}")
- endif()
- if(_Boost_${UPPERCOMPONENT}_DEPENDENCIES)
- unset(_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES)
- foreach(dep ${_Boost_${UPPERCOMPONENT}_DEPENDENCIES})
-- list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Boost::${dep})
-+ list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Boost_${dep})
- endforeach()
- if(COMPONENT STREQUAL "thread")
-- list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Threads::Threads)
-+ list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES boost_thread)
- endif()
-- set_target_properties(Boost::${COMPONENT} PROPERTIES
-+ set_target_properties(Boost_${COMPONENT} PROPERTIES
- INTERFACE_LINK_LIBRARIES "${_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES}")
- endif()
- if(_Boost_${UPPERCOMPONENT}_COMPILER_FEATURES)
-- set_target_properties(Boost::${COMPONENT} PROPERTIES
-+ set_target_properties(Boost_${COMPONENT} PROPERTIES
- CXX_STANDARD 17)
- endif()
- endif()
-diff --git a/cmake/modules/Finddpdk.cmake b/cmake/modules/Finddpdk.cmake
-index 964ae5dfb0..92bf07c14e 100644
---- a/cmake/modules/Finddpdk.cmake
-+++ b/cmake/modules/Finddpdk.cmake
-@@ -102,9 +102,9 @@ if(dpdk_FOUND)
-
- if(NOT TARGET dpdk::dpdk)
- add_library(dpdk::dpdk INTERFACE IMPORTED)
-- find_package(Threads QUIET)
-+ find_package(boost_thread QUIET)
- list(APPEND dpdk_LIBRARIES
-- Threads::Threads
-+ boost_thread
- dpdk::cflags)
- set_target_properties(dpdk::dpdk PROPERTIES
- INTERFACE_LINK_LIBRARIES "${dpdk_LIBRARIES}"
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 28ec9835f8..31a1efa19f 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -356,12 +356,12 @@ set(ceph_common_objs
- set(ceph_common_deps
- json_spirit erasure_code arch crc32
- ${LIB_RESOLV}
-- Boost::thread
-- Boost::system
-- Boost::random
-- Boost::program_options
-- Boost::date_time
-- Boost::iostreams
-+ boost_thread
-+ boost_system
-+ boost_random
-+ boost_program_options
-+ boost_date_time
-+ boost_iostreams
- ${BLKID_LIBRARIES}
- ${Backtrace_LIBRARIES}
- ${BLKIN_LIBRARIES}
-@@ -522,7 +522,7 @@ if (WITH_CEPHFS)
- ceph_mds.cc)
- add_executable(ceph-mds ${ceph_mds_srcs})
- target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static ceph-common
-- Boost::thread)
-+ boost_thread)
- install(TARGETS ceph-mds DESTINATION bin)
- endif()
-
-diff --git a/src/crimson/CMakeLists.txt b/src/crimson/CMakeLists.txt
-index d7b58521d4..e1533af33f 100644
---- a/src/crimson/CMakeLists.txt
-+++ b/src/crimson/CMakeLists.txt
-@@ -106,8 +106,8 @@ target_link_libraries(crimson-common
- PRIVATE
- crc32
- crimson::cflags
-- Boost::iostreams
-- Boost::random
-+ boost_iostreams
-+ boost_random
- ${NSS_LIBRARIES} ${NSPR_LIBRARIES} OpenSSL::Crypto)
-
- set(crimson_auth_srcs
-diff --git a/src/mgr/CMakeLists.txt b/src/mgr/CMakeLists.txt
-index 252fb3e5e3..213482da16 100644
---- a/src/mgr/CMakeLists.txt
-+++ b/src/mgr/CMakeLists.txt
-@@ -26,7 +26,7 @@ target_include_directories(ceph-mgr SYSTEM PRIVATE "${PYTHON_INCLUDE_DIRS}")
- target_link_libraries(ceph-mgr
- osdc client heap_profiler
- global-static ceph-common
-- Boost::python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR}
-+ boost_python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR}
- ${MGR_PYTHON_LIBRARIES} ${CMAKE_DL_LIBS} ${GSSAPI_LIBRARIES})
- set_target_properties(ceph-mgr PROPERTIES
- POSITION_INDEPENDENT_CODE ${EXE_LINKER_USE_PIE})
-diff --git a/src/rbd_replay/CMakeLists.txt b/src/rbd_replay/CMakeLists.txt
-index e9d3804c5f..5c6eb58de1 100644
---- a/src/rbd_replay/CMakeLists.txt
-+++ b/src/rbd_replay/CMakeLists.txt
-@@ -36,7 +36,7 @@ if(HAVE_BABELTRACE)
- global
- babeltrace
- babeltrace-ctf
-- Boost::date_time
-+ boost_date_time
- )
- install(TARGETS rbd-replay-prep DESTINATION bin)
- endif(HAVE_BABELTRACE)
-diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
-index 82f5181f5b..8a51f140fb 100644
---- a/src/rgw/CMakeLists.txt
-+++ b/src/rgw/CMakeLists.txt
-@@ -202,7 +202,7 @@ if(WITH_CURL_OPENSSL)
- endif()
-
- if(WITH_BOOST_CONTEXT)
-- target_link_libraries(rgw_a PRIVATE Boost::coroutine Boost::context)
-+ target_link_libraries(rgw_a PRIVATE boost_coroutine boost_context)
- endif()
-
- set(rgw_libs rgw_a)
-@@ -353,7 +353,7 @@ if(WITH_RADOSGW_AMQP_ENDPOINT)
- target_link_libraries(rgw_admin_user PRIVATE RabbitMQ::RabbitMQ)
- endif()
- if(WITH_BOOST_CONTEXT)
-- target_link_libraries(rgw_admin_user PRIVATE Boost::coroutine Boost::context)
-+ target_link_libraries(rgw_admin_user PRIVATE boost_coroutine boost_context)
- endif()
-
- if(WITH_TESTS)
-diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
-index 5dcee1694d..60743be698 100644
---- a/src/test/CMakeLists.txt
-+++ b/src/test/CMakeLists.txt
-@@ -159,7 +159,7 @@ add_executable(ceph_omapbench
- )
- target_link_libraries(ceph_omapbench
- librados
-- Boost::program_options
-+ boost_program_options
- global
- ${BLKID_LIBRARIES}
- ${CMAKE_DL_LIBS}
-diff --git a/src/test/common/CMakeLists.txt b/src/test/common/CMakeLists.txt
-index 71fb77cda9..aff8fb6565 100644
---- a/src/test/common/CMakeLists.txt
-+++ b/src/test/common/CMakeLists.txt
-@@ -315,8 +315,8 @@ add_ceph_unittest(unittest_hobject)
-
- add_executable(unittest_async_completion test_async_completion.cc)
- add_ceph_unittest(unittest_async_completion)
--target_link_libraries(unittest_async_completion Boost::system)
-+target_link_libraries(unittest_async_completion boost_system)
-
- add_executable(unittest_async_shared_mutex test_async_shared_mutex.cc)
- add_ceph_unittest(unittest_async_shared_mutex)
--target_link_libraries(unittest_async_shared_mutex ceph-common Boost::system)
-+target_link_libraries(unittest_async_shared_mutex ceph-common boost_system)
-diff --git a/src/test/erasure-code/CMakeLists.txt b/src/test/erasure-code/CMakeLists.txt
-index 721f6c3675..1cd9635c77 100644
---- a/src/test/erasure-code/CMakeLists.txt
-+++ b/src/test/erasure-code/CMakeLists.txt
-@@ -2,15 +2,15 @@
- add_executable(ceph_erasure_code_benchmark
- ${CMAKE_SOURCE_DIR}/src/erasure-code/ErasureCode.cc
- ceph_erasure_code_benchmark.cc)
--target_link_libraries(ceph_erasure_code_benchmark ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph_erasure_code_benchmark ceph-common boost_program_options global ${CMAKE_DL_LIBS})
- install(TARGETS ceph_erasure_code_benchmark
- DESTINATION bin)
-
- add_executable(ceph_erasure_code_non_regression ceph_erasure_code_non_regression.cc)
--target_link_libraries(ceph_erasure_code_non_regression ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph_erasure_code_non_regression ceph-common boost_program_options global ${CMAKE_DL_LIBS})
-
- add_executable(ceph_erasure_code ceph_erasure_code.cc)
--target_link_libraries(ceph_erasure_code ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph_erasure_code ceph-common boost_program_options global ${CMAKE_DL_LIBS})
- install(TARGETS ceph_erasure_code
- DESTINATION bin)
-
-diff --git a/src/test/librados/CMakeLists.txt b/src/test/librados/CMakeLists.txt
-index 4fc53d2406..e6304394f8 100644
---- a/src/test/librados/CMakeLists.txt
-+++ b/src/test/librados/CMakeLists.txt
-@@ -62,7 +62,7 @@ add_executable(ceph_test_rados_api_asio asio.cc)
- target_link_libraries(ceph_test_rados_api_asio global
- librados ${UNITTEST_LIBS})
- if(WITH_BOOST_CONTEXT)
-- target_link_libraries(ceph_test_rados_api_asio Boost::coroutine Boost::context)
-+ target_link_libraries(ceph_test_rados_api_asio boost_coroutine boost_context)
- endif()
-
- add_executable(ceph_test_rados_api_list
-@@ -132,7 +132,7 @@ add_executable(ceph_test_rados_api_tier_pp
- tier_cxx.cc
- $)
- target_link_libraries(ceph_test_rados_api_tier_pp
-- librados global ${UNITTEST_LIBS} Boost::system radostest-cxx)
-+ librados global ${UNITTEST_LIBS} boost_system radostest-cxx)
-
- add_executable(ceph_test_rados_api_snapshots
- snapshots.cc)
-diff --git a/src/test/librbd/CMakeLists.txt b/src/test/librbd/CMakeLists.txt
-index 3c3e9db6c1..2c208c1a4f 100644
---- a/src/test/librbd/CMakeLists.txt
-+++ b/src/test/librbd/CMakeLists.txt
-@@ -27,7 +27,7 @@ target_link_libraries(rbd_test PRIVATE
- radostest
- radostest-cxx
- librados
-- Boost::thread
-+ boost_thread
- GMock::GMock
- GTest::GTest)
-
-diff --git a/src/test/rgw/CMakeLists.txt b/src/test/rgw/CMakeLists.txt
-index cde6348d57..e6ce738834 100644
---- a/src/test/rgw/CMakeLists.txt
-+++ b/src/test/rgw/CMakeLists.txt
-@@ -144,7 +144,7 @@ add_ceph_unittest(unittest_rgw_dmclock_scheduler)
- target_link_libraries(unittest_rgw_dmclock_scheduler radosgw_a dmclock)
- if(WITH_BOOST_CONTEXT)
- target_compile_definitions(unittest_rgw_dmclock_scheduler PRIVATE BOOST_COROUTINES_NO_DEPRECATION_WARNING)
-- target_link_libraries(unittest_rgw_dmclock_scheduler Boost::coroutine Boost::context)
-+ target_link_libraries(unittest_rgw_dmclock_scheduler boost_coroutine boost_context)
- endif()
-
- if(WITH_RADOSGW_AMQP_ENDPOINT)
-diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
-index d31f3d2408..6945018b11 100644
---- a/src/tools/CMakeLists.txt
-+++ b/src/tools/CMakeLists.txt
-@@ -35,20 +35,20 @@ install(PROGRAMS
- endif(WITH_TESTS)
-
- add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc)
--target_link_libraries(ceph-osdomap-tool os global Boost::program_options)
-+target_link_libraries(ceph-osdomap-tool os global boost_program_options)
- install(TARGETS ceph-osdomap-tool DESTINATION bin)
-
- add_executable(ceph-monstore-tool
- ceph_monstore_tool.cc
- ../mgr/mgr_commands.cc)
--target_link_libraries(ceph-monstore-tool os global Boost::program_options)
-+target_link_libraries(ceph-monstore-tool os global boost_program_options)
- install(TARGETS ceph-monstore-tool DESTINATION bin)
-
- add_executable(ceph-objectstore-tool
- ceph_objectstore_tool.cc
- rebuild_mondb.cc
- RadosDump.cc)
--target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS})
-+target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS})
- if(WITH_FUSE)
- target_link_libraries(ceph-objectstore-tool ${FUSE_LIBRARIES})
- endif(WITH_FUSE)
diff --git a/sys-cluster/glusterfs/glusterfs-6.8.ebuild b/sys-cluster/glusterfs/glusterfs-6.8.ebuild
index 5812e989cf9c..75c496e8940a 100644
--- a/sys-cluster/glusterfs/glusterfs-6.8.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-6.8.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV#9999} != ${PV} ]]; then
EGIT_REPO_URI="https://github.com/gluster/glusterfs.git"
else
SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~x86"
fi
DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index 0523d004e7aa..6e0b4af34a33 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -1,12 +1,9 @@
-DIST neutron-15.0.2.tar.gz 10523237 BLAKE2B d900a95286549ede403a988b206315cee911c0dfde198101c2961a39f3059ed2121352ca0d232eac2a8deacb55344de3073b821312d40156331064b8aa00add8 SHA512 36a2adcbecf7b168a4a8141bae29453bc8122e3400bff9987d2cfe40728896a0a55040c2fd7d98ecade27162e49bbd0918be712940a0c2b7b31984d0677d1dbe
DIST neutron-15.1.0.tar.gz 10549248 BLAKE2B f9e4dff7c8ae1568187284c2676a67a572902a67ccf08998dcc0620938e6a15320a69297771c9686dd19c93f4363c7193e1b9f3763ef7423c62a85df6ec155b6 SHA512 89d737c52fd098fab13bfe6548d9a723bfcf4c97e2f6669915d07efe55d5e707ab19ea1af8fa7c328b9426998cc835c5ddb619799949efb1a9291d0654ea7b1e
DIST neutron-16.0.0.tar.gz 12746070 BLAKE2B 659ae3bc6971393522dc98ee5b4eccddd85aae17571734f24571e13892376ad2d9a25c09224e703a5b89511c2d696b69842469789649a1f239115ad2422af951 SHA512 f2c23a04d75328b8a671ac65163e6f84cd48880864331f6713793a037a23043779656cfdbe4aab6772fb4e5f5c606db9d97f3d4f3dc8f234920381a9929778cc
-DIST neutron-configs-15.0.2.tar.gz 23546 BLAKE2B df706681e63e4f36b54be33a6619da15d642803f40afe737bd31426f9b3643a6a032cb8bfcb95899d1e67b759155fd14bb45f41460cefdc7d9f91d3377a90d5d SHA512 ef4555be50dfb81a0558ed28eb917a1d0634d913a2b0b58deeae3132a0e3c61521074b21d195e51e348a08b55c21919b537ac3c7122f4d5524ead824642292fe
DIST neutron-configs-15.1.0.tar.gz 23546 BLAKE2B df706681e63e4f36b54be33a6619da15d642803f40afe737bd31426f9b3643a6a032cb8bfcb95899d1e67b759155fd14bb45f41460cefdc7d9f91d3377a90d5d SHA512 ef4555be50dfb81a0558ed28eb917a1d0634d913a2b0b58deeae3132a0e3c61521074b21d195e51e348a08b55c21919b537ac3c7122f4d5524ead824642292fe
DIST neutron-configs-16.0.0.tar.gz 24350 BLAKE2B 8f6eeae762fa297651f07667387beac6677cfa9a6c0d13d3fc90ac09753022fd284fc56c53557ab83cda99ab4fe03acc2d2049e4bb62f9496b310b1cd6f42099 SHA512 b087b23a1aa19678d4b9a76ae82243d03fe82706712e8c37b759a8521062f79e83307769b4ba639f67aa402f8b03cdf12d3274d821c3f8ecfd17ded9f4f2c881
DIST neutron-configs-2019.2.9999.tar.gz 23546 BLAKE2B df706681e63e4f36b54be33a6619da15d642803f40afe737bd31426f9b3643a6a032cb8bfcb95899d1e67b759155fd14bb45f41460cefdc7d9f91d3377a90d5d SHA512 ef4555be50dfb81a0558ed28eb917a1d0634d913a2b0b58deeae3132a0e3c61521074b21d195e51e348a08b55c21919b537ac3c7122f4d5524ead824642292fe
DIST neutron-configs-2020.1.9999.tar.gz 24350 BLAKE2B 8f6eeae762fa297651f07667387beac6677cfa9a6c0d13d3fc90ac09753022fd284fc56c53557ab83cda99ab4fe03acc2d2049e4bb62f9496b310b1cd6f42099 SHA512 b087b23a1aa19678d4b9a76ae82243d03fe82706712e8c37b759a8521062f79e83307769b4ba639f67aa402f8b03cdf12d3274d821c3f8ecfd17ded9f4f2c881
-DIST neutron-ml2-plugins-15.0.2.tar.gz 8669 BLAKE2B 3c34a857c0e7dd4e5313f5f9a1bb22384aeae6d1e43e719c50eab8dc3e842e98f202eb12cbb788127603931292deeed802f0592bad232e6a05121939e3b26fe0 SHA512 0e6858425ee3d3e2233c8ebf19aa8e62b5ff849532a2fdceb953f384f3b33432137537afbb2878f23ec5eb57e185eda36a6d6ff71d8be5f32b43abcb5c186082
DIST neutron-ml2-plugins-15.1.0.tar.gz 8669 BLAKE2B 3c34a857c0e7dd4e5313f5f9a1bb22384aeae6d1e43e719c50eab8dc3e842e98f202eb12cbb788127603931292deeed802f0592bad232e6a05121939e3b26fe0 SHA512 0e6858425ee3d3e2233c8ebf19aa8e62b5ff849532a2fdceb953f384f3b33432137537afbb2878f23ec5eb57e185eda36a6d6ff71d8be5f32b43abcb5c186082
DIST neutron-ml2-plugins-16.0.0.tar.gz 8887 BLAKE2B 5887027ce4585a523bb3379c002acdde1faa9ed24d0c83c931f2a387b56e8baf8352ae9f82ba46c85a6a3e5b1d68792da1e1ca1fae9b6dde525e6f6c67849ac4 SHA512 4ae70fe3e386932e0327333d29dc526b5f0f0f800ac14d17faa4c1e3fc2dd8524760b84bbb4767e73e70647984aa50702e5e47dc42deb47f66c47c5e3e965111
DIST neutron-ml2-plugins-2019.2.9999.tar.gz 8669 BLAKE2B 3c34a857c0e7dd4e5313f5f9a1bb22384aeae6d1e43e719c50eab8dc3e842e98f202eb12cbb788127603931292deeed802f0592bad232e6a05121939e3b26fe0 SHA512 0e6858425ee3d3e2233c8ebf19aa8e62b5ff849532a2fdceb953f384f3b33432137537afbb2878f23ec5eb57e185eda36a6d6ff71d8be5f32b43abcb5c186082
diff --git a/sys-cluster/neutron/neutron-15.0.2.ebuild b/sys-cluster/neutron/neutron-15.0.2.ebuild
deleted file mode 100644
index 5deaec79742b..000000000000
--- a/sys-cluster/neutron/neutron-15.0.2.ebuild
+++ /dev/null
@@ -1,229 +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} )
-# still no 34 :( https://bugs.launchpad.net/neutron/+bug/1630439
-
-inherit distutils-r1 linux-info
-
-DESCRIPTION="A virtual network service for Openstack"
-HOMEPAGE="https://launchpad.net/neutron"
-if [[ ${PV} == *9999 ]];then
- inherit git-r3
- SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/train/configs.tar.gz -> neutron-configs-${PV}.tar.gz
- https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/train/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz"
- EGIT_REPO_URI="https://github.com/openstack/neutron.git"
- EGIT_BRANCH="stable/train"
-else
- SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/train/configs.tar.gz -> neutron-configs-${PV}.tar.gz
- https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/train/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz
- https://tarballs.openstack.org/${PN}/${P}.tar.gz"
- KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="compute-only dhcp haproxy ipv6 l3 metadata openvswitch linuxbridge server sqlite +mysql postgres"
-REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
- compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
- || ( openvswitch linuxbridge ) )"
-
-CDEPEND=">=dev-python/pbr-4.0.0[${PYTHON_USEDEP}]"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- ${CDEPEND}
- app-admin/sudo"
-
-RDEPEND="
- ${CDEPEND}
- >=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
- >=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
- >=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
- >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
- >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
- !~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
- >=dev-python/pecan-1.3.2[${PYTHON_USEDEP}]
- >=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
- >=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
- >=dev-python/jinja-2.10[${PYTHON_USEDEP}]
- >=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
- >=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
- >=dev-python/neutron-lib-1.29.1[${PYTHON_USEDEP}]
- >=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
- >=dev-python/tenacity-3.2.1[${PYTHON_USEDEP}]
- compute-only? (
- >=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
- )
- sqlite? (
- >=dev-python/sqlalchemy-1.2.0[sqlite,${PYTHON_USEDEP}]
- )
- mysql? (
- >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
- !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
- >=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
- )
- postgres? (
- >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
- >=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
- )
- >=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
- >=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
- >=dev-python/alembic-0.8.10[${PYTHON_USEDEP}]
- >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/stevedore-1.20.1[${PYTHON_USEDEP}]
- >=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
- >=dev-python/oslo-db-4.37.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
- >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-privsep-1.32.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
- >=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
- >=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-versionedobjects-1.35.1[${PYTHON_USEDEP}]
- >=dev-python/osprofiler-2.3.0[${PYTHON_USEDEP}]
- >=dev-python/os-ken-0.3.0[${PYTHON_USEDEP}]
- >=dev-python/ovs-2.8.0[${PYTHON_USEDEP}]
- >=dev-python/ovsdbapp-0.9.1[${PYTHON_USEDEP}]
- >=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
- >=dev-python/pyroute2-0.5.3[${PYTHON_USEDEP}]
- >=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
- >=dev-python/openstacksdk-0.31.2[${PYTHON_USEDEP}]
- >=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}]
- >=dev-python/os-xenapi-0.3.1[${PYTHON_USEDEP}]
- >=dev-python/os-vif-1.15.1[${PYTHON_USEDEP}]
- dev-python/pyudev[${PYTHON_USEDEP}]
- sys-apps/iproute2
- net-misc/iputils[arping]
- net-misc/bridge-utils
- net-firewall/ipset
- net-firewall/iptables
- net-firewall/ebtables
- net-firewall/conntrack-tools
- haproxy? ( net-proxy/haproxy )
- openvswitch? ( net-misc/openvswitch )
- ipv6? (
- net-misc/radvd
- >=net-misc/dibbler-1.0.1
- )
- dhcp? ( net-dns/dnsmasq[dhcp-tools] )
- acct-group/neutron
- acct-user/neutron"
-
-#PATCHES=(
-#)
-
-pkg_pretend() {
- linux-info_pkg_setup
- CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
- IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 \
- NF_NAT_IPV4 NF_NAT NF_CONNTRACK IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES"
- if linux_config_exists; then
- for module in ${CONFIG_CHECK_MODULES}; do
- linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
- done
- fi
-}
-
-pkg_config() {
- fperms 0700 /var/log/neutron
- fowners neutron:neutron /var/log neutron
-}
-
-src_prepare() {
- sed -i '/^hacking/d' test-requirements.txt || die
- # it's /bin/ip not /sbin/ip
- sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die
- distutils-r1_python_prepare_all
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- if use server; then
- newinitd "${FILESDIR}/neutron.initd" "neutron-server"
- newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
- dosym ../../plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini
- fi
- if use dhcp; then
- newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
- newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent"
- fi
- if use l3; then
- newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent"
- newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent"
- fi
- if use metadata; then
- newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent"
- newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent"
- fi
- if use openvswitch; then
- newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent"
- newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent"
- newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup"
- newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup"
- fi
- if use linuxbridge; then
- newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
- newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent"
- fi
- diropts -m 755 -o neutron -g neutron
- dodir /var/log/neutron /var/lib/neutron
- keepdir /etc/neutron
- insinto /etc/neutron
- insopts -m 0640 -o neutron -g neutron
-
- doins etc/*
- # stupid renames
- insinto /etc/neutron
- doins -r "etc/neutron/plugins"
- insopts -m 0640 -o root -g root
- doins "etc/rootwrap.conf"
- doins -r "etc/neutron/rootwrap.d"
-
- #add sudoers definitions for user neutron
- insinto /etc/sudoers.d/
- insopts -m 0440 -o root -g root
- newins "${FILESDIR}/neutron.sudoersd" neutron
-
- # add generated configs
- cd "${D}/etc/neutron" || die
- unpack "neutron-configs-${PV}.tar.gz"
- cd "${D}/etc/neutron/plugins/ml2" || die
- unpack "neutron-ml2-plugins-${PV}.tar.gz"
-
- # correcting perms
- fowners neutron:neutron -R "/etc/neutron"
- fperms o-rwx -R "/etc/neutron/"
-
- #remove superfluous stuff
- rm -R "${D}/usr/etc/"
-}
-
-python_install() {
- distutils-r1_python_install
- # copy migration conf file (not coppied on install via setup.py script)
- python_moduleinto neutron/db/migration/alembic_migrations
- python_domodule "neutron/db/migration/alembic_migrations/versions"
-}
-
-pkg_postinst() {
- elog
- elog "neutron-server's conf.d file may need updating to include additional ini files"
- elog "We currently assume the ml2 plugin will be used but do not make assumptions"
- elog "on if you will use openvswitch or linuxbridge (or something else)"
- elog
- elog "Other conf.d files may need updating too, but should be good for the default use case"
- elog
-}
diff --git a/sys-cluster/neutron/neutron-15.1.0.ebuild b/sys-cluster/neutron/neutron-15.1.0.ebuild
index 518d9465fd1a..5deaec79742b 100644
--- a/sys-cluster/neutron/neutron-15.1.0.ebuild
+++ b/sys-cluster/neutron/neutron-15.1.0.ebuild
@@ -19,7 +19,7 @@ else
SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/train/configs.tar.gz -> neutron-configs-${PV}.tar.gz
https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/train/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz
https://tarballs.openstack.org/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm64 x86"
fi
LICENSE="Apache-2.0"
diff --git a/sys-cluster/polysh/Manifest b/sys-cluster/polysh/Manifest
deleted file mode 100644
index 749bb651e360..000000000000
--- a/sys-cluster/polysh/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST polysh-0.4.tar.bz2 62770 BLAKE2B 267253299e62c00125f684c54b2930cbd9fd72dc20f6cd79a31918aa69b2504924e871ddc6bced79cc5995912675cbe91c1a27284b8dc510e1592863fe703676 SHA512 84d77a2272e9a5a577c17a4e1b791db0f8d2bf58f1ef4c52ebfbe7ba9396de3744bf6fafa72df126c3a3958d97bdb9feb8da002209b0dd0eb9b16b19b859e43d
diff --git a/sys-cluster/polysh/metadata.xml b/sys-cluster/polysh/metadata.xml
deleted file mode 100644
index 0477ed06c415..000000000000
--- a/sys-cluster/polysh/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
- Polysh is a tool to aggregate several remote shells into one. It is used to
- launch an interactive remote shell on many machines at once.
-
-
diff --git a/sys-cluster/polysh/polysh-0.4-r1.ebuild b/sys-cluster/polysh/polysh-0.4-r1.ebuild
deleted file mode 100644
index b6f9c52ccc77..000000000000
--- a/sys-cluster/polysh/polysh-0.4-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Aggregate several remote shells into one"
-HOMEPAGE="http://guichaz.free.fr/polysh/"
-SRC_URI="http://guichaz.free.fr/polysh/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
diff --git a/sys-cluster/rdma-core/rdma-core-28.0.ebuild b/sys-cluster/rdma-core/rdma-core-28.0.ebuild
index 66af444d7865..f476dc0f72b1 100644
--- a/sys-cluster/rdma-core/rdma-core-28.0.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-28.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then
EGIT_REPO_URI="https://github.com/linux-rdma/rdma-core"
else
SRC_URI="https://github.com/linux-rdma/rdma-core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
fi
LICENSE="|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )"
diff --git a/sys-cluster/zookeeper-bin/Manifest b/sys-cluster/zookeeper-bin/Manifest
index de398af670b5..0fdfe7b35059 100644
--- a/sys-cluster/zookeeper-bin/Manifest
+++ b/sys-cluster/zookeeper-bin/Manifest
@@ -1,4 +1,3 @@
-DIST apache-zookeeper-3.6.1-bin.tar.gz 12436328 BLAKE2B 73c8628826382d68171f12e6ff5baefc66c4569f6e7dfec53ce00a2fd8bcf5ec519c5aeb29e9d01762ca95205bdfce3748cdaa1c745cf254c38df6ee38117165 SHA512 1c5cb4d9886fae41bf244a446dd874b73c0fff7a5fc2dda4305041964420cde21e59b388dfd2551464a46bb6918d9d3c3c01ebe68fdbe782074ee360aa830c7d
DIST zookeeper-3.4.10.tar.gz 35042811 BLAKE2B c17100d2179688665cfc9efededd378543492e2a839df9da7ab72097b954200c527375cadae1d7b30d83c511c21c1470d0b86a4a19df5abe0c82980920cad92f SHA512 4c54e40ac8d0b267db4a188a30e39ed0ac2c3e8a8fadaf244be45ff5adee956df28f6cb9f1eb56f175e924fa3629b64f98286a090c46764c91c017613c80a51b
DIST zookeeper-3.4.11.tar.gz 36668066 BLAKE2B 4bf963d41280bd6227b4e81721576bf1f973a765c7049e78c5fae4d9dbc7e4d034304208af0f68b894bd4624e1945c9e4492b3217ff7f0e05d9b822c1843d96d SHA512 1ed2df11dbff2fbbb70d992d02427c4f694ccb4fe493db10a087b04d934b132b970956099edbdf1c2c636d5eb248bca1528846fcb449ae8bee4b9a82f7936f9e
DIST zookeeper-3.4.12.tar.gz 36667596 BLAKE2B e4aac98f86fc4fcc576ecfb55381fd37efe3fa56cebc1632abda59b6ba71fecca17ace29124ef9f59ca0de627ff463f9d6fc7ff7fbbe77c2bbf30ae25a9f99f8 SHA512 026c7feb4a660bf8d99b1b719fec2b7e4603c3c46f2b77bac372df15ed0ceb4d971aa9c954082d61d73929ef8dc38c31693604ae75244f746cafb4eb6e67320c
diff --git a/sys-cluster/zookeeper-bin/zookeeper-bin-3.6.1.ebuild b/sys-cluster/zookeeper-bin/zookeeper-bin-3.6.1.ebuild
deleted file mode 100644
index ce172dc53831..000000000000
--- a/sys-cluster/zookeeper-bin/zookeeper-bin-3.6.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils java-utils-2 user
-
-MY_P="zookeeper"
-MY_PN=${MY_P}-${PV}
-
-DESCRIPTION="A high-performance coordination service for distributed applications."
-HOMEPAGE="http://zookeeper.apache.org/"
-SRC_URI="https://downloads.apache.org/${MY_P}/${MY_PN}/apache-${MY_PN}-bin.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="mirror binchecks"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=virtual/jre-1.7"
-
-S=${WORKDIR}/apache-${MY_PN}-bin
-
-INSTALL_DIR=/opt/${PN}
-export CONFIG_PROTECT="${CONFIG_PROTECT} ${INSTALL_DIR}/conf"
-
-pkg_setup() {
- enewgroup zookeeper
- enewuser zookeeper -1 /bin/sh /var/lib/zookeeper zookeeper
-}
-
-src_install() {
- local DATA_DIR=/var/lib/${MY_P}
-
- rm bin/*.cmd || die
-
- keepdir "${DATA_DIR}"
- sed "s:^dataDir=.*:dataDir=${DATA_DIR}:" conf/zoo_sample.cfg > conf/zoo.cfg || die "sed failed"
- cp "${FILESDIR}"/log4j.properties conf/ || die "cp log4j conf failed"
-
- dodir "${INSTALL_DIR}"
- cp -a "${S}"/* "${D}${INSTALL_DIR}" || die "install failed"
-
- # data dir perms
- fowners zookeeper:zookeeper "${DATA_DIR}"
-
- # log dir
- keepdir /var/log/zookeeper
- fowners zookeeper:zookeeper /var/log/zookeeper
-
- # init script
- newinitd "${FILESDIR}"/zookeeper.initd zookeeper
- newconfd "${FILESDIR}"/zookeeper.confd zookeeper
-
- # env file
- cat > 99"${PN}" <<-EOF
- PATH=${INSTALL_DIR}/bin
- CONFIG_PROTECT=${INSTALL_DIR}/conf
- EOF
- doenvd 99"${PN}"
-}
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index b2394450e000..f4c5bea6c866 100644
Binary files a/sys-firmware/Manifest.gz and b/sys-firmware/Manifest.gz differ
diff --git a/sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild b/sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild
index 21b512890ba3..34c3700b7860 100644
--- a/sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild
+++ b/sys-firmware/ipxe/ipxe-1.0.0_p20180211.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"
@@ -9,7 +9,7 @@ GIT_REV="546dd51de8459d4d09958891f426fa2c73ff090d"
GIT_SHORT=${GIT_REV:0:7}
DESCRIPTION="Open source network boot (PXE) firmware"
-HOMEPAGE="http://ipxe.org/"
+HOMEPAGE="https://ipxe.org/"
SRC_URI="
!binary? ( https://git.ipxe.org/ipxe.git/snapshot/${GIT_REV}.tar.bz2 -> ${P}-${GIT_SHORT}.tar.bz2 )
binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-${GIT_SHORT}-bin.tar.xz )"
diff --git a/sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild b/sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild
index cb5cc15b84e7..a8318d879f45 100644
--- a/sys-firmware/ipxe/ipxe-1.0.0_p20190728.ebuild
+++ b/sys-firmware/ipxe/ipxe-1.0.0_p20190728.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"
@@ -9,7 +9,7 @@ GIT_REV="a4f8c6e31f6c62522cfc633bbbffa81b22f9d6f3"
GIT_SHORT=${GIT_REV:0:7}
DESCRIPTION="Open source network boot (PXE) firmware"
-HOMEPAGE="http://ipxe.org/"
+HOMEPAGE="https://ipxe.org/"
SRC_URI="
!binary? ( https://git.ipxe.org/ipxe.git/snapshot/${GIT_REV}.tar.bz2 -> ${P}-${GIT_SHORT}.tar.bz2 )
binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-${GIT_SHORT}-bin.tar.xz )"
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 9db36c93740c..1f75d69e2704 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r2.ebuild b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r2.ebuild
index f85dd453f968..715414b6a475 100644
--- a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r2.ebuild
+++ b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://darwinsource.opendarwin.org/tarballs/apsl/diskdev_cmds-${MY_PV}.
mirror://gentoo/diskdev_cmds-${PV}.patch.bz2"
LICENSE="APSL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ppc64 ~x86"
IUSE=""
DEPEND="dev-libs/openssl"
RDEPEND="${DEPEND}"
diff --git a/sys-fs/lsscsi/lsscsi-0.31.ebuild b/sys-fs/lsscsi/lsscsi-0.31.ebuild
index 95141f037da6..f9dec4bc2efa 100644
--- a/sys-fs/lsscsi/lsscsi-0.31.ebuild
+++ b/sys-fs/lsscsi/lsscsi-0.31.ebuild
@@ -9,4 +9,4 @@ SRC_URI="http://sg.danny.cz/scsi/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86"
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index ff2f3bc50d03..723e5266c20e 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index 0d0e2754a18e..84859c1ecdc9 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -1,8 +1,4 @@
-DIST linux-firmware-20190815.tar.gz 195268794 BLAKE2B bc67b4501e1d0c4375000bbcbae754b072a3769703eb214f85468d910f29becbe79f6989d3bf223ffa259326c964cbf153326b64d7756882165d29b576e13703 SHA512 99bcc1372ed51be1692cbc3c7b7c34940ee2f9b89f611afa5266b2b0825ed602cde27ff383edb776c1239eaf37002cd19be7cbb7cdf81e0721c3167d38018e9a
-DIST linux-firmware-20190923.tar.gz 198130120 BLAKE2B 21f337e8ef693513b5569ab67bf3ae2323f2c9109ce3fc7d6d0d071974dc8c53301eb21e0b1c279753e867873e4bb04274c0b2b5bfb1160aeaff2f2c92d7f26c SHA512 1421f283602fe889b6fba5d84eab1199c63c597a4fb487583bee188cfa01c7d41bde4ac53eee992a6aa1bb95a77126eee786f96fb682cd7992c5ec581601db54
-DIST linux-firmware-20191022.tar.gz 198935619 BLAKE2B 94d90a8e85af7104f08c398d3df20a88dc4d6f86d638565ab6e45e7fc5dff53e4e56a62a859585438812a1438ea7f7c4e4e47ce4adb22b0adf69439feb5803b4 SHA512 2cc99664c8d0275b670373581d7c6e29699f8b84cd6403949182cc1970c3241e5d9c388c34643630a237d87962b7c8e891445969ca9817ac92a4bbbe74e0dc0d
-DIST linux-firmware-20191215.tar.gz 203746264 BLAKE2B cd756ac1b1bde9706cd8321133da2e4e620a3236614427ae9836fc5e98fbc62e79060e6cf50717b41391fba9d56e16140f722ffcc5764e4b81ad2e798d1b41ec SHA512 75eb78ef642cc48dc3d8d2cdd7e5312b82ee3c9ebd6ead40a02fdc1d4329c5a9226237fa0ec8e617fc358cc12144dacf4ef6c1441fe444974c1506ef21ea70a0
-DIST linux-firmware-20200122.tar.gz 219807963 BLAKE2B 976cf7f8da61213a1210348cffdda8cae1b3f3a2d46aac05fe331fdff37e954620c2768f8941e0d4b6fff8c7b69d68b86516c9df9b9cf96538a4463b0957d1a2 SHA512 23500cc99d31597fe691341404cbe9375f7995783b4bf055a53a67ace380bdf9db1c247f12ae7e63ac02e4078e5089aa33e5cc6c2622b26dfaab4a65bfab1db3
DIST linux-firmware-20200316.tar.gz 221745284 BLAKE2B 6ab4944927420dd8c50d3a97beb32aff22917ab13b283c3358de9f5331479c2a4353dde68a221ac221e9ff5202e46cdaaab9b65cd0431a3984877ab44e2bd0ab SHA512 2fb16fcc474753902ab0236cbb116cdd5de10080d5ad5fc19a015ad3881a203c42beeccf5745e18346fc028a5c743d3d6439f0a04b86b2e0abf9f32aa5f55bad
DIST linux-firmware-20200421.tar.gz 223307272 BLAKE2B 0f598acd7e88b4dbe275509a6cd7709ee8f6dddf79b262be3967b0ec19f4b51e1deb7bd4be8b392af42a7dcf31e978126b3390b2748ee71fd0172318d5252ccf SHA512 3f8ec2150f9895381e71cb0d0d403694784c4a50f164da59d338dbb37bb643150bed2c6de4729d37f25989b8e799475a53319882c05a06d3eadcc4c349082162
DIST linux-firmware-20200519.tar.gz 234290201 BLAKE2B 00852b1e035f28aae5532d6ba92d547857ac6445e17b9f29b0954a460a1af9a98b348ad1700cd9f78baa83a2c63b657b6c10a8944188c6d4edf85c2336cc5763 SHA512 9724cf3d1aea73f264d53564ef160a62e90bb35766f3300bbbeaf7c7c6a356ef50c7d17bfa01197e8e991ff72b1aeef002bb78f5dc78243b2792cafbf1139dff
+DIST linux-firmware-20200619.tar.gz 250595335 BLAKE2B 9bb010b6600d02c536caf17502e54c5225934706eff747d7edaf55774f3c78841d3ff235b7eed037ff117e6e29e7ac11fec498fcace5c52f8b0ddd6b553b96f8 SHA512 9ee615f7d458e453ac53294cb920f322fa29c84255d127cd5f47fad178b0983e7e3fcd6be0b80bc6878c01258bdf75a1356ff6b6766279b10f352bfdb2e4b9a5
diff --git a/sys-kernel/linux-firmware/linux-firmware-20190815.ebuild b/sys-kernel/linux-firmware/linux-firmware-20190815.ebuild
deleted file mode 100644
index cf65c9dc98fb..000000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20190815.ebuild
+++ /dev/null
@@ -1,354 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit mount-boot savedconfig
-
-if [[ ${PV} == 99999999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
-else
- GIT_COMMIT="07b925b450bfb4cf3e141c612ec5b104658cd020"
- SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-fi
-
-DESCRIPTION="Linux firmware files"
-HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
-
-LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
- redistributable? (
- linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) )
- unknown-license? ( all-rights-reserved )"
-SLOT="0"
-IUSE="initramfs +redistributable savedconfig unknown-license"
-RESTRICT="binchecks strip
- unknown-license? ( bindist )"
-
-REQUIRED_USE="initramfs? ( redistributable )"
-
-BDEPEND="initramfs? ( app-arch/cpio )"
-
-#add anything else that collides to this
-RDEPEND="!savedconfig? (
- redistributable? (
- !sys-firmware/alsa-firmware[alsa_cards_ca0132]
- !media-tv/cx18-firmware
- ! "${UCODETMP}/early_cpio"
-
- local amd_ucode_file="${UCODEDIR}/AuthenticAMD.bin"
- cat "${S}"/amd-ucode/*.bin > "${amd_ucode_file}" || die "Failed to concat amd cpu ucode"
-
- if [[ ! -s "${amd_ucode_file}" ]]; then
- die "Sanity check failed: '${amd_ucode_file}' is empty!"
- fi
-
- pushd "${UCODETMP}" &>/dev/null || die
- find . -print0 | cpio --quiet --null -o -H newc -R 0:0 > "${S}"/amd-uc.img
- popd &>/dev/null || die
- if [[ ! -s "${S}/amd-uc.img" ]]; then
- die "Failed to create '${S}/amd-uc.img'!"
- fi
- else
- # If this will ever happen something has changed which
- # must be reviewed
- die "'${S}/amd-ucode' not found!"
- fi
- fi
-
- echo "# Remove files that shall not be installed from this list." > ${PN}.conf
- find * ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) >> ${PN}.conf
-
- if use savedconfig; then
- restore_config ${PN}.conf
-
- ebegin "Removing all files not listed in config"
- find ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) -printf "%P\n" \
- | grep -Fvx -f <(grep -v '^#' ${PN}.conf \
- || die "grep failed, empty config file?") \
- | xargs -d '\n' --no-run-if-empty rm
- eend $? || die
- fi
-
- # remove empty directories, bug #396073
- find -type d -empty -delete || die
-}
-
-src_install() {
- save_config ${PN}.conf
- rm ${PN}.conf || die
-
- if use initramfs ; then
- mkdir "${ED}/boot" || die
- mv "${S}"/amd-uc.img "${ED}/boot" || die
- fi
-
- if ! ( shopt -s failglob; : * ) 2>/dev/null; then
- eerror "No files to install. Check your USE flag settings"
- eerror "and the list of files in your saved configuration."
- die "Refusing to install an empty package"
- fi
-
- insinto /lib/firmware/
- doins -r *
-}
-
-pkg_preinst() {
- if use savedconfig; then
- ewarn "USE=savedconfig is active. You must handle file collisions manually."
- fi
-
- # Make sure /boot is available if needed.
- use initramfs && mount-boot_pkg_preinst
-}
-
-pkg_postinst() {
- elog "If you are only interested in particular firmware files, edit the saved"
- elog "configfile and remove those that you do not want."
-
- local ver
- for ver in ${REPLACING_VERSIONS}; do
- if ver_test ${ver} -lt 20190514; then
- elog
- elog 'Starting with version 20190514, installation of many firmware'
- elog 'files is controlled by USE flags. Please review your USE flag'
- elog 'and package.license settings if you are missing some files.'
- break
- fi
- done
-
- # Don't forget to umount /boot if it was previously mounted by us.
- use initramfs && mount-boot_pkg_postinst
-}
-
-pkg_prerm() {
- # Make sure /boot is mounted so that we can remove /boot/amd-uc.img!
- use initramfs && mount-boot_pkg_prerm
-}
-
-pkg_postrm() {
- # Don't forget to umount /boot if it was previously mounted by us.
- use initramfs && mount-boot_pkg_postrm
-}
diff --git a/sys-kernel/linux-firmware/linux-firmware-20191022.ebuild b/sys-kernel/linux-firmware/linux-firmware-20191022.ebuild
deleted file mode 100644
index b5f0efd8ab05..000000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20191022.ebuild
+++ /dev/null
@@ -1,354 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit mount-boot savedconfig
-
-if [[ ${PV} == 99999999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
-else
- GIT_COMMIT="2b016afc348ba4b5fb2016ffcb2822f4a293da0c"
- SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-fi
-
-DESCRIPTION="Linux firmware files"
-HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
-
-LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
- redistributable? (
- linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) )
- unknown-license? ( all-rights-reserved )"
-SLOT="0"
-IUSE="initramfs +redistributable savedconfig unknown-license"
-RESTRICT="binchecks strip
- unknown-license? ( bindist )"
-
-REQUIRED_USE="initramfs? ( redistributable )"
-
-BDEPEND="initramfs? ( app-arch/cpio )"
-
-#add anything else that collides to this
-RDEPEND="!savedconfig? (
- redistributable? (
- !sys-firmware/alsa-firmware[alsa_cards_ca0132]
- !media-tv/cx18-firmware
- ! "${UCODETMP}/early_cpio"
-
- local amd_ucode_file="${UCODEDIR}/AuthenticAMD.bin"
- cat "${S}"/amd-ucode/*.bin > "${amd_ucode_file}" || die "Failed to concat amd cpu ucode"
-
- if [[ ! -s "${amd_ucode_file}" ]]; then
- die "Sanity check failed: '${amd_ucode_file}' is empty!"
- fi
-
- pushd "${UCODETMP}" &>/dev/null || die
- find . -print0 | cpio --quiet --null -o -H newc -R 0:0 > "${S}"/amd-uc.img
- popd &>/dev/null || die
- if [[ ! -s "${S}/amd-uc.img" ]]; then
- die "Failed to create '${S}/amd-uc.img'!"
- fi
- else
- # If this will ever happen something has changed which
- # must be reviewed
- die "'${S}/amd-ucode' not found!"
- fi
- fi
-
- echo "# Remove files that shall not be installed from this list." > ${PN}.conf
- find * ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) >> ${PN}.conf
-
- if use savedconfig; then
- restore_config ${PN}.conf
-
- ebegin "Removing all files not listed in config"
- find ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) -printf "%P\n" \
- | grep -Fvx -f <(grep -v '^#' ${PN}.conf \
- || die "grep failed, empty config file?") \
- | xargs -d '\n' --no-run-if-empty rm
- eend $? || die
- fi
-
- # remove empty directories, bug #396073
- find -type d -empty -delete || die
-}
-
-src_install() {
- save_config ${PN}.conf
- rm ${PN}.conf || die
-
- if use initramfs ; then
- mkdir "${ED}/boot" || die
- mv "${S}"/amd-uc.img "${ED}/boot" || die
- fi
-
- if ! ( shopt -s failglob; : * ) 2>/dev/null; then
- eerror "No files to install. Check your USE flag settings"
- eerror "and the list of files in your saved configuration."
- die "Refusing to install an empty package"
- fi
-
- insinto /lib/firmware/
- doins -r *
-}
-
-pkg_preinst() {
- if use savedconfig; then
- ewarn "USE=savedconfig is active. You must handle file collisions manually."
- fi
-
- # Make sure /boot is available if needed.
- use initramfs && mount-boot_pkg_preinst
-}
-
-pkg_postinst() {
- elog "If you are only interested in particular firmware files, edit the saved"
- elog "configfile and remove those that you do not want."
-
- local ver
- for ver in ${REPLACING_VERSIONS}; do
- if ver_test ${ver} -lt 20190514; then
- elog
- elog 'Starting with version 20190514, installation of many firmware'
- elog 'files is controlled by USE flags. Please review your USE flag'
- elog 'and package.license settings if you are missing some files.'
- break
- fi
- done
-
- # Don't forget to umount /boot if it was previously mounted by us.
- use initramfs && mount-boot_pkg_postinst
-}
-
-pkg_prerm() {
- # Make sure /boot is mounted so that we can remove /boot/amd-uc.img!
- use initramfs && mount-boot_pkg_prerm
-}
-
-pkg_postrm() {
- # Don't forget to umount /boot if it was previously mounted by us.
- use initramfs && mount-boot_pkg_postrm
-}
diff --git a/sys-kernel/linux-firmware/linux-firmware-20191215.ebuild b/sys-kernel/linux-firmware/linux-firmware-20191215.ebuild
deleted file mode 100644
index 9ab4a3265a20..000000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20191215.ebuild
+++ /dev/null
@@ -1,354 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit mount-boot savedconfig
-
-if [[ ${PV} == 99999999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
-else
- GIT_COMMIT="f1100ddf581f49aa79a54b56fe6ef0815a7ae57e"
- SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-fi
-
-DESCRIPTION="Linux firmware files"
-HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
-
-LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
- redistributable? (
- linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) )
- unknown-license? ( all-rights-reserved )"
-SLOT="0"
-IUSE="initramfs +redistributable savedconfig unknown-license"
-RESTRICT="binchecks strip
- unknown-license? ( bindist )"
-
-REQUIRED_USE="initramfs? ( redistributable )"
-
-BDEPEND="initramfs? ( app-arch/cpio )"
-
-#add anything else that collides to this
-RDEPEND="!savedconfig? (
- redistributable? (
- !sys-firmware/alsa-firmware[alsa_cards_ca0132]
- !media-tv/cx18-firmware
- ! "${UCODETMP}/early_cpio"
-
- local amd_ucode_file="${UCODEDIR}/AuthenticAMD.bin"
- cat "${S}"/amd-ucode/*.bin > "${amd_ucode_file}" || die "Failed to concat amd cpu ucode"
-
- if [[ ! -s "${amd_ucode_file}" ]]; then
- die "Sanity check failed: '${amd_ucode_file}' is empty!"
- fi
-
- pushd "${UCODETMP}" &>/dev/null || die
- find . -print0 | cpio --quiet --null -o -H newc -R 0:0 > "${S}"/amd-uc.img
- popd &>/dev/null || die
- if [[ ! -s "${S}/amd-uc.img" ]]; then
- die "Failed to create '${S}/amd-uc.img'!"
- fi
- else
- # If this will ever happen something has changed which
- # must be reviewed
- die "'${S}/amd-ucode' not found!"
- fi
- fi
-
- echo "# Remove files that shall not be installed from this list." > ${PN}.conf
- find * ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) >> ${PN}.conf
-
- if use savedconfig; then
- restore_config ${PN}.conf
-
- ebegin "Removing all files not listed in config"
- find ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) -printf "%P\n" \
- | grep -Fvx -f <(grep -v '^#' ${PN}.conf \
- || die "grep failed, empty config file?") \
- | xargs -d '\n' --no-run-if-empty rm
- eend $? || die
- fi
-
- # remove empty directories, bug #396073
- find -type d -empty -delete || die
-}
-
-src_install() {
- save_config ${PN}.conf
- rm ${PN}.conf || die
-
- if use initramfs ; then
- mkdir "${ED}/boot" || die
- mv "${S}"/amd-uc.img "${ED}/boot" || die
- fi
-
- if ! ( shopt -s failglob; : * ) 2>/dev/null; then
- eerror "No files to install. Check your USE flag settings"
- eerror "and the list of files in your saved configuration."
- die "Refusing to install an empty package"
- fi
-
- insinto /lib/firmware/
- doins -r *
-}
-
-pkg_preinst() {
- if use savedconfig; then
- ewarn "USE=savedconfig is active. You must handle file collisions manually."
- fi
-
- # Make sure /boot is available if needed.
- use initramfs && mount-boot_pkg_preinst
-}
-
-pkg_postinst() {
- elog "If you are only interested in particular firmware files, edit the saved"
- elog "configfile and remove those that you do not want."
-
- local ver
- for ver in ${REPLACING_VERSIONS}; do
- if ver_test ${ver} -lt 20190514; then
- elog
- elog 'Starting with version 20190514, installation of many firmware'
- elog 'files is controlled by USE flags. Please review your USE flag'
- elog 'and package.license settings if you are missing some files.'
- break
- fi
- done
-
- # Don't forget to umount /boot if it was previously mounted by us.
- use initramfs && mount-boot_pkg_postinst
-}
-
-pkg_prerm() {
- # Make sure /boot is mounted so that we can remove /boot/amd-uc.img!
- use initramfs && mount-boot_pkg_prerm
-}
-
-pkg_postrm() {
- # Don't forget to umount /boot if it was previously mounted by us.
- use initramfs && mount-boot_pkg_postrm
-}
diff --git a/sys-kernel/linux-firmware/linux-firmware-20200122.ebuild b/sys-kernel/linux-firmware/linux-firmware-20200122.ebuild
deleted file mode 100644
index 48f34fefc553..000000000000
--- a/sys-kernel/linux-firmware/linux-firmware-20200122.ebuild
+++ /dev/null
@@ -1,354 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit mount-boot savedconfig
-
-if [[ ${PV} == 99999999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
-else
- GIT_COMMIT="1eb2408c6feacccd10b02a49214745f15d1c6fb7"
- SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-fi
-
-DESCRIPTION="Linux firmware files"
-HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git"
-
-LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
- redistributable? (
- linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) )
- unknown-license? ( all-rights-reserved )"
-SLOT="0"
-IUSE="initramfs +redistributable savedconfig unknown-license"
-RESTRICT="binchecks strip
- unknown-license? ( bindist )"
-
-REQUIRED_USE="initramfs? ( redistributable )"
-
-BDEPEND="initramfs? ( app-arch/cpio )"
-
-#add anything else that collides to this
-RDEPEND="!savedconfig? (
- redistributable? (
- !sys-firmware/alsa-firmware[alsa_cards_ca0132]
- !media-tv/cx18-firmware
- ! "${UCODETMP}/early_cpio"
-
- local amd_ucode_file="${UCODEDIR}/AuthenticAMD.bin"
- cat "${S}"/amd-ucode/*.bin > "${amd_ucode_file}" || die "Failed to concat amd cpu ucode"
-
- if [[ ! -s "${amd_ucode_file}" ]]; then
- die "Sanity check failed: '${amd_ucode_file}' is empty!"
- fi
-
- pushd "${UCODETMP}" &>/dev/null || die
- find . -print0 | cpio --quiet --null -o -H newc -R 0:0 > "${S}"/amd-uc.img
- popd &>/dev/null || die
- if [[ ! -s "${S}/amd-uc.img" ]]; then
- die "Failed to create '${S}/amd-uc.img'!"
- fi
- else
- # If this will ever happen something has changed which
- # must be reviewed
- die "'${S}/amd-ucode' not found!"
- fi
- fi
-
- echo "# Remove files that shall not be installed from this list." > ${PN}.conf
- find * ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) >> ${PN}.conf
-
- if use savedconfig; then
- restore_config ${PN}.conf
-
- ebegin "Removing all files not listed in config"
- find ! -type d ! \( -name ${PN}.conf -o -name amd-uc.img \) -printf "%P\n" \
- | grep -Fvx -f <(grep -v '^#' ${PN}.conf \
- || die "grep failed, empty config file?") \
- | xargs -d '\n' --no-run-if-empty rm
- eend $? || die
- fi
-
- # remove empty directories, bug #396073
- find -type d -empty -delete || die
-}
-
-src_install() {
- save_config ${PN}.conf
- rm ${PN}.conf || die
-
- if use initramfs ; then
- mkdir "${ED}/boot" || die
- mv "${S}"/amd-uc.img "${ED}/boot" || die
- fi
-
- if ! ( shopt -s failglob; : * ) 2>/dev/null; then
- eerror "No files to install. Check your USE flag settings"
- eerror "and the list of files in your saved configuration."
- die "Refusing to install an empty package"
- fi
-
- insinto /lib/firmware/
- doins -r *
-}
-
-pkg_preinst() {
- if use savedconfig; then
- ewarn "USE=savedconfig is active. You must handle file collisions manually."
- fi
-
- # Make sure /boot is available if needed.
- use initramfs && mount-boot_pkg_preinst
-}
-
-pkg_postinst() {
- elog "If you are only interested in particular firmware files, edit the saved"
- elog "configfile and remove those that you do not want."
-
- local ver
- for ver in ${REPLACING_VERSIONS}; do
- if ver_test ${ver} -lt 20190514; then
- elog
- elog 'Starting with version 20190514, installation of many firmware'
- elog 'files is controlled by USE flags. Please review your USE flag'
- elog 'and package.license settings if you are missing some files.'
- break
- fi
- done
-
- # Don't forget to umount /boot if it was previously mounted by us.
- use initramfs && mount-boot_pkg_postinst
-}
-
-pkg_prerm() {
- # Make sure /boot is mounted so that we can remove /boot/amd-uc.img!
- use initramfs && mount-boot_pkg_prerm
-}
-
-pkg_postrm() {
- # Don't forget to umount /boot if it was previously mounted by us.
- use initramfs && mount-boot_pkg_postrm
-}
diff --git a/sys-kernel/linux-firmware/linux-firmware-20190923.ebuild b/sys-kernel/linux-firmware/linux-firmware-20200619.ebuild
similarity index 90%
rename from sys-kernel/linux-firmware/linux-firmware-20190923.ebuild
rename to sys-kernel/linux-firmware/linux-firmware-20200619.ebuild
index e212d2e40887..29a17fd934b9 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20190923.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20200619.ebuild
@@ -8,8 +8,7 @@ if [[ ${PV} == 99999999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
else
- GIT_COMMIT="417a9c6e197a8d3eec792494efc87a2b42f76324"
- SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${PV}.tar.gz"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
fi
@@ -33,38 +32,16 @@ BDEPEND="initramfs? ( app-arch/cpio )"
RDEPEND="!savedconfig? (
redistributable? (
!sys-firmware/alsa-firmware[alsa_cards_ca0132]
- !media-tv/cx18-firmware
- ! ${P}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="audit berkdb +cracklib debug nis +pie selinux static-libs"
-
-BDEPEND="app-text/docbook-xml-dtd:4.1.2
- app-text/docbook-xml-dtd:4.3
- app-text/docbook-xml-dtd:4.4
- app-text/docbook-xml-dtd:4.5
- dev-libs/libxslt
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig"
-
-DEPEND="
- virtual/libcrypt:=[${MULTILIB_USEDEP}]
- >=virtual/libintl-0-r1[${MULTILIB_USEDEP}]
- audit? ( >=sys-process/audit-2.2.2[${MULTILIB_USEDEP}] )
- berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
- cracklib? ( >=sys-libs/cracklib-2.9.1-r1[${MULTILIB_USEDEP}] )
- selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
- nis? ( >=net-libs/libtirpc-0.2.4-r2[${MULTILIB_USEDEP}] )"
-
-RDEPEND="${DEPEND}"
-
-PDEPEND="sys-auth/pambase"
-
-S="${WORKDIR}/linux-${P}"
-
-src_prepare() {
- default
- eapply "${FILESDIR}/${PN}-remove-browsers.patch"
- touch ChangeLog || die
- eautoreconf
-}
-
-multilib_src_configure() {
- # Do not let user's BROWSER setting mess us up. #549684
- unset BROWSER
-
- # Disable automatic detection of libxcrypt; we _don't_ want the
- # user to link libxcrypt in by default, since we won't track the
- # dependency and allow to break PAM this way.
-
- export ac_cv_header_xcrypt_h=no
-
- local myconf=(
- --with-db-uniquename=-$(db_findver sys-libs/db)
- --enable-securedir="${EPREFIX}"/$(get_libdir)/security
- --libdir=/usr/$(get_libdir)
- --disable-prelude
- $(use_enable audit)
- $(use_enable berkdb db)
- $(use_enable cracklib)
- $(use_enable debug)
- $(use_enable nis)
- $(use_enable pie)
- $(use_enable selinux)
- $(use_enable static-libs static)
- --enable-isadir='.' #464016
- )
- ECONF_SOURCE="${S}" econf ${myconf[@]}
-}
-
-multilib_src_compile() {
- emake sepermitlockdir="${EPREFIX}/run/sepermit"
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install \
- sepermitlockdir="${EPREFIX}/run/sepermit"
-
- gen_usr_ldscript -a pam pam_misc pamc
-}
-
-multilib_src_install_all() {
- find "${ED}" -type f -name '*.la' -delete || die
-
- if use selinux; then
- dodir /usr/lib/tmpfiles.d
- cat - > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <
+
+
+
+ hydrapolic@gmail.com
+ Tomáš Mózes
+
+
+ whissi@gentoo.org
+ Thomas Deutschmann
+ Proxy
+
+
+ maxmind/mod_maxminddb
+
+
diff --git a/www-apache/mod_maxminddb/mod_maxminddb-1.2.0.ebuild b/www-apache/mod_maxminddb/mod_maxminddb-1.2.0.ebuild
new file mode 100644
index 000000000000..c0d42244f01a
--- /dev/null
+++ b/www-apache/mod_maxminddb/mod_maxminddb-1.2.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit apache-module autotools
+
+DESCRIPTION="MaxMind DB Apache Module"
+HOMEPAGE="https://maxmind.github.io/mod_maxminddb/"
+SRC_URI="https://github.com/maxmind/mod_maxminddb/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/libmaxminddb:="
+RDEPEND="${DEPEND}"
+
+need_apache2_4
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_compile() {
+ # skipping this results in:
+ # Cannot load modules/mod_maxminddb.so into server:
+ # /usr/lib64/apache2/modules/mod_maxminddb.so: undefined symbol: MMDB_aget_value
+ # because mod_maxminddb.so is not linked with libmaxminddb
+ emake
+}
+
+src_install() {
+ APACHE2_MOD_CONF="70_${PN}"
+ APACHE2_MOD_DEFINE="MAXMINDDB"
+ APACHE_MODULESDIR="/usr/$(get_libdir)/apache2/modules"
+
+ apache-module_src_install
+}
diff --git a/www-apache/mod_qos/Manifest b/www-apache/mod_qos/Manifest
index ee4444b1986a..f534059e406f 100644
--- a/www-apache/mod_qos/Manifest
+++ b/www-apache/mod_qos/Manifest
@@ -1 +1,2 @@
DIST mod_qos-11.61.tar.gz 1242978 BLAKE2B d784538e516abda338230ae9f2580217e3727f8aa22e5d1e881d605ade06444753c9f393a16ef8c683422bb989434b1152aa06955c3f5ba5b38e486d3cc4571b SHA512 c34a970e869238a1340a4bf32f3b21ac3e19cfb65a809989c45100aa1c3559ce0a5f5c30e6366f6d65ef04ad6fc1be73f80a9fc18b7a6a164912618cce6383a8
+DIST mod_qos-11.65.tar.gz 1247087 BLAKE2B 145af39814f974855520415c3bf114aa11ac9002784feace877c9777311fb77fa798fe5f61c7b63201ab5dd6d9582a1d141f421c7215ba3271a29cece13d02b0 SHA512 7a4363b7b5e31968188f2668003d88538134456c3e6eeaff7d200ebf46064139561da6adf9b96678f349bd296f2c502a2d2c9bfb8ae12f7c78e3edbe5c13de3b
diff --git a/www-apache/mod_qos/mod_qos-11.65.ebuild b/www-apache/mod_qos/mod_qos-11.65.ebuild
new file mode 100644
index 000000000000..765632d044a6
--- /dev/null
+++ b/www-apache/mod_qos/mod_qos-11.65.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools apache-module
+
+DESCRIPTION="A QOS module for the apache webserver"
+HOMEPAGE="http://mod-qos.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mod-qos/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-libs/libpcre:3
+ dev-libs/openssl:0=
+ media-libs/libpng:0=
+ sys-libs/zlib:0=
+"
+DEPEND="${DEPEND}"
+
+APXS2_S="${S}/apache2"
+APACHE2_MOD_CONF="10_${PN}"
+APACHE2_MOD_DEFINE="QOS"
+DOCFILES="${S}/doc/*.txt ${S}/README.TXT"
+
+need_apache2
+
+src_prepare() {
+ default
+
+ pushd "${S}"/tools &>/dev/null || die
+ eautoreconf
+ popd &>/dev/null || die
+}
+
+src_configure() {
+ pushd "${S}"/tools &>/dev/null || die
+ econf
+ popd &>/dev/null || die
+}
+
+src_compile() {
+ apache-module_src_compile
+ emake -C "${S}"/tools
+}
+
+src_install() {
+ einfo "Installing Apache module ..."
+ pushd "${S}"/tools &>/dev/null || die
+ apache-module_src_install
+ popd &>/dev/null || die
+
+ einfo "Installing module utilities ..."
+ emake -C "${S}"/tools install DESTDIR="${D}"
+
+ # installing html documentation
+ dohtml -r -x *.txt "${S}"/doc/
+}
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index a0589949e147..0e1a7e84188b 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index 07a436e29057..6264589930ee 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -1,6 +1,8 @@
DIST kibana-6.8.8-linux-x86_64.tar.gz 189162738 BLAKE2B 63ff29f7b2cf8bed931a473c0c33a9b9a82bbbd95ede171ad964e5855d56bd113981065ec12c0eb48f5e010d003229f3c91d9578a520e5909e04de5e5a635662 SHA512 f2104d1f83595cacf9ba3ce4225dc7044a251255afb62e494a7e3224cfbd280e5f51755c6a5c3452f8208fd8566ec6a11d51cd4453dc66cb8a8b158876fb4eae
DIST kibana-7.6.2-linux-x86_64.tar.gz 249555386 BLAKE2B e3db49bbf87de5c20dd8ae91a3835d27d10bcfa914b6cf6501eeddb229f896cdfbd78fa712c0ed63498a80a87ae48b0d2bac4218d8e1328c4c228f61e4c9b5d4 SHA512 5a7187f7fd1af3d4009053b904948fca08e171ea5eea36f8120019721d84b1649bdaf1bc606577ebad179bd4d24b014a1733c8221f67b1b7da2c756c68819311
DIST kibana-7.7.0-linux-x86_64.tar.gz 278962064 BLAKE2B 80ff28fc67d6b5d3b492a957e4cd2847364a86850abd60c468cad7d366fbbd9c406a5fd5c5e40e61ba7b5b333f0ee8c71f7c16f0da3f12fed8c81e20dec620ce SHA512 ea6e7ca12c43be627c54691e365827a2e42458ab443dedeb948a2aa2e63d1506859554a0eaef4ccdb9c03de836d4f2b4afda7daf25a826748351df2d15309b8b
+DIST kibana-7.8.0-linux-x86_64.tar.gz 334236568 BLAKE2B 17a3b593f978858bdf6910962391b3bfecb514f34b9734fb99028a4029a03603965eb3d8dae1e991782362b7963c58546abaab47ed8f3358574de93d50b94d31 SHA512 3c9ffbbfe56b66226ff62740cbe8eae83e43b07a1e3aec2ca845398c7d4418fd9c3cf67bebf5d9dd77c285468265c23c46080762cd90df070cd03ebe92b3ebef
DIST kibana-oss-6.8.8-linux-x86_64.tar.gz 66262509 BLAKE2B 76531791f024cf98c5ebe6840564f8f49cd3539370889f209ac0b89763ad71cfd23575789c7bdeb1ad0f6adff8ee555ece530e8fdcc6e51e0671e0a4ae0095c8 SHA512 64c839cf8c1bbddf776655f6674640bd01bbe97039b78f9fac0a95f425eea37825c5fa9a06b4e8bad4e8230db02424afa569a3adcd5d36164f3d6aada8b2f4e4
DIST kibana-oss-7.6.2-linux-x86_64.tar.gz 102252121 BLAKE2B f0b6571733b7eb5379491b8a27ee3b0ab49c643c73fd9ba53b0446f70deb059f788abf789037b9988ff398013c46653570c5ed3e539e76dd424b3ea624280e1c SHA512 639119273e0184640cf25513dd29633939c4bdc173e6577d377d60503db68989980fe09829fad8ba0862695dd7f79fd7dbd0102c3c2f9eb5e762071579a3d424
DIST kibana-oss-7.7.0-linux-x86_64.tar.gz 138321105 BLAKE2B 148782533116a46bcaa529282ab0f8fe818789538ffac12187e95486db8757f030423e416a810c09ee20ca182e6ce80441208777e891d91961f8fc718926c975 SHA512 ed29806990a032abfeca747edcf9162f4704be5774bbe394bbe6b34c5614c97e27a900a64e9b6e7b242767bdf31729c34903c86e9708fb066f83d8df76966152
+DIST kibana-oss-7.8.0-linux-x86_64.tar.gz 151100745 BLAKE2B d8159f2abe5276afb361e4e799b69190a34c816e8814afa6284882483362e976a6baaea0bddf2b71760410633ee7ada3141a0ecbf2b43f5d543de2e1abef4b91 SHA512 637c291623fdd10cd57a2599afe221d5af1724773a02da08a6ce808a6336a64d8278f7711fdaa95c6e1557c675d417698ec40c92062c5623917b78494dfe3d63
diff --git a/www-apps/kibana-bin/kibana-bin-7.8.0.ebuild b/www-apps/kibana-bin/kibana-bin-7.8.0.ebuild
new file mode 100644
index 000000000000..94d5e2d801f5
--- /dev/null
+++ b/www-apps/kibana-bin/kibana-bin-7.8.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+MY_PN="${PN%-bin}"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Analytics and search dashboard for Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/kibana"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz )
+ !x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-linux-x86_64.tar.gz )"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RDEPEND="
+ acct-group/kibana
+ acct-user/kibana
+ >=net-libs/nodejs-10.21.0
+ x-pack? (
+ dev-libs/expat
+ dev-libs/nss
+ )"
+
+S="${WORKDIR}/${MY_P}-linux-x86_64"
+
+src_prepare() {
+ default
+
+ # remove unused directory
+ rm -r data || die
+
+ # remove bundled nodejs
+ rm -r node || die
+ sed -i 's@\(^NODE="\).*@\1/usr/bin/node"@g' \
+ bin/kibana || die
+
+ # move optimize/plugins to /var/lib/kibana
+ rm -r optimize plugins || die
+
+ # handle node.js version with RDEPEND
+ sed -i /node_version_validator/d src/setup_node_env/index.js || die
+}
+
+src_install() {
+ insinto /etc/${MY_PN}
+ doins -r config/.
+ rm -r config || die
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
+
+ newconfd "${FILESDIR}"/${MY_PN}.confd ${MY_PN}
+ newinitd "${FILESDIR}"/${MY_PN}.initd ${MY_PN}
+ systemd_dounit "${FILESDIR}"/${MY_PN}.service
+
+ insinto /opt/${MY_PN}
+ doins -r .
+
+ fperms -R +x /opt/${MY_PN}/bin
+
+ diropts -m 0750 -o ${MY_PN} -g ${MY_PN}
+ keepdir /var/lib/${MY_PN}/optimize
+ keepdir /var/lib/${MY_PN}/plugins
+ keepdir /var/log/${MY_PN}
+
+ dosym ../../var/lib/kibana/optimize /opt/kibana/optimize # Bug 667214
+ dosym ../../var/lib/kibana/plugins /opt/kibana/plugins
+}
+
+pkg_postinst() {
+ ewarn "Kibana optimize/plugins directories were moved to /var/lib/kibana."
+ ewarn "In case of startup failures (FATAL Error: Cannot find module...),"
+ ewarn "please remove the optimize directory content:"
+ ewarn "rm -r /var/lib/kibana/optimize/*"
+ elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and"
+ elog "Node.js 10. Some plugins may fail with other versions of Node.js (Bug #656008)."
+ elog
+ elog "To set a customized Elasticsearch instance:"
+ elog " OpenRC: set ES_INSTANCE in /etc/conf.d/${MY_PN}"
+ elog " systemd: set elasticsearch.url in /etc/${MY_PN}/kibana.yml"
+ elog
+ elog "Elasticsearch can run local or remote."
+}
diff --git a/www-apps/mediawiki/mediawiki-1.34.2.ebuild b/www-apps/mediawiki/mediawiki-1.34.2.ebuild
index 32020160a1b1..acb4258b0468 100644
--- a/www-apps/mediawiki/mediawiki-1.34.2.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.34.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.mediawiki.org"
SRC_URI="http://releases.wikimedia.org/${PN}/${MY_BRANCH}/${P}.tar.gz"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~x86"
IUSE="imagemagick mysql postgres +sqlite"
REQUIRED_USE="|| ( mysql postgres sqlite )"
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 50e0c77afaaa..12d6fa675217 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index ec6120b2d524..39875559fb86 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,6 +1,6 @@
DIST chromium-83.0.4103.106.tar.xz 802630620 BLAKE2B b145fd04347ef252778c99931d2e6aebc4cb9c3b4340db13ede074ac0631fef3c530b6b8c348ad33576a1da828817a590339206cf941729ee01444350bec1683 SHA512 37d0298ec6794f753bc280352c9ea45d57dd5050240d468fd2a7465b2021ebb598cdc6c4538050dd1d626bcd4a146af87fb837619e08766d38d21821605bd3a8
DIST chromium-83.0.4103.116.tar.xz 802626772 BLAKE2B 6890d8f4a4a9b12ab56a63e037129f6b77f03f95a841494505fdbbe212b0dd756e5558bddd7ee186669929c6069568c76b70b179fe4a58ccad465f2d4677d6e5 SHA512 dbd92fb04183ec1402401388f70b18b95040083c9ea8bf2ea6b1692fddc375b090968b13afb010ebf412b480b34747eb2c82709adbeb386cccf60b972f23254f
-DIST chromium-84-patchset-1.tar.xz 17652 BLAKE2B 17008a5d7b81fd9dd3934f815922a10c4b33bd4b3a13b350011d60627133f2179c2e70a6e74ef11ddf9b68b83b988fad3df15e9307f871006ccb7aca52c819da SHA512 2a45183c60794256b150bf67aa8395bab113e77b338775f737ebd8a822fd17be776b786ad12ffa759774a8876e0976a1c285ef90257e9532cfd9952baba7096d
-DIST chromium-84.0.4147.45.tar.xz 845103524 BLAKE2B 8b1e1c052b2ff3968fc4f13215551b9bd53b2fe89f15512d064267e82e71909f267d4f91665b456ad84ec537601e4fbc097eebc45b461f967aa8fe997da2716c SHA512 d43ef067ed855813d3f003cc8f7302d433c924a58ea79bdafa3ec1fe35b4f71a24c4493389563bbc88744ee8fce9b1664c62548e975e0e5a97c823f90aacfe30
+DIST chromium-84-patchset-3.tar.xz 20148 BLAKE2B d910570b43f63bcf4ead90ca4e4005a08d7c85b5b4e7af2a70ec4bc18265cbe8b075523878710075cfee4e0631eb3374e1e6d06251f4bf03377954807b1951e9 SHA512 316db8b0359b10a988242a0d665475d912fa9b610a547478d8c39b337afc02780a54d7024e231eb4fd402063cf439f6e2b4bb92a4968c8e0c3e69d84a2ae1664
+DIST chromium-84.0.4147.68.tar.xz 845188784 BLAKE2B a0185a5aacc1297f6240e2d887e980c69ba1219267714fb82c87e2ec31e4a3bee24ea9c059fc4f56dcc5c3e576d0baf5b59ec3576fc266daac583cf2b2917b56 SHA512 c5304dfa76ec9bf1d7e96116b6560b77d636eaa226acf7be46798f4b161c6aba90c54bec797dfbf1e48ece46d4e52e44737ed68457f9b10bbc11658a9020bffd
DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
DIST xcb-proto-1.14.tar.xz 143384 BLAKE2B 60212b0f0ce039a64a2e6cbbc78564eeffc57cff20987b37dc780d8d97ae888a7dbfbbaadc6e0e4bedfc5d1e360f16318e3825ad8406de668d9c7c66cf7f4b5d SHA512 de66d568163b6da2be9d6c59984f3afa3acd119a781378638045fd68018665ef5c9af98f024e9962ba3eb7c7a4d85c27ba70ffafceb2324ccc6940f34de16690
diff --git a/www-client/chromium/chromium-84.0.4147.45.ebuild b/www-client/chromium/chromium-84.0.4147.45.ebuild
deleted file mode 100644
index d50cafdca25e..000000000000
--- a/www-client/chromium/chromium-84.0.4147.45.ebuild
+++ /dev/null
@@ -1,804 +0,0 @@
-# Copyright 2009-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
- hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
- sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="https://chromium.org/"
-XCB_PROTO_VERSION="1.14"
-PATCHSET="1"
-PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
- https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip
- https://www.x.org/releases/individual/proto/xcb-proto-${XCB_PROTO_VERSION}.tar.xz
- https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+closure-compile component-build cups cpu_flags_arm_neon +hangouts kerberos pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
-REQUIRED_USE="component-build? ( !suid )"
-
-COMMON_DEPEND="
- >=app-accessibility/at-spi2-atk-2.26:2
- app-arch/bzip2:=
- cups? ( >=net-print/cups-1.3.11:= )
- >=dev-libs/atk-2.26
- dev-libs/expat:=
- dev-libs/glib:2
- >=dev-libs/libxml2-2.9.4-r3:=[icu]
- dev-libs/nspr:=
- >=dev-libs/nss-3.26:=
- >=media-libs/alsa-lib-1.0.19:=
- media-libs/fontconfig:=
- media-libs/freetype:=
- >=media-libs/harfbuzz-2.4.0:0=[icu(-)]
- media-libs/libjpeg-turbo:=
- media-libs/libpng:=
- media-libs/mesa:=[gbm]
- system-libvpx? ( >=media-libs/libvpx-1.8.2:=[postproc,svc] )
- pulseaudio? ( media-sound/pulseaudio:= )
- system-ffmpeg? (
- >=media-video/ffmpeg-4:=
- || (
- media-video/ffmpeg[-samba]
- >=net-fs/samba-4.5.10-r1[-debug(-)]
- )
- >=media-libs/opus-1.3.1:=
- )
- sys-apps/dbus:=
- sys-apps/pciutils:=
- virtual/udev
- x11-libs/cairo:=
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3[X]
- x11-libs/libX11:=
- x11-libs/libXcomposite:=
- x11-libs/libXcursor:=
- x11-libs/libXdamage:=
- x11-libs/libXext:=
- x11-libs/libXfixes:=
- >=x11-libs/libXi-1.6.0:=
- x11-libs/libXrandr:=
- x11-libs/libXrender:=
- x11-libs/libXScrnSaver:=
- x11-libs/libXtst:=
- x11-libs/pango:=
- media-libs/flac:=
- >=media-libs/libwebp-0.4.0:=
- sys-libs/zlib:=[minizip]
- kerberos? ( virtual/krb5 )
-"
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND="${COMMON_DEPEND}
- x11-misc/xdg-utils
- virtual/opengl
- virtual/ttf-fonts
- selinux? ( sec-policy/selinux-chromium )
- tcmalloc? ( !=app-arch/gzip-1.7
- app-arch/unzip
- dev-lang/perl
- >=dev-util/gn-0.1726
- dev-vcs/git
- >=dev-util/gperf-3.0.3
- >=dev-util/ninja-1.7.2
- >=net-libs/nodejs-7.6.0[inspector]
- sys-apps/hwids[usb(+)]
- >=sys-devel/bison-2.4.3
- sys-devel/flex
- virtual/pkgconfig
- closure-compile? ( virtual/jre )
-"
-
-: ${CHROMIUM_FORCE_CLANG=no}
-: ${CHROMIUM_FORCE_LIBCXX=no}
-
-if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
- BDEPEND+=" >=sys-devel/clang-9"
-fi
-
-if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
- RDEPEND+=" >=sys-libs/libcxx-9"
- DEPEND+=" >=sys-libs/libcxx-9"
-else
- COMMON_DEPEND="
- app-arch/snappy:=
- dev-libs/libxslt:=
- >=dev-libs/re2-0.2019.08.01:=
- >=media-libs/openh264-1.6.0:=
- system-icu? ( >=dev-libs/icu-67.1:= )
- "
- RDEPEND+="${COMMON_DEPEND}"
- DEPEND+="${COMMON_DEPEND}"
-fi
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
- EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-
-For native file dialogs in KDE, install kde-apps/kdialog.
-
-To make password storage work with your desktop environment you may
-have install one of the supported credentials management applications:
-- app-crypt/libsecret (GNOME)
-- kde-frameworks/kwallet (KDE)
-If you have one of above packages installed, but don't want to use
-them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
-in /etc/chromium/default.
-"
-
-pre_build_checks() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- local -x CPP="$(tc-getCXX) -E"
- if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 9.2; then
- die "At least gcc 9.2 is required"
- fi
- # component build hangs with tcmalloc enabled due to sandbox issue, bug #695976.
- if has usersandbox ${FEATURES} && use tcmalloc && use component-build; then
- die "Component build with tcmalloc requires FEATURES=-usersandbox."
- fi
- if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || tc-is-clang; then
- if use component-build; then
- die "Component build with clang requires fuzzer headers."
- fi
- fi
- fi
-
- # Check build requirements, bug #541816 and bug #471810 .
- CHECKREQS_MEMORY="3G"
- CHECKREQS_DISK_BUILD="7G"
- if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
- if use custom-cflags || use component-build; then
- CHECKREQS_DISK_BUILD="25G"
- fi
- if ! use component-build; then
- CHECKREQS_MEMORY="16G"
- fi
- fi
- check-reqs_pkg_setup
-}
-
-pkg_pretend() {
- pre_build_checks
-}
-
-pkg_setup() {
- pre_build_checks
-
- chromium_suid_sandbox_check_kernel_config
-}
-
-src_prepare() {
- # Calling this here supports resumption via FEATURES=keepwork
- python_setup
-
- eapply "${WORKDIR}/patches"
-
- default
-
- mkdir -p third_party/node/linux/node-linux-x64/bin || die
- ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
- local keeplibs=(
- base/third_party/cityhash
- base/third_party/double_conversion
- base/third_party/dynamic_annotations
- base/third_party/icu
- base/third_party/nspr
- base/third_party/superfasthash
- base/third_party/symbolize
- base/third_party/valgrind
- base/third_party/xdg_mime
- base/third_party/xdg_user_dirs
- buildtools/third_party/libc++
- buildtools/third_party/libc++abi
- chrome/third_party/mozilla_security_manager
- courgette/third_party
- net/third_party/mozilla_security_manager
- net/third_party/nss
- net/third_party/quic
- net/third_party/uri_template
- third_party/abseil-cpp
- third_party/angle
- third_party/angle/src/common/third_party/base
- third_party/angle/src/common/third_party/smhasher
- third_party/angle/src/common/third_party/xxhash
- third_party/angle/src/third_party/compiler
- third_party/angle/src/third_party/libXNVCtrl
- third_party/angle/src/third_party/trace_event
- third_party/angle/src/third_party/volk
- third_party/angle/third_party/glslang
- third_party/angle/third_party/spirv-headers
- third_party/angle/third_party/spirv-tools
- third_party/angle/third_party/vulkan-headers
- third_party/angle/third_party/vulkan-loader
- third_party/angle/third_party/vulkan-tools
- third_party/angle/third_party/vulkan-validation-layers
- third_party/apple_apsl
- third_party/axe-core
- third_party/blink
- third_party/boringssl
- third_party/boringssl/src/third_party/fiat
- third_party/breakpad
- third_party/breakpad/breakpad/src/third_party/curl
- third_party/brotli
- third_party/cacheinvalidation
- third_party/catapult
- third_party/catapult/common/py_vulcanize/third_party/rcssmin
- third_party/catapult/common/py_vulcanize/third_party/rjsmin
- third_party/catapult/third_party/beautifulsoup4
- third_party/catapult/third_party/html5lib-python
- third_party/catapult/third_party/polymer
- third_party/catapult/third_party/six
- third_party/catapult/tracing/third_party/d3
- third_party/catapult/tracing/third_party/gl-matrix
- third_party/catapult/tracing/third_party/jpeg-js
- third_party/catapult/tracing/third_party/jszip
- third_party/catapult/tracing/third_party/mannwhitneyu
- third_party/catapult/tracing/third_party/oboe
- third_party/catapult/tracing/third_party/pako
- third_party/ced
- third_party/cld_3
- third_party/closure_compiler
- third_party/crashpad
- third_party/crashpad/crashpad/third_party/lss
- third_party/crashpad/crashpad/third_party/zlib
- third_party/crc32c
- third_party/cros_system_api
- third_party/dav1d
- third_party/dawn
- third_party/depot_tools
- third_party/devscripts
- third_party/devtools-frontend
- third_party/devtools-frontend/src/front_end/third_party/acorn
- third_party/devtools-frontend/src/front_end/third_party/codemirror
- third_party/devtools-frontend/src/front_end/third_party/fabricjs
- third_party/devtools-frontend/src/front_end/third_party/lighthouse
- third_party/devtools-frontend/src/front_end/third_party/wasmparser
- third_party/devtools-frontend/src/third_party
- third_party/dom_distiller_js
- third_party/emoji-segmenter
- third_party/flatbuffers
- third_party/freetype
- third_party/libgifcodec
- third_party/glslang
- third_party/google_input_tools
- third_party/google_input_tools/third_party/closure_library
- third_party/google_input_tools/third_party/closure_library/third_party/closure
- third_party/googletest
- third_party/harfbuzz-ng/utils
- third_party/hunspell
- third_party/iccjpeg
- third_party/inspector_protocol
- third_party/jinja2
- third_party/jsoncpp
- third_party/jstemplate
- third_party/khronos
- third_party/leveldatabase
- third_party/libXNVCtrl
- third_party/libaddressinput
- third_party/libaom
- third_party/libaom/source/libaom/third_party/vector
- third_party/libaom/source/libaom/third_party/x86inc
- third_party/libavif
- third_party/libjingle
- third_party/libphonenumber
- third_party/libsecret
- third_party/libsrtp
- third_party/libsync
- third_party/libudev
- third_party/libwebm
- third_party/libxml/chromium
- third_party/libyuv
- third_party/llvm
- third_party/lottie
- third_party/lss
- third_party/lzma_sdk
- third_party/mako
- third_party/markupsafe
- third_party/mesa
- third_party/metrics_proto
- third_party/modp_b64
- third_party/nasm
- third_party/node
- third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
- third_party/one_euro_filter
- third_party/openscreen
- third_party/openscreen/src/third_party/mozilla
- third_party/openscreen/src/third_party/tinycbor/src/src
- third_party/ots
- third_party/pdfium
- third_party/pdfium/third_party/agg23
- third_party/pdfium/third_party/base
- third_party/pdfium/third_party/bigint
- third_party/pdfium/third_party/freetype
- third_party/pdfium/third_party/lcms
- third_party/pdfium/third_party/libopenjpeg20
- third_party/pdfium/third_party/libpng16
- third_party/pdfium/third_party/libtiff
- third_party/pdfium/third_party/skia_shared
- third_party/perfetto
- third_party/pffft
- third_party/ply
- third_party/polymer
- third_party/private-join-and-compute
- third_party/protobuf
- third_party/protobuf/third_party/six
- third_party/pyjson5
- third_party/qcms
- third_party/rnnoise
- third_party/s2cellid
- third_party/schema_org
- third_party/simplejson
- third_party/skia
- third_party/skia/include/third_party/skcms
- third_party/skia/include/third_party/vulkan
- third_party/skia/third_party/skcms
- third_party/skia/third_party/vulkan
- third_party/smhasher
- third_party/spirv-headers
- third_party/SPIRV-Tools
- third_party/sqlite
- third_party/swiftshader
- third_party/swiftshader/third_party/astc-encoder
- third_party/swiftshader/third_party/llvm-7.0
- third_party/swiftshader/third_party/llvm-subzero
- third_party/swiftshader/third_party/marl
- third_party/swiftshader/third_party/subzero
- third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1
- third_party/unrar
- third_party/usrsctp
- third_party/vulkan
- third_party/web-animations-js
- third_party/webdriver
- third_party/webrtc
- third_party/webrtc/common_audio/third_party/ooura
- third_party/webrtc/common_audio/third_party/spl_sqrt_floor
- third_party/webrtc/modules/third_party/fft
- third_party/webrtc/modules/third_party/g711
- third_party/webrtc/modules/third_party/g722
- third_party/webrtc/rtc_base/third_party/base64
- third_party/webrtc/rtc_base/third_party/sigslot
- third_party/widevine
- third_party/woff2
- third_party/wuffs
- third_party/zlib/google
- tools/grit/third_party/six
- url/third_party/mozilla
- v8/src/third_party/siphash
- v8/src/third_party/valgrind
- v8/src/third_party/utf8-decoder
- v8/third_party/inspector_protocol
- v8/third_party/v8
-
- # gyp -> gn leftovers
- base/third_party/libevent
- third_party/adobe
- third_party/speech-dispatcher
- third_party/usb_ids
- third_party/xdg-utils
- )
- if ! use system-ffmpeg; then
- keeplibs+=( third_party/ffmpeg third_party/opus )
- fi
- if ! use system-icu; then
- keeplibs+=( third_party/icu )
- fi
- if ! use system-libvpx; then
- keeplibs+=( third_party/libvpx )
- keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
-
- # we need to generate ppc64 stuff because upstream does not ship it yet
- # it has to be done before unbundling.
- if use ppc64; then
- pushd third_party/libvpx >/dev/null || die
- mkdir -p source/config/linux/ppc64 || die
- ./generate_gni.sh || die
- popd >/dev/null || die
- fi
- fi
- if use tcmalloc; then
- keeplibs+=( third_party/tcmalloc )
- fi
- if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
- keeplibs+=( third_party/libxml )
- keeplibs+=( third_party/libxslt )
- keeplibs+=( third_party/openh264 )
- keeplibs+=( third_party/re2 )
- keeplibs+=( third_party/snappy )
- if use system-icu; then
- keeplibs+=( third_party/icu )
- fi
- fi
- # Remove most bundled libraries. Some are still needed.
- build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
-}
-
-src_configure() {
- # Calling this here supports resumption via FEATURES=keepwork
- python_setup
-
- local myconf_gn=""
-
- # Make sure the build system will use the right tools, bug #340795.
- tc-export AR CC CXX NM
-
- if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then
- # Force clang since gcc is pretty broken at the moment.
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- strip-unsupported-flags
- fi
-
- if tc-is-clang; then
- myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
- else
- if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
- die "Compiling with sys-libs/libcxx requires clang."
- fi
- myconf_gn+=" is_clang=false"
- fi
-
- # Define a custom toolchain for GN
- myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
- if tc-is-cross-compiler; then
- tc-export BUILD_{AR,CC,CXX,NM}
- myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
- myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
- else
- myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
- fi
-
- # GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
- myconf_gn+=" is_debug=false"
-
- # Component build isn't generally intended for use by end users. It's mostly useful
- # for development and debugging.
- myconf_gn+=" is_component_build=$(usex component-build true false)"
-
- myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
-
- # Disable nacl, we can't build without pnacl (http://crbug.com/269560).
- myconf_gn+=" enable_nacl=false"
-
- # Use system-provided libraries.
- # TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
- # TODO: use_system_hunspell (upstream changes needed).
- # TODO: use_system_libsrtp (bug #459932).
- # TODO: use_system_protobuf (bug #525560).
- # TODO: use_system_ssl (http://crbug.com/58087).
- # TODO: use_system_sqlite (http://crbug.com/22208).
-
- # libevent: https://bugs.gentoo.org/593458
- local gn_system_libraries=(
- flac
- fontconfig
- freetype
- # Need harfbuzz_from_pkgconfig target
- #harfbuzz-ng
- libdrm
- libjpeg
- libpng
- libwebp
- zlib
- )
- if use system-ffmpeg; then
- gn_system_libraries+=( ffmpeg opus )
- fi
- if use system-icu; then
- gn_system_libraries+=( icu )
- fi
- if use system-libvpx; then
- gn_system_libraries+=( libvpx )
- fi
- if [[ ${CHROMIUM_FORCE_LIBCXX} != yes ]]; then
- # unbundle only without libc++, because libc++ is not fully ABI compatible with libstdc++
- gn_system_libraries+=( libxml )
- gn_system_libraries+=( libxslt )
- gn_system_libraries+=( openh264 )
- gn_system_libraries+=( re2 )
- gn_system_libraries+=( snappy )
- fi
- build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
-
- # See dependency logic in third_party/BUILD.gn
- myconf_gn+=" use_system_harfbuzz=true"
-
- # Disable deprecated libgnome-keyring dependency, bug #713012
- myconf_gn+=" use_gnome_keyring=false"
-
- # Optional dependencies.
- myconf_gn+=" closure_compile=$(usex closure-compile true false)"
- myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
- myconf_gn+=" enable_widevine=$(usex widevine true false)"
- myconf_gn+=" use_cups=$(usex cups true false)"
- myconf_gn+=" use_kerberos=$(usex kerberos true false)"
- myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-
- # TODO: link_pulseaudio=true for GN.
-
- myconf_gn+=" fieldtrial_testing_like_official_build=true"
-
- # Never use bundled gold binary. Disable gold linker flags for now.
- # Do not use bundled clang.
- # Trying to use gold results in linker crash.
- myconf_gn+=" use_gold=false use_sysroot=false use_custom_libcxx=false"
-
- # Disable forced lld, bug 641556
- myconf_gn+=" use_lld=false"
-
- ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
- myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
- myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
- # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
- # Note: these are for Gentoo use ONLY. For your own distribution,
- # please get your own set of keys. Feel free to contact chromium@gentoo.org
- # for more info.
- local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
- myconf_gn+=" google_api_key=\"${google_api_key}\""
- myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
- myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
- local myarch="$(tc-arch)"
-
- # Avoid CFLAGS problems, bug #352457, bug #390147.
- if ! use custom-cflags; then
- replace-flags "-Os" "-O2"
- strip-flags
-
- # Debug info section overflows without component build
- # Prevent linker from running out of address space, bug #471810 .
- if ! use component-build || use x86; then
- filter-flags "-g*"
- fi
-
- # Prevent libvpx build failures. Bug 530248, 544702, 546984.
- if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
- filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4
- fi
- fi
-
- if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
- append-flags -stdlib=libc++
- append-ldflags -stdlib=libc++
- fi
-
- if [[ $myarch = amd64 ]] ; then
- myconf_gn+=" target_cpu=\"x64\""
- ffmpeg_target_arch=x64
- elif [[ $myarch = x86 ]] ; then
- myconf_gn+=" target_cpu=\"x86\""
- ffmpeg_target_arch=ia32
-
- # This is normally defined by compiler_cpu_abi in
- # build/config/compiler/BUILD.gn, but we patch that part out.
- append-flags -msse2 -mfpmath=sse -mmmx
- elif [[ $myarch = arm64 ]] ; then
- myconf_gn+=" target_cpu=\"arm64\""
- ffmpeg_target_arch=arm64
- elif [[ $myarch = arm ]] ; then
- myconf_gn+=" target_cpu=\"arm\""
- ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
- elif [[ $myarch = ppc64 ]] ; then
- myconf_gn+=" target_cpu=\"ppc64\""
- ffmpeg_target_arch=ppc64
- else
- die "Failed to determine target arch, got '$myarch'."
- fi
-
- # Make sure that -Werror doesn't get added to CFLAGS by the build system.
- # Depending on GCC version the warnings are different and we don't want
- # the build to fail because of that.
- myconf_gn+=" treat_warnings_as_errors=false"
-
- # Disable fatal linker warnings, bug 506268.
- myconf_gn+=" fatal_linker_warnings=false"
-
- # Bug 491582.
- export TMPDIR="${WORKDIR}/temp"
- mkdir -p -m 755 "${TMPDIR}" || die
-
- # https://bugs.gentoo.org/654216
- addpredict /dev/dri/ #nowarn
-
- #if ! use system-ffmpeg; then
- if false; then
- local build_ffmpeg_args=""
- if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
- build_ffmpeg_args+=" --disable-asm"
- fi
-
- # Re-configure bundled ffmpeg. See bug #491378 for example reasons.
- einfo "Configuring bundled ffmpeg..."
- pushd third_party/ffmpeg > /dev/null || die
- chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
- --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
- chromium/scripts/copy_config.sh || die
- chromium/scripts/generate_gn.py || die
- popd > /dev/null || die
- fi
-
- # Chromium relies on this, but was disabled in >=clang-10, crbug.com/1042470
- append-cxxflags $(test-flags-CXX -flax-vector-conversions=all)
-
- # Explicitly disable ICU data file support for system-icu builds.
- if use system-icu; then
- myconf_gn+=" icu_use_data_file=false"
- fi
-
- # Use bundled xcb-proto, bug #727000
- myconf_gn+=" xcbproto_path=\"${WORKDIR}/xcb-proto-${XCB_PROTO_VERSION}/src\""
-
- einfo "Configuring Chromium..."
- set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
- echo "$@"
- "$@" || die
-}
-
-src_compile() {
- # Final link uses lots of file descriptors.
- ulimit -n 2048
-
- # Calling this here supports resumption via FEATURES=keepwork
- python_setup
-
- # https://bugs.gentoo.org/717456
- # Use bundled xcb-proto, because system xcb-proto doesn't have Python 2.7 support
- local -x PYTHONPATH="${WORKDIR}/setuptools-44.1.0:${WORKDIR}/xcb-proto-${XCB_PROTO_VERSION}${PYTHONPATH+:}${PYTHONPATH}"
-
- #"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
-
- # Build mksnapshot and pax-mark it.
- local x
- for x in mksnapshot v8_context_snapshot_generator; do
- if tc-is-cross-compiler; then
- eninja -C out/Release "host/${x}"
- pax-mark m "out/Release/host/${x}"
- else
- eninja -C out/Release "${x}"
- pax-mark m "out/Release/${x}"
- fi
- done
-
- # Even though ninja autodetects number of CPUs, we respect
- # user's options, for debugging with -j 1 or any other reason.
- eninja -C out/Release chrome chromedriver
- use suid && eninja -C out/Release chrome_sandbox
-
- pax-mark m out/Release/chrome
-
- # Build manpage; bug #684550
- sed -e 's|@@PACKAGE@@|chromium-browser|g;
- s|@@MENUNAME@@|Chromium|g;' \
- chrome/app/resources/manpage.1.in > \
- out/Release/chromium-browser.1 || die
-
- # Build desktop file; bug #706786
- sed -e 's|@@MENUNAME@@|Chromium|g;
- s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
- s|@@PACKAGE@@|chromium-browser|g;
- s|\(^Exec=\)/usr/bin/|\1|g;' \
- chrome/installer/linux/common/desktop.template > \
- out/Release/chromium-browser-chromium.desktop || die
-}
-
-src_install() {
- local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
- exeinto "${CHROMIUM_HOME}"
- doexe out/Release/chrome
-
- if use suid; then
- newexe out/Release/chrome_sandbox chrome-sandbox
- fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
- fi
-
- doexe out/Release/chromedriver
-
- local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
- sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
- doexe chromium-launcher.sh
-
- # It is important that we name the target "chromium-browser",
- # xdg-utils expect it; bug #355517.
- dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
- # keep the old symlink around for consistency
- dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
- dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
- # Allow users to override command-line options, bug #357629.
- insinto /etc/chromium
- newins "${FILESDIR}/chromium.default" "default"
-
- pushd out/Release/locales > /dev/null || die
- chromium_remove_language_paks
- popd
-
- insinto "${CHROMIUM_HOME}"
- doins out/Release/*.bin
- doins out/Release/*.pak
- doins out/Release/*.so
-
- if ! use system-icu; then
- doins out/Release/icudtl.dat
- fi
-
- doins -r out/Release/locales
- doins -r out/Release/resources
-
- if [[ -d out/Release/swiftshader ]]; then
- insinto "${CHROMIUM_HOME}/swiftshader"
- doins out/Release/swiftshader/*.so
- fi
-
- # Install icons
- local branding size
- for size in 16 24 32 48 64 128 256 ; do
- case ${size} in
- 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
- *) branding="chrome/app/theme/chromium" ;;
- esac
- newicon -s ${size} "${branding}/product_logo_${size}.png" \
- chromium-browser.png
- done
-
- # Install desktop entry
- domenu out/Release/chromium-browser-chromium.desktop
-
- # Install GNOME default application entry (bug #303100).
- insinto /usr/share/gnome-control-center/default-apps
- newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
- # Install manpage; bug #684550
- doman out/Release/chromium-browser.1
- dosym chromium-browser.1 /usr/share/man/man1/chromium.1
-
- readme.gentoo_create_doc
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
- readme.gentoo_print_elog
-}
diff --git a/www-client/chromium/chromium-84.0.4147.45-r1.ebuild b/www-client/chromium/chromium-84.0.4147.68.ebuild
similarity index 93%
rename from www-client/chromium/chromium-84.0.4147.45-r1.ebuild
rename to www-client/chromium/chromium-84.0.4147.68.ebuild
index 966c8a05a06d..fa4201cf1b12 100644
--- a/www-client/chromium/chromium-84.0.4147.45-r1.ebuild
+++ b/www-client/chromium/chromium-84.0.4147.68.ebuild
@@ -13,7 +13,7 @@ inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-util
DESCRIPTION="Open-source version of Google Chrome web browser"
HOMEPAGE="https://chromium.org/"
XCB_PROTO_VERSION="1.14"
-PATCHSET="1"
+PATCHSET="3"
PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip
@@ -23,15 +23,31 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+closure-compile component-build cups cpu_flags_arm_neon +hangouts kerberos pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
+IUSE="+closure-compile component-build cups cpu_flags_arm_neon +hangouts headless kerberos ozone pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc wayland widevine"
RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
-REQUIRED_USE="component-build? ( !suid )"
+REQUIRED_USE="
+ component-build? ( !suid )
+ wayland? ( ozone )
+"
+
+COMMON_X_DEPEND="
+ media-libs/mesa:=[gbm]
+ x11-libs/libX11:=
+ x11-libs/libXcomposite:=
+ x11-libs/libXcursor:=
+ x11-libs/libXdamage:=
+ x11-libs/libXext:=
+ x11-libs/libXfixes:=
+ >=x11-libs/libXi-1.6.0:=
+ x11-libs/libXrandr:=
+ x11-libs/libXrender:=
+ x11-libs/libXtst:=
+ x11-libs/libxcb:=
+"
COMMON_DEPEND="
- >=app-accessibility/at-spi2-atk-2.26:2
app-arch/bzip2:=
cups? ( >=net-print/cups-1.3.11:= )
- >=dev-libs/atk-2.26
dev-libs/expat:=
dev-libs/glib:2
>=dev-libs/libxml2-2.9.4-r3:=[icu]
@@ -43,11 +59,11 @@ COMMON_DEPEND="
>=media-libs/harfbuzz-2.4.0:0=[icu(-)]
media-libs/libjpeg-turbo:=
media-libs/libpng:=
- media-libs/mesa:=[gbm]
system-libvpx? ( >=media-libs/libvpx-1.8.2:=[postproc,svc] )
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? (
- >=media-video/ffmpeg-4:=
+ >=media-video/ffmpeg-4:0
+ =net-fs/samba-4.5.10-r1[-debug(-)]
@@ -59,23 +75,31 @@ COMMON_DEPEND="
virtual/udev
x11-libs/cairo:=
x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3[X]
- x11-libs/libX11:=
- x11-libs/libXcomposite:=
- x11-libs/libXcursor:=
- x11-libs/libXdamage:=
- x11-libs/libXext:=
- x11-libs/libXfixes:=
- >=x11-libs/libXi-1.6.0:=
- x11-libs/libXrandr:=
- x11-libs/libXrender:=
- x11-libs/libXScrnSaver:=
- x11-libs/libXtst:=
x11-libs/pango:=
media-libs/flac:=
>=media-libs/libwebp-0.4.0:=
sys-libs/zlib:=[minizip]
kerberos? ( virtual/krb5 )
+ ozone? (
+ !headless? (
+ ${COMMON_X_DEPEND}
+ x11-libs/gtk+:3[wayland?,X]
+ wayland? (
+ dev-libs/wayland:=
+ dev-libs/libffi:=
+ x11-libs/libdrm:=
+ x11-libs/libxkbcommon:=
+ )
+ )
+ )
+ !ozone? (
+ >=app-accessibility/at-spi2-atk-2.26:2
+ >=app-accessibility/at-spi2-core-2.26:2
+ >=dev-libs/atk-2.26
+ x11-libs/gtk+:3[X]
+ x11-libs/libXScrnSaver:=
+ ${COMMON_X_DEPEND}
+ )
"
# For nvidia-drivers blocker, see bug #413637 .
RDEPEND="${COMMON_DEPEND}
@@ -160,6 +184,10 @@ them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
in /etc/chromium/default.
"
+PATCHES=(
+ "${FILESDIR}/chromium-84-mediaalloc.patch"
+)
+
pre_build_checks() {
if [[ ${MERGE_TYPE} != binary ]]; then
local -x CPP="$(tc-getCXX) -E"
@@ -206,7 +234,6 @@ src_prepare() {
python_setup
eapply "${WORKDIR}/patches"
- eapply "${FILESDIR}"/chromium-84-mediaalloc.patch
default
@@ -434,6 +461,9 @@ src_prepare() {
if use tcmalloc; then
keeplibs+=( third_party/tcmalloc )
fi
+ if use ozone && use wayland && ! use headless ; then
+ keeplibs+=( third_party/wayland )
+ fi
if [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then
keeplibs+=( third_party/libxml )
keeplibs+=( third_party/libxslt )
@@ -658,9 +688,6 @@ src_configure() {
# Chromium relies on this, but was disabled in >=clang-10, crbug.com/1042470
append-cxxflags $(test-flags-CXX -flax-vector-conversions=all)
- # Silence lots of GCC warnings upstream doesn't seem to care about
- append-cxxflags -Wno-invalid-offsetof -Wno-attributes -Wno-pragmas
-
# Explicitly disable ICU data file support for system-icu builds.
if use system-icu; then
myconf_gn+=" icu_use_data_file=false"
@@ -669,6 +696,26 @@ src_configure() {
# Use bundled xcb-proto, bug #727000
myconf_gn+=" xcbproto_path=\"${WORKDIR}/xcb-proto-${XCB_PROTO_VERSION}/src\""
+ # Enable ozone support
+ if use ozone; then
+ myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
+ myconf_gn+=" ozone_platform_headless=true"
+ if ! use headless; then
+ myconf_gn+=" use_system_libdrm=true"
+ myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)"
+ myconf_gn+=" ozone_platform_x11=true"
+ myconf_gn+=" ozone_platform_headless=true"
+ if use wayland; then
+ myconf_gn+=" use_system_minigbm=true use_xkbcommon=true"
+ myconf_gn+=" ozone_platform=\"wayland\""
+ else
+ myconf_gn+=" ozone_platform=\"x11\""
+ fi
+ else
+ myconf_gn+=" ozone_platform=\"headless\""
+ fi
+ fi
+
einfo "Configuring Chromium..."
set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
echo "$@"
@@ -734,8 +781,14 @@ src_install() {
doexe out/Release/chromedriver
- local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
- sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
+ ozone_auto_session () {
+ use ozone && use wayland && ! use headless && echo true || echo false
+ }
+ local sedargs=( -e
+ "s:/usr/lib/:/usr/$(get_libdir)/:g;
+ s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
+ )
+ sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r4.sh" > chromium-launcher.sh || die
doexe chromium-launcher.sh
# It is important that we name the target "chromium-browser",
@@ -757,7 +810,11 @@ src_install() {
insinto "${CHROMIUM_HOME}"
doins out/Release/*.bin
doins out/Release/*.pak
- doins out/Release/*.so
+ (
+ shopt -s nullglob
+ local files=(out/Release/*.so)
+ [[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
+ )
if ! use system-icu; then
doins out/Release/icudtl.dat
diff --git a/www-client/chromium/files/chromium-launcher-r4.sh b/www-client/chromium/files/chromium-launcher-r4.sh
new file mode 100644
index 000000000000..cb1e9f548b35
--- /dev/null
+++ b/www-client/chromium/files/chromium-launcher-r4.sh
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+# Allow the user to override command-line flags, bug #357629.
+# This is based on Debian's chromium-browser package, and is intended
+# to be consistent with Debian.
+for f in /etc/chromium/*; do
+ [[ -f ${f} ]] && source "${f}"
+done
+
+# Prefer user defined CHROMIUM_USER_FLAGS (from env) over system
+# default CHROMIUM_FLAGS (from /etc/chromium/default).
+CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-"$CHROMIUM_FLAGS"}
+
+# Let the wrapped binary know that it has been run through the wrapper
+export CHROME_WRAPPER=$(readlink -f "$0")
+
+PROGDIR=${CHROME_WRAPPER%/*}
+
+case ":$PATH:" in
+ *:$PROGDIR:*)
+ # $PATH already contains $PROGDIR
+ ;;
+ *)
+ # Append $PROGDIR to $PATH
+ export PATH="$PATH:$PROGDIR"
+ ;;
+esac
+
+if [[ ${EUID} == 0 && -O ${XDG_CONFIG_HOME:-${HOME}} ]]; then
+ # Running as root with HOME owned by root.
+ # Pass --user-data-dir to work around upstream failsafe.
+ CHROMIUM_FLAGS="--user-data-dir=${XDG_CONFIG_HOME:-${HOME}/.config}/chromium
+ ${CHROMIUM_FLAGS}"
+fi
+
+# Select session type
+if @@OZONE_AUTO_SESSION@@; then
+ if [[ -z ${XDG_SESSION_TYPE+x} ]]; then
+ if [[ -z ${WAYLAND_DISPLAY+x} ]]; then
+ CHROMIUM_FLAGS="--ozone-platform=x11 ${CHROMIUM_FLAGS}"
+ else
+ CHROMIUM_FLAGS="--ozone-platform=wayland ${CHROMIUM_FLAGS}"
+ fi
+ else
+ CHROMIUM_FLAGS="--ozone-platform=${XDG_SESSION_TYPE} ${CHROMIUM_FLAGS}"
+ fi
+fi
+
+# Set the .desktop file name
+export CHROME_DESKTOP="chromium-browser-chromium.desktop"
+
+exec -a "chromium-browser" "$PROGDIR/chrome" --extra-plugin-dir=/usr/lib/nsbrowser/plugins ${CHROMIUM_FLAGS} "$@"
diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml
index c54bc9ef3515..4be3cc808730 100644
--- a/www-client/chromium/metadata.xml
+++ b/www-client/chromium/metadata.xml
@@ -8,7 +8,9 @@
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 17e11267dba5..b902599ec36a 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1 +1 @@
-DIST google-chrome-beta_84.0.4147.56-1_amd64.deb 69642068 BLAKE2B 3b9f46b6cbbd62c8653ab2b5a2520f5dabda82b7892b2dd6e046b5edc413e71941cb5d5e2569274058faacfe7cf4fa54e6d0ae3276f9a4be4b83cc5a140c52dc SHA512 648230f4e5cdae78fceca54f712dc725d57ff0de4927c9c19c8055967d961679feb47ab1db3bdad7a70c4cc98a78b042895887108c232c5ed3ee93de55d491a1
+DIST google-chrome-beta_84.0.4147.68-1_amd64.deb 69666824 BLAKE2B 2e0c5e3bff9b8634a1960d3ed1c1cbe7e6b95dbab7fa51bbe4180f99e9c0a9dd9add35551d3711db0d9a444217aadd3ed74d68e33ae10751ba620912c4dfc58d SHA512 e1aa88090a5a92b78169ed4f67d4c6a21f6b714c4daf36bfe53695f73042f4a1790ab9272780d8a4776fda3cd0bd4a43788853cc20e7eaabd4d5ca9528edc716
diff --git a/www-client/google-chrome-beta/google-chrome-beta-84.0.4147.56.ebuild b/www-client/google-chrome-beta/google-chrome-beta-84.0.4147.68.ebuild
similarity index 100%
rename from www-client/google-chrome-beta/google-chrome-beta-84.0.4147.56.ebuild
rename to www-client/google-chrome-beta/google-chrome-beta-84.0.4147.68.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 983dc190b036..058d69ac5924 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1 +1 @@
-DIST google-chrome-unstable_85.0.4173.0-1_amd64.deb 69842152 BLAKE2B 2e4c261dd7de0ac36cd4031a3a155e8c18edb818574345bad43c13e1d196de3d310f6959d5bc36ee86e466700147a5248c9ffd92f6a26987864bf30554fb66c0 SHA512 3daee7fbdf03ff36ff40f501a38f76e8c4f1d2826aff453b5d9e430aada513a297613b2fbc4ec1e9e1f59a82d1d47c9a9a9de74febc38d06a1b0afd08da191c7
+DIST google-chrome-unstable_85.0.4181.8-1_amd64.deb 69878204 BLAKE2B b18cdbca45fb830c7bf34b0c47f308d19f440000639b41a342712a0f5df71cf3e13d903414e59b2a6265512370d541195560c0129c4da32c05927ddf86f7085a SHA512 a2e751e3d296e520c44e687138786881db61c98f5c881a0f04a4c1e2f7b576644bcdccc369b23e070a5afdb2bb330b11c9329850224aed696f01aafcec280afd
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-85.0.4173.0.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-85.0.4181.8.ebuild
similarity index 100%
rename from www-client/google-chrome-unstable/google-chrome-unstable-85.0.4173.0.ebuild
rename to www-client/google-chrome-unstable/google-chrome-unstable-85.0.4181.8.ebuild
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 542403324641..12761ca565e3 100644
Binary files a/www-plugins/Manifest.gz and b/www-plugins/Manifest.gz differ
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 0e8c1f5fcb8e..4bb31ca89003 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_84.0.4147.56-1_amd64.deb 69642068 BLAKE2B 3b9f46b6cbbd62c8653ab2b5a2520f5dabda82b7892b2dd6e046b5edc413e71941cb5d5e2569274058faacfe7cf4fa54e6d0ae3276f9a4be4b83cc5a140c52dc SHA512 648230f4e5cdae78fceca54f712dc725d57ff0de4927c9c19c8055967d961679feb47ab1db3bdad7a70c4cc98a78b042895887108c232c5ed3ee93de55d491a1
+DIST google-chrome-beta_84.0.4147.68-1_amd64.deb 69666824 BLAKE2B 2e0c5e3bff9b8634a1960d3ed1c1cbe7e6b95dbab7fa51bbe4180f99e9c0a9dd9add35551d3711db0d9a444217aadd3ed74d68e33ae10751ba620912c4dfc58d SHA512 e1aa88090a5a92b78169ed4f67d4c6a21f6b714c4daf36bfe53695f73042f4a1790ab9272780d8a4776fda3cd0bd4a43788853cc20e7eaabd4d5ca9528edc716
DIST google-chrome-stable_83.0.4103.116-1_amd64.deb 68648484 BLAKE2B e783a1788ec091c0f785acae36cd759f9c5d016830e33a93218e42fcbb752602eba8dd28e687187d6ab71235ad77f09249999fa02b1494e523e4df955cfaab52 SHA512 2ec0279fbdff50b19e82f508590faa9ec9401b55254ce37f3d41302bcd8fecd454c7e24e95ce0e1ef0322b9f6f91d9463334dfbcb0399fa87ca5b8163c42de9f
-DIST google-chrome-unstable_85.0.4173.0-1_amd64.deb 69842152 BLAKE2B 2e4c261dd7de0ac36cd4031a3a155e8c18edb818574345bad43c13e1d196de3d310f6959d5bc36ee86e466700147a5248c9ffd92f6a26987864bf30554fb66c0 SHA512 3daee7fbdf03ff36ff40f501a38f76e8c4f1d2826aff453b5d9e430aada513a297613b2fbc4ec1e9e1f59a82d1d47c9a9a9de74febc38d06a1b0afd08da191c7
+DIST google-chrome-unstable_85.0.4181.8-1_amd64.deb 69878204 BLAKE2B b18cdbca45fb830c7bf34b0c47f308d19f440000639b41a342712a0f5df71cf3e13d903414e59b2a6265512370d541195560c0129c4da32c05927ddf86f7085a SHA512 a2e751e3d296e520c44e687138786881db61c98f5c881a0f04a4c1e2f7b576644bcdccc369b23e070a5afdb2bb330b11c9329850224aed696f01aafcec280afd
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-84.0.4147.56_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-84.0.4147.68_beta.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-84.0.4147.56_beta.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-84.0.4147.68_beta.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-85.0.4173.0_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-85.0.4181.8_alpha.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-85.0.4173.0_alpha.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-85.0.4181.8_alpha.ebuild
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index cf81061d1032..1d9a45b994b9 100644
Binary files a/x11-apps/Manifest.gz and b/x11-apps/Manifest.gz differ
diff --git a/x11-apps/igt-gpu-tools/files/1.25-python-3.9.patch b/x11-apps/igt-gpu-tools/files/1.25-python-3.9.patch
new file mode 100644
index 000000000000..689dca411e5b
--- /dev/null
+++ b/x11-apps/igt-gpu-tools/files/1.25-python-3.9.patch
@@ -0,0 +1,25 @@
+manual backport of upstream commit
+https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/commit/201da47cb57b8fadd9bc45be16b82617b32a2c01
+
+--- a/docs/reference/igt-gpu-tools/generate_description_xml.py
++++ b/docs/reference/igt-gpu-tools/generate_description_xml.py
+@@ -4,7 +4,7 @@ import re
+ import sys
+ import os.path
+ import subprocess
+-import xml.etree.cElementTree as ET
++import xml.etree.ElementTree as ET
+
+ from collections import namedtuple
+
+--- a/lib/i915/perf-configs/perf-codegen.py
++++ b/lib/i915/perf-configs/perf-codegen.py
+@@ -26,7 +26,7 @@ import os
+ import sys
+ import textwrap
+
+-import xml.etree.cElementTree as et
++import xml.etree.ElementTree as et
+
+ import codegen
+
diff --git a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild
index b202d340de99..6bb31b86e9f1 100644
--- a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild
+++ b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild
@@ -73,6 +73,8 @@ DEPEND="${RDEPEND}
)
"
+PATCHES=( "${FILESDIR}/${PV}-python-3.9.patch" )
+
src_prepare() {
sed -e "s/find_program('rst2man-3'/find_program('rst2man.py', 'rst2man-3'/" -i man/meson.build
default_src_prepare
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 472276ef53e8..39c45ac0bfe3 100644
Binary files a/x11-drivers/Manifest.gz and b/x11-drivers/Manifest.gz differ
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 846b306da5ef..f7e1ccd80488 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -7,7 +7,6 @@ DIST NVIDIA-FreeBSD-x86_64-390.138.tar.gz 65280213 BLAKE2B 36d5651ceaf90cefcf9e8
DIST NVIDIA-FreeBSD-x86_64-430.64.tar.gz 62723909 BLAKE2B f3e48bc38a3ec051a75c08845b45c0ba6b80bca31d7efd85f115e6244f9cdff70c68466f9139f69c645207d4cf61103432d75c943d3f3508811d405fba55d1b6 SHA512 498a3007c065d8b17f94024f6ca80ffbe3dca253fdb73c4a08babede821e52f8466523b402af350e961f153c5f732eb04160937fabef1f1be3846a0a4743b310
DIST NVIDIA-FreeBSD-x86_64-435.21.tar.gz 64153630 BLAKE2B fee655cc843c004ac0c1ec85b9417292016a013136e04ad047d2513edbdc7c732561d6bcc4603c658905972dce6618de49d4d6ac583e84fdf212cf45397b48c1 SHA512 2c160c06ca58e3009deb1ba4a4a28d39419e251ced3bfa9a442942f9cce17003d67e8a8bfa23036d3916cc0e66f4bff0fbedaae73db6f10b995235a56d7eba7c
DIST NVIDIA-FreeBSD-x86_64-440.100.tar.gz 82523267 BLAKE2B 9d8eddcf3a58787a03fab207c197d722ff047f8bc840ea41e8d38815fbfab9e54759b9fbeaa26e3d147f54cb4a510eec421708d3bbb21197922f4dc175ed6df5 SHA512 96f57e1f308f0e5f00ef09a128e91a68ac55033893000e84cf4ff1a910a88798743c911b3effcc26c3f27ae224b733d8c2f87e9ec0596149f65ad7bcd71edbc5
-DIST NVIDIA-FreeBSD-x86_64-440.82.tar.gz 82289126 BLAKE2B b8d0a0c235bbc7a1bdeb6cde2a3c72b4b54044e6d22cdf9c275640349051f9c1aa1ce358f47b10b0917d15f359ccec579f43caf8e4ec7a142192061b9e61a7b7 SHA512 88c7ce2f3786a364befd5690e973eb82b12421d0abbd16cf88e0727a137ce0099fe606b577d325185f3ee85bace89da745cae000d8d8665548a283b5bb397095
DIST NVIDIA-FreeBSD-x86_64-450.51.tar.gz 82784766 BLAKE2B fbd0e71919b16db5957539c5b44a9d974e01d6ab42d5c292aaa4a4e06125d982e37607e28124ae63436eb1d3fcb1b7eb9e1e258b1644310d00d4eebf9fe17ae7 SHA512 0cba373609787e2cb341232a619b3d95bc6c4da8db27633f717ba5654e7717005089d6c2ef4801ff117e6f35f8fa522b600864cf440578cad9397b7f839e16fe
DIST NVIDIA-Linux-armv7l-gnueabihf-390.132.run 29084574 BLAKE2B 4727627de610928f0808c0213c9d359c5566900972ab9fbd3d0c58b36c0a1331799ceea22b4defdcfb81c3132f6124d8a6357de8124921eef608938afdc1380d SHA512 2f78a722ec31ceda86afc1831cb42d0eab8f8698b94c7fbc8569a6d34693b50e74453d5aaf3c0180f1fc2511b8c237ac635aceb24bcbea468f2a092cb44f98ee
DIST NVIDIA-Linux-armv7l-gnueabihf-390.138.run 28540622 BLAKE2B 342852dd6fa371f86d19547d73edef582fe3f04cf4f6e9ec247767951180671ba46f3ed2ee7bab11b0cf2f8bb1eb846b1d7481d318789c14ce79b54fefe0f830 SHA512 e04b8aca202c1df305f7b67ec372322494fa7b77f27cbf04f240527dcac0ce3ffa5e0e9df36b52045ac13fbc2f84b5033784040884ed19072f66f41385d11b97
@@ -20,7 +19,6 @@ DIST NVIDIA-Linux-x86_64-390.138.run 83780873 BLAKE2B 5e6a9d77dd2b9de17d92319810
DIST NVIDIA-Linux-x86_64-430.64.run 111331457 BLAKE2B 59d8b739bc472810eb896ef620735b6f21ccfde653e08f248797720d21d75580dcea2448f17a5d1c32be393595d9dfedc48c81e96a8ea422c7f0d9eadf36ae1c SHA512 552bf1e8c4725258c07cbb0e000d0e407fba1b51207903f2b77c0d9fd8b15b629f791b20239f75a1aec85aa03cbcca90a1cb633090919cf0599054231f715250
DIST NVIDIA-Linux-x86_64-435.21.run 144387574 BLAKE2B e9afd6335182a28f5136dbef55195a2f2d8f768376ebc148190a0a82470a34d008ce04170ffc1aab36585605910c1300567a90443b5f58cb46ec3bff6ab9409c SHA512 e83b6dff80434971c0b254815945d485a45c978b8a19994244f50a463658863948b2eac8bc62d667bb10c23f41cf1c3521c409d23ac2ab6a0c0cd094a6e20270
DIST NVIDIA-Linux-x86_64-440.100.run 144653408 BLAKE2B a62e6324f5ac6033c1c4b59486c86a6d4f81b240e5a7ddf9f861f9cfec4daedbe08ef3af6556c1cd4260a5a6fcd1b8bfed886ae617677d87c3a900d0e313267b SHA512 274b3a8e4c801b67a3f71f11da93134bc1a16a48bc85a6bf63265c00bb3fd8caf935dd23c85c40285a162e83c146bd5e34bb0b1d74fc34e7122bfc4c3a8c81e7
-DIST NVIDIA-Linux-x86_64-440.82.run 142872609 BLAKE2B 3ebef17002a788f145b61fb8c921f120324eac036ff4c7b972913e30ed830339fc971fd352f5e59ee3bb1b4a7a159dcf3e35d2f33ee37357c3f177aa605307ea SHA512 d86ed2cd715c5a9aebdd11ee562cfa454dbafdb1b468004cbb93d37ee258623f11144cf30b8b14996a4e093cb3119edc36d13152893d735e3536f49c45e2cca3
DIST NVIDIA-Linux-x86_64-450.51.run 140812490 BLAKE2B 927820fb30e0aac7d022acc82c969503e63be66045d7f10eee0af02b065251ecc4a0c95caef30cf0c2bb2e94de02f59b4469b26eaa801e67d6340184139b82ed SHA512 ddb63f28ddbfa9e5c1bacbd3a5e8d529072c98b09a54c745467ed3ce87e8d5ffef80e41848bb473104147554dbac7dd1d1283821ceef6de05d3a2f8538e2ca33
DIST nvidia-settings-340.108.tar.bz2 1550018 BLAKE2B 1acdfbcb0e7c02af33f5e86b9b140e356057efd9825fbc130971884ae76dd23765c2a0dbd00e1ac47bbff882f6d004e0a10c0195e6c6dce1408c72a00e0e6322 SHA512 d8b6dcbd3803af4da22cfffc039e1c050313f90b7ee86106a784863f7c203de9137ac2fee12aa800498cc56081dbe7e3aaa943c162037477ce97a07a237db41a
DIST nvidia-settings-390.132.tar.bz2 1109373 BLAKE2B cec60b7409f6d352afe3845a2ec65db96183d1fe009340fa3601166718f21b43bb08b63c5eaaaf4c266c7b16e7d374f6ecc00691763d5ae1b6902c8002da5bea SHA512 12553edc1a1ba9c3f578e0e921b25ec7114cbc80a55621cbd612a1bd85c9a518e221b30809058e4df5da6ae75ea7a1cd5c3d9c8f02a0898bc8c08ac9c22ccee3
@@ -28,5 +26,4 @@ DIST nvidia-settings-390.138.tar.bz2 1109175 BLAKE2B 4171c12de0a6fb97b655567d4cc
DIST nvidia-settings-430.64.tar.bz2 1130931 BLAKE2B 032bbe8cdb7ec3b353e8f8ef33d0e86f4b4f3ef24b38de669e09173519149efe0aa55d5d30d0a0c6d2b8398d5ce38bbe4176df735501725475df4137d533e57d SHA512 fa82699610aa0f4709101e1a4e9e8147b133c85afb20ecb4506bfccf233e4f42dac26e53e2966f2137eb29190b5e4173b267167f5341b516fa1169785946e240
DIST nvidia-settings-435.21.tar.bz2 1131222 BLAKE2B 855f5c7667f4a5ec0f917fbb017d70ec6ee5e768f7087e77e54a66dea852c471bd1810a2163fb33204e5f381998a27a4254e0a5d2c73e2b6b624813ff8294f24 SHA512 8b408cc70118df3a138a99fe7fc14f6370d500b8ae26888b27b07de22f6fc6eebd65bd437d83ee82e18a1d8ee4cceec601c414b1947302ca808fff48165f31bb
DIST nvidia-settings-440.100.tar.bz2 1129171 BLAKE2B bc8b28ae5743df50177c51a9269ef2b5d11c69dd9f30441179d81e42e7f77c54f327c87a7a5c6a410540bed35eb1ba0cc289b5b98a046deda376dccb29a8206b SHA512 4fe8fbbca1f805652235d898e8451ba89263c81f53e78da471b13ba0668d0d528d04d098b276df6fd2bf7ea7a219a3aa3c4d0bada0a483767c00c0654a5a8818
-DIST nvidia-settings-440.82.tar.bz2 1128498 BLAKE2B cc26d83b8ac8d609919db15b462b98976ad063026c39fdf58de36ce26a5b9a9ed5aca8e966f5b61c231ab1f7324a5530fb9779fccb999f39f79252570d62cb79 SHA512 8f9b546f65a1bd17f6336df9e62b0d1403581d3f60276793a536ff39bf67038def1c2738545b24b04eb465860f0cb97b5b9688d7dfb759fda567c05b1cc651ff
DIST nvidia-settings-450.51.tar.bz2 1056993 BLAKE2B a410593a3217023103c2c783c7a2ca0dee1c6a2af8dec1f0398159aa8192b307e4d27690b9987e879e863e7667b2d046f6128ca1634750863b58d4727b4d2a12 SHA512 6fd455c1910a3ff6105facc06ef65e29f88a0133794f27bf36b999cd513f5639a2c24c53bd5bca308730e6c66f10eda25d191bb815eee53d39b5632a1ce466e1
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.138.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.138.ebuild
index 835519335881..8220e219011e 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.138.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.138.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
"
EMULTILIB_PKG="true"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
LICENSE="GPL-2 NVIDIA-r2"
SLOT="0/${PV%.*}"
@@ -84,7 +84,13 @@ RDEPEND="
QA_PREBUILT="opt/* usr/lib*"
S=${WORKDIR}/
NV_KV_MAX_PLUS="5.8"
-CONFIG_CHECK="!DEBUG_MUTEXES ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
+CONFIG_CHECK="
+ !DEBUG_MUTEXES
+ ~!I2C_NVIDIA_GPU
+ ~!LOCKDEP
+ ~MTRR
+ ~SYSVIPC
+"
pkg_pretend() {
use x86 && CONFIG_CHECK+=" ~HIGHMEM"
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r4.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r5.ebuild
similarity index 99%
rename from x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r4.ebuild
rename to x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r5.ebuild
index 487a8e632b58..d7a98e6ab415 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r4.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r5.ebuild
@@ -75,7 +75,13 @@ RDEPEND="
QA_PREBUILT="opt/* usr/lib*"
S=${WORKDIR}/
NV_KV_MAX_PLUS="5.5"
-CONFIG_CHECK="!DEBUG_MUTEXES ~!I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
+CONFIG_CHECK="
+ !DEBUG_MUTEXES
+ ~!I2C_NVIDIA_GPU
+ ~!LOCKDEP
+ ~MTRR
+ ~SYSVIPC
+"
pkg_pretend() {
nvidia-driver_check
@@ -380,7 +386,7 @@ src_install() {
systemd_dounit *.service
dobin nvidia-sleep.sh
- exeinto $(systemd_get_utildir)/system-sleep
+ exeinto /lib/systemd/system-sleep
doexe nvidia
if has_multilib_profile && use multilib; then
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r4.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r5.ebuild
similarity index 99%
rename from x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r4.ebuild
rename to x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r5.ebuild
index 655ae9ded1b0..268a6266f982 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r4.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r5.ebuild
@@ -79,7 +79,13 @@ RDEPEND="
QA_PREBUILT="opt/* usr/lib*"
S=${WORKDIR}/
NV_KV_MAX_PLUS="5.4"
-CONFIG_CHECK="!DEBUG_MUTEXES ~!I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
+CONFIG_CHECK="
+ !DEBUG_MUTEXES
+ ~!I2C_NVIDIA_GPU
+ ~!LOCKDEP
+ ~MTRR
+ ~SYSVIPC
+"
pkg_pretend() {
nvidia-driver_check
@@ -384,7 +390,7 @@ src_install() {
systemd_dounit *.service
dobin nvidia-sleep.sh
- exeinto $(systemd_get_utildir)/system-sleep
+ exeinto /lib/systemd/system-sleep
doexe nvidia
if has_multilib_profile && use multilib; then
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.100.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r1.ebuild
similarity index 99%
rename from x11-drivers/nvidia-drivers/nvidia-drivers-440.100.ebuild
rename to x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r1.ebuild
index 74a74069bf64..270edf36ba0e 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.100.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
"
EMULTILIB_PKG="true"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
LICENSE="GPL-2 NVIDIA-r2"
SLOT="0/${PV%.*}"
@@ -82,7 +82,13 @@ PATCHES=(
"${FILESDIR}"/${PN}-440.26-locale.patch
)
NV_KV_MAX_PLUS="5.8"
-CONFIG_CHECK="!DEBUG_MUTEXES ~!I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
+CONFIG_CHECK="
+ !DEBUG_MUTEXES
+ ~!I2C_NVIDIA_GPU
+ ~!LOCKDEP
+ ~MTRR
+ ~SYSVIPC
+"
pkg_pretend() {
nvidia-driver_check
@@ -387,7 +393,7 @@ src_install() {
systemd_dounit *.service
dobin nvidia-sleep.sh
- exeinto $(systemd_get_utildir)/system-sleep
+ exeinto /lib/systemd/system-sleep
doexe nvidia
if has_multilib_profile && use multilib; then
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild
deleted file mode 100644
index de2d1351e1ca..000000000000
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild
+++ /dev/null
@@ -1,588 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \
- nvidia-driver portability systemd toolchain-funcs unpacker udev
-
-AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
-
-NV_URI="https://us.download.nvidia.com/XFree86/"
-SRC_URI="
- amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
- amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
- tools? (
- https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2
- )
-"
-
-EMULTILIB_PKG="true"
-KEYWORDS="-* amd64"
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0/${PV%.*}"
-
-IUSE="compat +driver gtk3 kernel_FreeBSD kernel_linux +kms +libglvnd multilib static-libs +tools uvm wayland +X"
-REQUIRED_USE="
- tools? ( X )
- static-libs? ( tools )
-"
-
-COMMON="
- driver? ( kernel_linux? ( acct-group/video ) )
- kernel_linux? ( >=sys-libs/glibc-2.6.1 )
- tools? (
- dev-libs/atk
- dev-libs/glib:2
- dev-libs/jansson
- gtk3? (
- x11-libs/gtk+:3
- )
- x11-libs/cairo
- x11-libs/gdk-pixbuf[X]
- x11-libs/gtk+:2
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrandr
- x11-libs/libXv
- x11-libs/libXxf86vm
- x11-libs/pango[X]
- )
- X? (
- !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 )
- libglvnd? (
- media-libs/libglvnd[${MULTILIB_USEDEP}]
- !app-eselect/eselect-opengl
- )
- app-misc/pax-utils
- )
-"
-DEPEND="
- ${COMMON}
- kernel_linux? ( virtual/linux-sources )
- tools? ( sys-apps/dbus )
-"
-RDEPEND="
- ${COMMON}
- tools? ( !media-video/nvidia-settings )
- uvm? ( >=virtual/opencl-3 )
- wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
- X? (
- =x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
- )
-"
-QA_PREBUILT="opt/* usr/lib*"
-S=${WORKDIR}/
-PATCHES=(
- "${FILESDIR}"/${PN}-440.26-locale.patch
-)
-NV_KV_MAX_PLUS="5.7"
-CONFIG_CHECK="!DEBUG_MUTEXES ~!I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
-
-pkg_pretend() {
- nvidia-driver_check
-}
-
-pkg_setup() {
- nvidia-driver_check
-
- # try to turn off distcc and ccache for people that have a problem with it
- export DISTCC_DISABLE=1
- export CCACHE_DISABLE=1
-
- if use driver && use kernel_linux; then
- MODULE_NAMES="nvidia(video:${S}/kernel)"
- use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
- use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel) nvidia-drm(video:${S}/kernel)"
-
- # This needs to run after MODULE_NAMES (so that the eclass checks
- # whether the kernel supports loadable modules) but before BUILD_PARAMS
- # is set (so that KV_DIR is populated).
- linux-mod_pkg_setup
-
- BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
- SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
-
- # linux-mod_src_compile calls set_arch_to_kernel, which
- # sets the ARCH to x86 but NVIDIA's wrapping Makefile
- # expects x86_64 or i386 and then converts it to x86
- # later on in the build process
- BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
- fi
-
- if use kernel_linux && kernel_is lt 2 6 9; then
- eerror "You must build this against 2.6.9 or higher kernels."
- fi
-
- # set variables to where files are in the package structure
- if use kernel_FreeBSD; then
- use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
- NV_DOC="${S}/doc"
- NV_OBJ="${S}/obj"
- NV_SRC="${S}/src"
- NV_MAN="${S}/x11/man"
- NV_X11="${S}/obj"
- NV_SOVER=1
- elif use kernel_linux; then
- NV_DOC="${S}"
- NV_OBJ="${S}"
- NV_SRC="${S}/kernel"
- NV_MAN="${S}"
- NV_X11="${S}"
- NV_SOVER=${PV}
- else
- die "Could not determine proper NVIDIA package"
- fi
-}
-
-src_configure() {
- tc-export AR CC LD OBJCOPY
-
- default
-}
-
-src_prepare() {
- local man_file
- for man_file in "${NV_MAN}"/*1.gz; do
- gunzip $man_file || die
- done
-
- if use tools; then
- cp "${FILESDIR}"/nvidia-settings-fno-common.patch "${WORKDIR}" || die
- cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die
- sed -i \
- -e "s:@PV@:${PV}:g" \
- "${WORKDIR}"/nvidia-settings-fno-common.patch \
- "${WORKDIR}"/nvidia-settings-linker.patch \
- || die
- eapply "${WORKDIR}"/nvidia-settings-fno-common.patch
- eapply "${WORKDIR}"/nvidia-settings-linker.patch
- fi
-
- default
-
- if ! [ -f nvidia_icd.json ]; then
- cp nvidia_icd.json.template nvidia_icd.json || die
- sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json || die
- fi
-}
-
-src_compile() {
- cd "${NV_SRC}"
- if use kernel_FreeBSD; then
- MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
- LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
- elif use driver && use kernel_linux; then
- BUILD_TARGETS=module linux-mod_src_compile \
- KERNELRELEASE="${KV_FULL}" \
- src="${KERNEL_DIR}"
- fi
-
- if use tools; then
- emake -C "${S}"/nvidia-settings-${PV}/src/libXNVCtrl \
- DO_STRIP= \
- LIBDIR="$(get_libdir)" \
- NVLD="$(tc-getLD)" \
- NV_VERBOSE=1 \
- OUTPUTDIR=. \
- RANLIB="$(tc-getRANLIB)"
-
- emake -C "${S}"/nvidia-settings-${PV}/src \
- DO_STRIP= \
- GTK3_AVAILABLE=$(usex gtk3 1 0) \
- LIBDIR="$(get_libdir)" \
- NVLD="$(tc-getLD)" \
- NVML_ENABLED=0 \
- NV_USE_BUNDLED_LIBJANSSON=0 \
- NV_VERBOSE=1 \
- OUTPUTDIR=.
- fi
-}
-
-# Install nvidia library:
-# the first parameter is the library to install
-# the second parameter is the provided soversion
-# the third parameter is the target directory if it is not /usr/lib
-donvidia() {
- # Full path to library
- nv_LIB="${1}"
-
- # SOVER to use
- nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})"
-
- # Where to install
- nv_DEST="${2}"
-
- # Get just the library name
- nv_LIBNAME=$(basename "${nv_LIB}")
-
- if [[ "${nv_DEST}" ]]; then
- exeinto ${nv_DEST}
- action="doexe"
- else
- nv_DEST="/usr/$(get_libdir)"
- action="dolib.so"
- fi
-
- # Install the library
- ${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}"
-
- # If the library has a SONAME and SONAME does not match the library name,
- # then we need to create a symlink
- if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then
- dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER}
- fi
-
- dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so}
-}
-
-src_install() {
- if use driver && use kernel_linux; then
- linux-mod_src_install
-
- # Add the aliases
- # This file is tweaked with the appropriate video group in
- # pkg_preinst, see bug #491414
- insinto /etc/modprobe.d
- newins "${FILESDIR}"/nvidia-430.conf nvidia.conf
-
- if use uvm; then
- doins "${FILESDIR}"/nvidia-rmmod.conf
- udev_newrules "${FILESDIR}"/nvidia-uvm.udev-rule 99-nvidia-uvm.rules
- else
- sed -e 's|nvidia-uvm ||g' "${FILESDIR}"/nvidia-rmmod.conf \
- > "${T}"/nvidia-rmmod.conf || die
- doins "${T}"/nvidia-rmmod.conf
- fi
-
- # Ensures that our device nodes are created when not using X
- exeinto "$(get_udevdir)"
- newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
- udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
- elif use kernel_FreeBSD; then
- if use x86-fbsd; then
- insinto /boot/modules
- doins "${S}/src/nvidia.kld"
- fi
-
- exeinto /boot/modules
- doexe "${S}/src/nvidia.ko"
- fi
-
- # NVIDIA kernel <-> userspace driver config lib
- donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER}
-
- # NVIDIA framebuffer capture library
- donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER}
-
- # NVIDIA video encode/decode <-> CUDA
- if use kernel_linux; then
- donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
- donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
- fi
-
- if use X; then
- # Xorg DDX driver
- insinto /usr/$(get_libdir)/xorg/modules/drivers
- doins ${NV_X11}/nvidia_drv.so
-
- # Xorg GLX driver
- donvidia ${NV_X11}/libglxserver_nvidia.so.${NV_SOVER} \
- /usr/$(get_libdir)/xorg/modules/extensions
-
- # Xorg nvidia.conf
- if has_version '>=x11-base/xorg-server-1.16'; then
- insinto /usr/share/X11/xorg.conf.d
- newins {,50-}nvidia-drm-outputclass.conf
- fi
-
- insinto /usr/share/glvnd/egl_vendor.d
- doins ${NV_X11}/10_nvidia.json
- fi
-
- if use wayland; then
- insinto /usr/share/egl/egl_external_platform.d
- doins ${NV_X11}/10_nvidia_wayland.json
- fi
-
- # OpenCL ICD for NVIDIA
- if use kernel_linux; then
- insinto /etc/OpenCL/vendors
- doins ${NV_OBJ}/nvidia.icd
- fi
-
- # Helper Apps
- exeinto /opt/bin/
-
- if use X; then
- doexe ${NV_OBJ}/nvidia-xconfig
-
- insinto /etc/vulkan/icd.d
- doins nvidia_icd.json
-
- insinto /etc/vulkan/implicit_layer.d
- doins nvidia_layers.json
- fi
-
- if use kernel_linux; then
- doexe ${NV_OBJ}/nvidia-cuda-mps-control
- doexe ${NV_OBJ}/nvidia-cuda-mps-server
- doexe ${NV_OBJ}/nvidia-debugdump
- doexe ${NV_OBJ}/nvidia-persistenced
- doexe ${NV_OBJ}/nvidia-smi
-
- # install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
- doexe ${NV_OBJ}/nvidia-modprobe
- fowners root:video /opt/bin/nvidia-modprobe
- fperms 4710 /opt/bin/nvidia-modprobe
- dosym /{opt,usr}/bin/nvidia-modprobe
-
- doman nvidia-cuda-mps-control.1
- doman nvidia-modprobe.1
- doman nvidia-persistenced.1
- newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
- newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
- newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
- fi
-
- if use tools; then
- emake -C "${S}"/nvidia-settings-${PV}/src/ \
- DESTDIR="${D}" \
- DO_STRIP= \
- GTK3_AVAILABLE=$(usex gtk3 1 0) \
- LIBDIR="${D}/usr/$(get_libdir)" \
- NV_USE_BUNDLED_LIBJANSSON=0 \
- NV_VERBOSE=1 \
- OUTPUTDIR=. \
- PREFIX=/usr \
- install
-
- if use static-libs; then
- dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
-
- insinto /usr/include/NVCtrl
- doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
- fi
-
- insinto /usr/share/nvidia/
- doins nvidia-application-profiles-${PV}-key-documentation
-
- insinto /etc/nvidia
- newins \
- nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
-
- # There is no icon in the FreeBSD tarball.
- use kernel_FreeBSD || \
- doicon ${NV_OBJ}/nvidia-settings.png
-
- domenu "${FILESDIR}"/nvidia-settings.desktop
-
- exeinto /etc/X11/xinit/xinitrc.d
- newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
- fi
-
- dobin ${NV_OBJ}/nvidia-bug-report.sh
-
- systemd_dounit *.service
- dobin nvidia-sleep.sh
- exeinto $(systemd_get_utildir)/system-sleep
- doexe nvidia
-
- if has_multilib_profile && use multilib; then
- local OABI=${ABI}
- for ABI in $(get_install_abis); do
- src_install-libs
- done
- ABI=${OABI}
- unset OABI
- else
- src_install-libs
- fi
-
- is_final_abi || die "failed to iterate through all ABIs"
-
- # Documentation
- if use kernel_FreeBSD; then
- dodoc "${NV_DOC}/README"
- use X && doman "${NV_MAN}"/nvidia-xconfig.1
- use tools && doman "${NV_MAN}"/nvidia-settings.1
- else
- # Docs
- newdoc "${NV_DOC}/README.txt" README
- dodoc "${NV_DOC}/NVIDIA_Changelog"
- doman "${NV_MAN}"/nvidia-smi.1
- use X && doman "${NV_MAN}"/nvidia-xconfig.1
- use tools && doman "${NV_MAN}"/nvidia-settings.1
- doman "${NV_MAN}"/nvidia-cuda-mps-control.1
- fi
-
- readme.gentoo_create_doc
-
- docinto html
- dodoc -r ${NV_DOC}/html/*
-}
-
-src_install-libs() {
- local inslibdir=$(get_libdir)
- if use libglvnd; then
- local GL_ROOT="/usr/$(get_libdir)"
- else
- local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
- fi
- local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
- local nv_libdir="${NV_OBJ}"
-
- if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; then
- nv_libdir="${NV_OBJ}"/32
- fi
-
- if use X; then
- NV_GLX_LIBRARIES=(
- "libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
- "libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
- "libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
- "libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
- "libOpenCL.so.1.0.0 ${CL_ROOT}"
- "libcuda.so.${NV_SOVER}"
- "libnvcuvid.so.${NV_SOVER}"
- "libnvidia-compiler.so.${NV_SOVER}"
- "libnvidia-eglcore.so.${NV_SOVER}"
- "libnvidia-encode.so.${NV_SOVER}"
- "libnvidia-fatbinaryloader.so.${NV_SOVER}"
- "libnvidia-fbc.so.${NV_SOVER}"
- "libnvidia-glcore.so.${NV_SOVER}"
- "libnvidia-glsi.so.${NV_SOVER}"
- "libnvidia-glvkspirv.so.${NV_SOVER}"
- "libnvidia-ifr.so.${NV_SOVER}"
- "libnvidia-opencl.so.${NV_SOVER}"
- "libnvidia-ptxjitcompiler.so.${NV_SOVER}"
- "libvdpau_nvidia.so.${NV_SOVER}"
- )
- if ! use libglvnd; then
- NV_GLX_LIBRARIES+=(
- "libEGL.so.$( [[ ${ABI} == "amd64" ]] && usex compat ${NV_SOVER} 1.1.0 || echo 1.1.0) ${GL_ROOT}"
- "libGL.so.1.7.0 ${GL_ROOT}"
- "libGLESv1_CM.so.1.2.0 ${GL_ROOT}"
- "libGLESv2.so.2.1.0 ${GL_ROOT}"
- "libGLX.so.0 ${GL_ROOT}"
- "libGLdispatch.so.0 ${GL_ROOT}"
- "libOpenGL.so.0 ${GL_ROOT}"
- )
- fi
-
- if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
- then
- NV_GLX_LIBRARIES+=(
- "libnvidia-egl-wayland.so.1.1.4"
- )
- fi
-
- if use kernel_FreeBSD; then
- NV_GLX_LIBRARIES+=(
- "libnvidia-tls.so.${NV_SOVER}"
- )
- fi
-
- if use kernel_linux; then
- NV_GLX_LIBRARIES+=(
- "libnvidia-ml.so.${NV_SOVER}"
- "libnvidia-tls.so.${NV_SOVER}"
- )
- fi
-
- if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
- then
- NV_GLX_LIBRARIES+=(
- "libnvidia-cbl.so.${NV_SOVER}"
- "libnvidia-rtcore.so.${NV_SOVER}"
- "libnvoptix.so.${NV_SOVER}"
- )
- fi
-
- for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
- donvidia "${nv_libdir}"/${NV_LIB}
- done
- fi
-}
-
-pkg_preinst() {
- if use driver && use kernel_linux; then
- linux-mod_pkg_preinst
-
- local videogroup="$(getent group video | cut -d ':' -f 3)"
- if [ -z "${videogroup}" ]; then
- eerror "Failed to determine the video group gid"
- die "Failed to determine the video group gid"
- else
- sed -i \
- -e "s:PACKAGE:${PF}:g" \
- -e "s:VIDEOGID:${videogroup}:" \
- "${D}"/etc/modprobe.d/nvidia.conf || die
- fi
- fi
-
- # Clean the dynamic libGL stuff's home to ensure
- # we dont have stale libs floating around
- if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
- rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
- fi
- # Make sure we nuke the old nvidia-glx's env.d file
- if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
- rm -f "${ROOT}"/etc/env.d/09nvidia
- fi
-}
-
-pkg_postinst() {
- use driver && use kernel_linux && linux-mod_pkg_postinst
-
- # Switch to the nvidia implementation
- if ! use libglvnd; then
- use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
- fi
-
- readme.gentoo_print_elog
-
- if ! use X; then
- elog "You have elected to not install the X.org driver. Along with"
- elog "this the OpenGL libraries and VDPAU libraries were not"
- elog "installed. Additionally, once the driver is loaded your card"
- elog "and fan will run at max speed which may not be desirable."
- elog "Use the 'nvidia-smi' init script to have your card and fan"
- elog "speed scale appropriately."
- elog
- fi
- if ! use tools; then
- elog "USE=tools controls whether the nvidia-settings application"
- elog "is installed. If you would like to use it, enable that"
- elog "flag and re-emerge this ebuild. Optionally you can install"
- elog "media-video/nvidia-settings"
- elog
- fi
-
- elog "To enable nvidia sleep services under systemd, run these commands:"
- elog " systemctl enable nvidia-suspend.service"
- elog " systemctl enable nvidia-hibernate.service"
- elog " systemctl enable nvidia-resume.service"
- elog "Set the NVreg_TemporaryFilePath kernel module parameter to a"
- elog "suitable path in case the default of /tmp does not work for you"
- elog "For more information see:"
- elog "${ROOT}/usr/share/doc/${PF}/html/powermanagement.html"
-}
-
-pkg_prerm() {
- if ! use libglvnd; then
- use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
- fi
-}
-
-pkg_postrm() {
- use driver && use kernel_linux && linux-mod_pkg_postrm
- if ! use libglvnd; then
- use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
- fi
-}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-450.51.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-450.51-r1.ebuild
similarity index 99%
rename from x11-drivers/nvidia-drivers/nvidia-drivers-450.51.ebuild
rename to x11-drivers/nvidia-drivers/nvidia-drivers-450.51-r1.ebuild
index 7341c1529acc..0b5de38b4b1e 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-450.51.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-450.51-r1.ebuild
@@ -83,7 +83,13 @@ PATCHES=(
"${FILESDIR}"/${PN}-440.26-locale.patch
)
NV_KV_MAX_PLUS="5.8"
-CONFIG_CHECK="!DEBUG_MUTEXES ~!I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
+CONFIG_CHECK="
+ !DEBUG_MUTEXES
+ ~!I2C_NVIDIA_GPU
+ ~!LOCKDEP
+ ~MTRR
+ ~SYSVIPC
+"
pkg_pretend() {
nvidia-driver_check
@@ -388,7 +394,7 @@ src_install() {
systemd_dounit *.service
dobin nvidia-sleep.sh
- exeinto $(systemd_get_utildir)/system-sleep
+ exeinto /lib/systemd/system-sleep
doexe nvidia
if has_multilib_profile && use multilib; then
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 113aff7c2b62..38e2656684b3 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/gtk+/gtk+-3.24.20.ebuild b/x11-libs/gtk+/gtk+-3.24.20.ebuild
index 98eb7e862f68..f7d349a7880f 100644
--- a/x11-libs/gtk+/gtk+-3.24.20.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.20.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
xinerama? ( X )
"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# Upstream wants us to do their job:
# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
diff --git a/x11-libs/gtk+extra/gtk+extra-3.3.4.ebuild b/x11-libs/gtk+extra/gtk+extra-3.3.4.ebuild
index 03058820a695..98ccbdf2868f 100644
--- a/x11-libs/gtk+extra/gtk+extra-3.3.4.ebuild
+++ b/x11-libs/gtk+extra/gtk+extra-3.3.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/gtkextra/gtkextra-${PV}.tar.gz"
LICENSE="FDL-1.1 LGPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="+introspection static-libs test"
RESTRICT="!test? ( test )"
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index bd9c32046713..757791e9dc6e 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -1,3 +1,4 @@
DIST gtksourceview-2.10.5.tar.bz2 1253321 BLAKE2B 810a3eeca69bab4356b21c64129bb852e00d02c7937ad4a2ce3af9e48700da943d8d6834efcce9810dd49a54f39d4a074dc086a557128da51a593b2f23e58d48 SHA512 6f64acef6196bfc5953e0b148d7e460d366073b5e21367c01b01fc4d1c86ffe8aca71ecd77cf0814e47d8fc3085495f25bbbdc69e746987b02fd02fcda64886d
DIST gtksourceview-3.24.11.tar.xz 1438232 BLAKE2B a25762255a12887c8151465689e3acbd5864a6638044500acd087832888a092b8aad5d885d31c9dbe057ce183510afa2342bccb2a2675719dbba7e82be72368a SHA512 3490b34c6432a2e2ef292ad5bf982fdd22d33b1472434549b4ea8ddae0fc8808e128ef947e4d0dcb41e8de5e601b202f52532bbbbfa11d35050acfc42f9936b2
DIST gtksourceview-4.4.0.tar.xz 1105776 BLAKE2B ef4ed4ed15435daba60795598ba41624b2680b0518246d5d6ade3630cb96e2bac96fea08105e72db7b5a07e714f9270ce27c11e9448fd1b21e8d3942989b2255 SHA512 068e723525290c5356c5ce3f5e5b5b8ecc9f7b1ff2f8234da247d1a84bed63ff5601cad6550981720859286e107705ec25cc7793b754ada164ec6569df0df9eb
+DIST gtksourceview-4.6.1.tar.xz 1162024 BLAKE2B 41f84dade9e48cc958fecbf887f4c733cb1631557be34e52ca5af39802455f115e9920d368406314299aad35b1d18995c4e403f0ec3a9b3a27254fd1952f37e3 SHA512 3341e6248a0abba6373a79742b4348d8aff58ca6a4b9093729d0d1fe2579ab8acbc61f1ecc6d350000edae60c963eeca866fa659b3f3d6ec320cdbf1ed21fdec
diff --git a/x11-libs/gtksourceview/gtksourceview-4.6.1.ebuild b/x11-libs/gtksourceview/gtksourceview-4.6.1.ebuild
new file mode 100644
index 000000000000..7de4201a29d2
--- /dev/null
+++ b/x11-libs/gtksourceview/gtksourceview-4.6.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson vala virtualx xdg
+
+DESCRIPTION="A text widget implementing syntax highlighting and other features"
+HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
+
+LICENSE="LGPL-2.1+"
+SLOT="4"
+
+IUSE="glade gtk-doc +introspection +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+RDEPEND="
+ >=dev-libs/glib-2.48:2
+ >=x11-libs/gtk+-3.22:3[introspection?]
+ >=dev-libs/libxml2-2.6:2
+ glade? ( >=dev-util/glade-3.9:3.10 )
+ introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
+ >=dev-libs/fribidi-0.19.7
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/glib-utils
+ gtk-doc? ( >=dev-util/gtk-doc-1.25
+ app-text/docbook-xml-dtd:4.3 )
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+ use vala && vala_src_prepare
+ xdg_src_prepare
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use glade glade_catalog)
+ -Dinstall_tests=false
+ $(meson_use introspection gir)
+ $(meson_use vala vapi)
+ $(meson_use gtk-doc gtk_doc)
+ )
+ meson_src_configure
+}
+
+src_test() {
+ virtx meson_src_test
+}
+
+src_install() {
+ meson_src_install
+
+ insinto /usr/share/${PN}-4/language-specs
+ doins "${FILESDIR}"/2.0/gentoo.lang
+
+ # Avoid conflict with gtksourceview:3.0 glade-catalog
+ # TODO: glade doesn't actually show multiple GtkSourceView widget collections, so with both installed, can't really be sure which ones are used
+ if use glade; then
+ mv "${ED}"/usr/share/glade/catalogs/gtksourceview.xml "${ED}"/usr/share/glade/catalogs/gtksourceview-${SLOT}.xml || die
+ fi
+}
diff --git a/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild b/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild
index 5fa613294bc7..c165073fda3d 100644
--- a/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild
+++ b/x11-libs/snorenotify/snorenotify-0.7.0-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
@@ -12,7 +12,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
LICENSE="LGPL-3+"
SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE="sound test"
RESTRICT="!test? ( test )"
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index eebc617010e3..73723e273c1a 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/alacarte/alacarte-3.36.0.ebuild b/x11-misc/alacarte/alacarte-3.36.0.ebuild
index 03f6ba727ddb..e0e0b3da6b06 100644
--- a/x11-misc/alacarte/alacarte-3.36.0.ebuild
+++ b/x11-misc/alacarte/alacarte-3.36.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/alacarte"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/x11-misc/menumaker/Manifest b/x11-misc/menumaker/Manifest
index 5bd926640a2a..199c44262ce5 100644
--- a/x11-misc/menumaker/Manifest
+++ b/x11-misc/menumaker/Manifest
@@ -1,2 +1,2 @@
-DIST menumaker-0.99.10.tar.gz 202580 BLAKE2B 2fb53359a6e4b14fe8966c3fbb6d0f381a3ad9e52463d37edbef47a409b0ecf4f17bd7221395987d4cd49f363007aa97f0d6182595a571f1baab4e7977c06bff SHA512 e7a731ac848089cbdb845fdb0e344b48e70d3bb7220870127d3616549d31fa62b61a48e3efff52d7767b597a4407a8548e776c16976072d0aa7f5c96740cd207
DIST menumaker-0.99.11.tar.gz 205196 BLAKE2B 5f1fa9cbf4fd739499db86f9173fbbea2c96900597d13185f2a2f2b5746a0a2c05d12b115782488cb5b1df1f48638bb831dbee4bb14c414fc11328f43d241c46 SHA512 b45b8f2de4e63bad673bf4463ac074b068d4889cf37644962d51e1514d07bef827679d060d1503e59ea4bfc460fdc643d850921b3a02babd1ea57249511ffa5a
+DIST menumaker-0.99.12.tar.gz 206208 BLAKE2B c909a103bd031f385a1b7c19c8f17ac97310b3f19b2cf3eeb4b77ebfa82ac388cb9d76b1c88523942ce9d20016ba86bd4fa3741b31e3f6cd9ca63e10c8cab65e SHA512 dceef85da4d68a7f13bb59e1d93a51632d4134e55c59fa9cdf4ec4497eb502959c1b65ccaa56c2410f2fc5a770a9b023ddec05e80d186c88cdc1a351e1869af6
diff --git a/x11-misc/menumaker/files/menumaker-0.99.10-AM_PATH_PYTHON.patch b/x11-misc/menumaker/files/menumaker-0.99.12-AM_PATH_PYTHON.patch
similarity index 91%
rename from x11-misc/menumaker/files/menumaker-0.99.10-AM_PATH_PYTHON.patch
rename to x11-misc/menumaker/files/menumaker-0.99.12-AM_PATH_PYTHON.patch
index 8e645a8b2fbc..4df6939ce019 100644
--- a/x11-misc/menumaker/files/menumaker-0.99.10-AM_PATH_PYTHON.patch
+++ b/x11-misc/menumaker/files/menumaker-0.99.12-AM_PATH_PYTHON.patch
@@ -1,41 +1,8 @@
-Use AM_PATH_PYTHON instead of broken hacks
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,23 +1,13 @@
--AC_INIT(MenuMaker, 0.99.10)
-+AC_INIT([MenuMaker], [0.99.10])
-
- AM_INIT_AUTOMAKE
-
--#AZ_PYTHON_DEFAULT
-+AM_PATH_PYTHON
-
--#AZ_PYTHON_WITH
--
--#if test -z "$PYTHON"; then
--# AZ_PYTHON_PATH
--#fi
--
--#AZ_PYTHON_VERSION_ENSURE([2.7])
--
--#AZ_PYTHON_RUN
--
--AX_PYTHON
--
--AC_CONFIG_FILES([Makefile])
--AC_CONFIG_FILES([doc/Makefile])
--AC_CONFIG_FILES([Config.py])
-+AC_CONFIG_FILES([
-+ Makefile
-+ doc/Makefile
-+ Config.py
-+])
-
- AC_OUTPUT
+diff --git a/Makefile.am b/Makefile.am
+index b00b7bc..e1395ac 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -1,15 +1,53 @@
+@@ -1,15 +1,54 @@
-ACLOCAL_AMFLAGS = -I m4
-
SUBDIRS = doc
@@ -56,6 +23,7 @@ Use AM_PATH_PYTHON instead of broken hacks
+ MenuMaker/FluxBox.py \
+ MenuMaker/IceWM.py \
+ MenuMaker/__init__.py \
++ MenuMaker/JWM.py \
+ MenuMaker/OpenBox3.py \
+ MenuMaker/PekWM.py \
+ MenuMaker/WindowMaker.py \
@@ -98,3 +66,36 @@ Use AM_PATH_PYTHON instead of broken hacks
+ Prophet/Debian/menu/debian-8.1 \
+ Prophet/Debian/menu/ubuntu-5.04 \
+ Prophet/Debian/menu/ubuntu-5.10
+diff --git a/configure.ac b/configure.ac
+index 9ffeee7..604af4e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2,22 +2,12 @@ AC_INIT(MenuMaker, 0.99.12)
+
+ AM_INIT_AUTOMAKE
+
+-#AZ_PYTHON_DEFAULT
++AM_PATH_PYTHON
+
+-#AZ_PYTHON_WITH
+-
+-#if test -z "$PYTHON"; then
+-# AZ_PYTHON_PATH
+-#fi
+-
+-#AZ_PYTHON_VERSION_ENSURE([2.7])
+-
+-#AZ_PYTHON_RUN
+-
+-AX_PYTHON
+-
+-AC_CONFIG_FILES([Makefile])
+-AC_CONFIG_FILES([doc/Makefile])
+-AC_CONFIG_FILES([Config.py])
++AC_CONFIG_FILES([
++ Makefile
++ doc/Makefile
++ Config.py
++])
+
+ AC_OUTPUT
diff --git a/x11-misc/menumaker/menumaker-0.99.10.ebuild b/x11-misc/menumaker/menumaker-0.99.12.ebuild
similarity index 51%
rename from x11-misc/menumaker/menumaker-0.99.10.ebuild
rename to x11-misc/menumaker/menumaker-0.99.12.ebuild
index b7fbd34187e3..311238de9188 100644
--- a/x11-misc/menumaker/menumaker-0.99.10.ebuild
+++ b/x11-misc/menumaker/menumaker-0.99.12.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
-inherit autotools python-r1
+inherit autotools python-single-r1
DESCRIPTION="Utility that scans through the system and generates a menu of installed programs"
HOMEPAGE="http://menumaker.sourceforge.net/"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
IUSE="doc"
@@ -24,7 +24,7 @@ DEPEND="${RDEPEND}
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
PATCHES=(
- "${FILESDIR}"/${PN}-0.99.10-AM_PATH_PYTHON.patch
+ "${FILESDIR}"/${P}-AM_PATH_PYTHON.patch
)
src_prepare() {
@@ -33,26 +33,17 @@ src_prepare() {
}
src_configure() {
- configure() {
- ECONF_SOURCE="${S}" econf PYTHON="${EPYTHON}"
- }
- python_foreach_impl run_in_build_dir configure
+ ECONF_SOURCE="${S}" econf PYTHON="${EPYTHON}"
}
src_compile() {
- compile() {
- default
- use doc && emake html
- }
- python_foreach_impl run_in_build_dir compile
+ default
+ use doc && emake html
}
src_install() {
- compile() {
- default
- use doc && emake DESTDIR="${D}" install-html
- }
- python_foreach_impl run_in_build_dir compile
- python_replicate_script "${ED%/}"/usr/bin/mmaker
- einstalldocs
+ default
+ use doc && emake DESTDIR="${D}" install-html
+ python_optimize
+ python_fix_shebang "${ED}"/usr/bin/mmaker
}
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index 6dc518141bfe..1fce81202c15 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -1,2 +1,3 @@
DIST VirtualGL-2.6.1.tar.gz 1278335 BLAKE2B 62abb082eb8c82fecff33dd5b5036ebaead99b837cf0dc42581790863f09814858fd7a23a479c0c4ac5e59a4cc99af58903016a5109a6636191ce98d6da3d0bd SHA512 36580e55e11ba3e93945d62e865fe0b63ecd5aa1ee3889fb4d0940c68da06737fff4689a77638f5c8c57dbc9d020ba821bdec9aa2f6b2f0f144b18f1c3d8c5e5
DIST VirtualGL-2.6.3.tar.gz 1197037 BLAKE2B d331ddac80d98e5c1d6be90e90d06706ff3ea8c0c303aeab41536eb1a33014e5e100900f0f1f8734fad317d073c8259523dddb98d9658c2cfb2345ea1410fc0e SHA512 c01c602335d51c94840c32021a5ce4f982939d67efbe1458fce67582c5a76ac42f5b733998a8c8f04a77d57d7c2de01377f7cabcf848c01bfd9b2d8e0b318fea
+DIST VirtualGL-2.6.4.tar.gz 1198141 BLAKE2B 34794897f62ccdf7f5d80b1c4465af5e22d72408e14ae9243c66315c9ffeedb21eb5dc6afc95c889c000c46685b8ab6e0756edaee4f34d9d28ea0b71459efba3 SHA512 a475e5b7373d0c86ec7d1274f7527cd7bb1d82acdb38d42366faae58175052f957e090a4c8fdb4e3ba4b2b9063957c14b46d55316b69420247d2f9cf3afb1280
diff --git a/x11-misc/virtualgl/virtualgl-2.6.3.ebuild b/x11-misc/virtualgl/virtualgl-2.6.4.ebuild
similarity index 94%
rename from x11-misc/virtualgl/virtualgl-2.6.3.ebuild
rename to x11-misc/virtualgl/virtualgl-2.6.4.ebuild
index 223864f51a21..ec1b128132e7 100644
--- a/x11-misc/virtualgl/virtualgl-2.6.3.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.6.4.ebuild
@@ -14,7 +14,7 @@ else
MY_P="${MY_PN}-${PV}"
S="${WORKDIR}/${MY_P}"
SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="~amd64 ~x86"
fi
DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
@@ -35,6 +35,7 @@ RDEPEND="
x11-libs/libXtst[${MULTILIB_USEDEP}]
x11-libs/libXv[${MULTILIB_USEDEP}]
virtual/glu[${MULTILIB_USEDEP}]
+ virtual/opencl[${MULTILIB_USEDEP}]
virtual/opengl[${MULTILIB_USEDEP}]
amd64? ( abi_x86_32? (
>=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32]
@@ -43,16 +44,12 @@ RDEPEND="
>=x11-libs/libXtst-1.2.3[abi_x86_32]
>=x11-libs/libXv-1.0.10[abi_x86_32]
>=virtual/glu-9.0-r1[abi_x86_32]
+ virtual/opencl[abi_x86_32]
>=virtual/opengl-7.0-r1[abi_x86_32]
) )
"
DEPEND="${RDEPEND}"
-PATCHES=(
- # Fix build issue w/ Mesa 19.3.0+ headers (fixed in next version)
- "${FILESDIR}/${P}-mesa-19.3.patch"
-)
-
src_prepare() {
# Use /var/lib, bug #428122
sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index ec3fc8a4c5d6..b247dc36d1ae 100644
Binary files a/x11-plugins/Manifest.gz and b/x11-plugins/Manifest.gz differ
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index 28281cc3c541..2288be37356c 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -1,3 +1,4 @@
DIST enigmail-2.0.12.tar.gz 2614589 BLAKE2B 3db6f595c14e02cfdc71bebc763d05926dc6e0abf4668d132fd0ce43204e681de5fce45db752c4f49b231bd7e217b75c0f23d4a7e204fa9a3a51f1c8097fb63d SHA512 f9f4f1ed4c7244280be2fade0ccb2f4b5e7075dd60f53953478ffb84012e687b7ac7bad489c0b0cb2d8937916c783fe9e1841174bf1e5bdb9ab8cb58b415db74
DIST enigmail-2.1.5.tar.gz 2838286 BLAKE2B e86a340a916a7ac7ef39230e5bb5730198b672ab6c466db5085aa8a818da38e3681a6f22810355db986978c7d547ae50f6d70260a3ccdc9758861d03f3c4e5d5 SHA512 0ed104306ee998b368d4a5779c2daf7c20a112c9a37f357bbe10d8c64dd435448c71e83a0e1a1dc9eb10efcf654b1524676f2b490bf6a065e6dd66de0861baea
DIST enigmail-2.1.6.tar.gz 2838221 BLAKE2B e95569dcd58f16e64079436a24b152e7d5e3cfbc2067fe909b0f714a8acbcf80db7b1c288302c0ca11b2536fb2ff4f4376bd5de582f3b65fd01938182c9e8f9c SHA512 72159287601ed95052fcdeb3c973714e775150ba41894ecb6474798fd5109ab18dee0e3b8874a920fd07d3b184ed2034cf75f7baff4e14307d8739a312193919
+DIST enigmail-2.1.7.tar.gz 2851632 BLAKE2B 8f6d1ec16b48219c75c6dbcddf4807ed57965eeec29776e7c757d5aa34da6bfdbbb58964ee3d7de2efcb65ab69fa5b020f1a8ec01cd8eee662d8195a217cdc69 SHA512 1b57091c8ab9aaa086f327b78d904d688c850b6d39e37e2dac82e0629c0279723eae4608ecd08a24efe9ed1bdc86fbc497e97cd800c7349a70612a42b98f3e41
diff --git a/x11-plugins/enigmail/enigmail-2.1.7.ebuild b/x11-plugins/enigmail/enigmail-2.1.7.ebuild
new file mode 100644
index 000000000000..665dd902895c
--- /dev/null
+++ b/x11-plugins/enigmail/enigmail-2.1.7.ebuild
@@ -0,0 +1,84 @@
+# 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 python-any-r1
+
+DESCRIPTION="Mozilla extension to provide GPG support in mail clients"
+HOMEPAGE="https://www.enigmail.net/"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-3"
+IUSE=""
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.code.sf.net/p/enigmail/source"
+ S="${WORKDIR}/${P}"
+else
+ if [[ ${PV} = *_beta* ]] ; then
+ SRC_URI="https://www.enigmail.net/download/beta/${P/_/-}.tar.gz"
+ else
+ SRC_URI="https://www.enigmail.net/download/source/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+ fi
+ S="${WORKDIR}/${PN}"
+fi
+
+RDEPEND="
+ ( >=app-crypt/gnupg-2.0
+ || (
+ app-crypt/pinentry[gtk(-)]
+ app-crypt/pinentry[qt5(-)]
+ )
+ )
+ !=media-libs/harfbuzz-1.5.0:=
+ media-libs/libcanberra
+ media-libs/libpng:0=
+ sys-apps/dbus
+ sys-libs/zlib
+ x11-libs/libxcb[xkb]
+ x11-libs/libXcursor
+ x11-libs/libXi
+ x11-libs/libXinerama
+ x11-libs/libxkbcommon[X]
+ x11-libs/libXrandr
+ x11-terms/kitty-terminfo
+ wayland? (
+ dev-libs/wayland
+ >=dev-libs/wayland-protocols-1.17
+ )
+ $(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_6)
+"
+
+DEPEND="${RDEPEND}
+ media-libs/mesa[X]
+ sys-libs/ncurses
+"
+
+BDEPEND="virtual/pkgconfig"
+
+[[ ${PV} == *9999 ]] && BDEPEND+=" >=dev-python/sphinx-1.7"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.17.2-flags.patch
+ "${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
+ "${FILESDIR}"/${PN}-0.16.0-remove-terminfo.patch
+)
+
+src_prepare() {
+ default
+
+ # disable wayland as required
+ if ! use wayland; then
+ sed -i "/'x11 wayland'/s/ wayland//" setup.py || die
+ fi
+
+ # respect doc dir
+ sed -i "/htmldir =/s/appname/'${PF}'/" setup.py || die
+
+ tc-export CC
+}
+
+src_compile() {
+ "${EPYTHON}" setup.py \
+ --verbose $(usex debug --debug "") \
+ --libdir-name $(get_libdir) \
+ linux-package || die "Failed to compile kitty."
+}
+
+src_test() {
+ export KITTY_CONFIG_DIRECTORY=${T}
+ "${EPYTHON}" test.py || die
+}
+
+src_install() {
+ insinto /usr
+ doins -r linux-package/*
+ dobin linux-package/bin/kitty
+ python_fix_shebang "${ED}"
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ optfeature "Displaying images in the terminal" virtual/imagemagick-tools
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/x11-terms/pangoterm/metadata.xml b/x11-terms/pangoterm/metadata.xml
index d8772d4166ca..58f638b2ac3e 100644
--- a/x11-terms/pangoterm/metadata.xml
+++ b/x11-terms/pangoterm/metadata.xml
@@ -1,8 +1,5 @@
-
- tranquility@gentoo.org
- Ole Reifschneider
-
+
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index cf83163ae2fc..c5d4c401aa87 100644
Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ
diff --git a/x11-themes/kvantum/Manifest b/x11-themes/kvantum/Manifest
index 2fa8ce39b07d..46575811dd59 100644
--- a/x11-themes/kvantum/Manifest
+++ b/x11-themes/kvantum/Manifest
@@ -1,2 +1 @@
-DIST kvantum-0.14.1.tar.gz 2461477 BLAKE2B 6c7fd45801eff1183ee46a157b5c31591da31c9b5fa9586b6095074a272fa705ac826733ce45a679b857276fbd358fdb56dc72ffe6c4744557e25c9c6782ca4a SHA512 18faa895bb6affa1744d15aa5b64636c49f7780eddca62ecee18c133702a156bca055cda473af9ea72e1d6de17fd86c4d7212bd16c544030d96d8afa4f5aff69
-DIST kvantum-0.15.2.tar.gz 2652167 BLAKE2B 610bd705d40605cf7d14ffe9acc62bcd276159ffd6f12c315871d633be74d986efc6c45ac938b26851af78565140e2a0dc0424174c543a0622dbf9c951225668 SHA512 98b83a14c3c86636acb6f2440d64dc47496536b5487dc08aed8e8370d656e8838d00866bfb54a4b5752135bdc3d3da0eaab209f5ca3e33c237aada59640a78f7
+DIST kvantum-0.16.0.tar.gz 2696870 BLAKE2B 67d52cba8c621a804a81d702be01547660a52619ea499997e5d6f5c37e8970bf5b598ee0dd5b6ec397ed30c50024f5a83181771aaad3cabd195d2c8f52bf8d15 SHA512 a70c8f46ee556627dadaf68d998c0e37730978f6c9cb143b27ec1cdb7b912fceb62f83ca2f9fadd49f5230e0254d0f9c5f29c51fba941cdc7cc8572011aefe06
diff --git a/x11-themes/kvantum/kvantum-0.15.2.ebuild b/x11-themes/kvantum/kvantum-0.15.2.ebuild
deleted file mode 100644
index e52409193b01..000000000000
--- a/x11-themes/kvantum/kvantum-0.15.2.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
-
-inherit cmake-utils
-
-MY_PN="Kvantum"
-
-DESCRIPTION="SVG-based theme engine for Qt5, KDE and LXQt"
-HOMEPAGE="https://github.com/tsujan/Kvantum"
-SRC_URI="https://github.com/tsujan/${MY_PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5=
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- kde-frameworks/kwindowsystem:5
- x11-libs/libX11
- x11-libs/libXext
-"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-S="${WORKDIR}/${MY_PN}-${PV}/${MY_PN}"
diff --git a/x11-themes/kvantum/kvantum-0.14.1.ebuild b/x11-themes/kvantum/kvantum-0.16.0.ebuild
similarity index 100%
rename from x11-themes/kvantum/kvantum-0.14.1.ebuild
rename to x11-themes/kvantum/kvantum-0.16.0.ebuild
diff --git a/x11-themes/xxv-skins/xxv-skins-1.6.1-r1.ebuild b/x11-themes/xxv-skins/xxv-skins-1.6.1-r1.ebuild
index c1e16c6c680a..6b5eb87ec4d4 100644
--- a/x11-themes/xxv-skins/xxv-skins-1.6.1-r1.ebuild
+++ b/x11-themes/xxv-skins/xxv-skins-1.6.1-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=5
@@ -6,7 +6,7 @@ EAPI=5
inherit eutils
DESCRIPTION="Additional skins for XXV"
-HOMEPAGE="http://projects.vdr-developer.org/projects/xxv"
+HOMEPAGE="https://projects.vdr-developer.org/projects/xxv"
SRC_URI="mirror://vdr-developerorg/719/${P}.tgz
mirror://vdr-developerorg/720/xxv-jason-${PV}.tgz"
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index f106b6deaa5e..a9c56d89c0f0 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/cwm/Manifest b/x11-wm/cwm/Manifest
index a1b8eb1a9dfe..b51173f2d84f 100644
--- a/x11-wm/cwm/Manifest
+++ b/x11-wm/cwm/Manifest
@@ -1,3 +1,2 @@
-DIST cwm-5.6-chneukirchen.tar.gz 50799 BLAKE2B 4d9341e89b21187044bbcbc658dea2eac6f6c1c87f25e1b0b81871a9f8b95af7354c8b486bd77f201acba430e019a5c784591cfc5efb281fd40d6670749958ad SHA512 0bb5f9c69e1ed30ef38ced70008baa347032a0c31ee2d4a88e3b45092969a5427ef160577da4891aba3181067235b244f11fc796815f41448930b438099b5bfc
-DIST cwm-5.6-xmw.tar.gz 53738 BLAKE2B 9c36c42fc35a8206035ed59fb8fe2e8eb13effcdb43d488bcc99c2d0f48476e206e46fd52c0928afdb51d55c68d9be03a186aaf4c49d03bcdf8754df0c5d81db SHA512 cf0174523838dba5997206be904ab667efc5ff7e413e98bb81cc3a69d40a79b54e21405787e088486feb8790d1094a2d3cce0be08d7ee36a2b9b0dadd78466c7
DIST cwm-6.6.tar.gz 53062 BLAKE2B 3da762f0c1a48c83c773a1f355cc970c5e4f6100e7294a00f44c6b5b7e1ffe954fde0e3d106991b05cd1f8c898fe055b5305b0bd7bf533df5868d32adbae2c5f SHA512 ff94fd1b7d263f9de538e5b338db58a08e1bec3e4233b84ab0a3ac94c47a45e10b2c772f93b897e70baf9a3c04e1a6fa04604ac71655acb7ebd1d10edb381042
+DIST cwm-6.7.tar.gz 53172 BLAKE2B 9e8c6503235ee71f3974a4e64cf45b80675b6ff33a68505b07f003c8d711a68a158f31147f463d5467bb4242c6321ebe0acaee63727689a136ca83c47e7592ea SHA512 5ad0fa56d9c96c36cc32e68128e58d4e3a7483f349bb26be1083c5b5c6d853ff05eec1a783b07ed928bd99a35a2e0b2d7053fc89b828aa9bdfe3589a318c4171
diff --git a/x11-wm/cwm/cwm-5.6.ebuild b/x11-wm/cwm/cwm-5.6.ebuild
deleted file mode 100644
index 82d341433eaa..000000000000
--- a/x11-wm/cwm/cwm-5.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="OpenBSD fork of calmwm, a clean and lightweight window manager"
-HOMEPAGE="https://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/
- https://github.com/chneukirchen/cwm"
-SRC_URI="vanilla? ( http://chneukirchen.org/releases/${P}.tar.gz -> ${P}-chneukirchen.tar.gz )
- !vanilla? ( https://github.com/xmw/cwm/tarball/ea9a436 -> ${P}-xmw.tar.gz )"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="vanilla"
-
-RDEPEND="x11-libs/libXft
- x11-libs/libXinerama
- x11-libs/libXrandr"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- sys-devel/bison"
-
-src_unpack() {
- default
- # vcs-snapshot doesn't work with tarball names
- if ! use vanilla ; then
- mv *${PN}-* ${P} || die
- fi
-}
-
-src_compile() {
- emake CFLAGS="${CFLAGS} -D_GNU_SOURCE" CC="$(tc-getCC)"
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX=/usr install
- dodoc README
- make_session_desktop ${PN} ${PN}
-}
diff --git a/x11-wm/cwm/cwm-6.7.ebuild b/x11-wm/cwm/cwm-6.7.ebuild
new file mode 100644
index 000000000000..c35cf81e9f80
--- /dev/null
+++ b/x11-wm/cwm/cwm-6.7.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="OpenBSD fork of calmwm, a clean and lightweight window manager"
+HOMEPAGE="https://github.com/leahneukirchen/cwm
+ https://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/
+"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/leahneukirchen/cwm.git"
+else
+ SRC_URI="https://github.com/leahneukirchen/cwm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+
+DEPEND="x11-libs/libXft
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ sys-devel/bison
+ virtual/pkgconfig
+"
+
+src_compile() {
+ emake CFLAGS="${CFLAGS} -D_GNU_SOURCE" CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX=/usr install
+ dodoc README
+ make_session_desktop ${PN} ${PN}
+}
diff --git a/x11-wm/cwm/cwm-9999.ebuild b/x11-wm/cwm/cwm-9999.ebuild
index 23dab4acd436..c35cf81e9f80 100644
--- a/x11-wm/cwm/cwm-9999.ebuild
+++ b/x11-wm/cwm/cwm-9999.ebuild
@@ -6,27 +6,28 @@ EAPI=7
inherit desktop toolchain-funcs
DESCRIPTION="OpenBSD fork of calmwm, a clean and lightweight window manager"
-HOMEPAGE="https://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/
- https://github.com/chneukirchen/cwm"
+HOMEPAGE="https://github.com/leahneukirchen/cwm
+ https://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/
+"
if [[ ${PV} == 9999 ]]; then
inherit git-r3
- EGIT_REPO_URI="https://github.com/leahneukirchen/${PN}.git"
- KEYWORDS=""
+ EGIT_REPO_URI="https://github.com/leahneukirchen/cwm.git"
else
- SRC_URI="https://github.com/leahneukirchen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/leahneukirchen/cwm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
LICENSE="ISC"
SLOT="0"
-RDEPEND="x11-libs/libXft
+DEPEND="x11-libs/libXft
x11-libs/libXinerama
x11-libs/libXrandr
"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/bison
+RDEPEND="${DEPEND}"
+BDEPEND="
+ sys-devel/bison
virtual/pkgconfig
"
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index be7e4c69dac9..ff7d34213605 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,2 +1,3 @@
DIST mutter-3.34.5.tar.xz 2804640 BLAKE2B b73a34f4e064b74b321b7ac54749170663c10874a82c0e4f6b20b1f9d97662af0ba188e5ac13a187117765b8aee820fc7367dfbeecc26002942151e77433012c SHA512 4199cf66e6551ebf80b9d2217e3164b1de30b055c58a64bc2d88961aad3a35c137174f6aea96f0250fa3efb2bf4676aa409fefb1a9237bbc7acf438aeed2e78a
+DIST mutter-3.34.6-patchset.tar.xz 4748 BLAKE2B 103f17256c7a9f347aadd58119e0e92c844bf372723e1462ea343fe9a80d7ed9dd55ad04215216dd51f97143e23b201e056f2e17a1808a22fe2d4e0f8e8da659 SHA512 79e1d72d14643ef3b6d9da0532ca636e41a110bcc7e8fe1553940ca6c1e2cf6414923a707bdde7823449ef7b0535d8c97ae0ae57a02f55e90950e8c127340ade
DIST mutter-3.34.6.tar.xz 2805328 BLAKE2B bba0e062ab81f8e88e7e59b6dbf51226b6e2d43932c7d61aca5a3e709119f909e30acea67a5444c95205ddf929a1f5bf7785eec7aed4f2da743c19543aa79962 SHA512 dd240fdcfc8ba0c62c0ff423a40ec6e0007d154f0be39e18cea543da7ff548e10a9b712f9b2cc09c58ad342b1e7eb50fb2a8790c55d284846bb6f1a76f8c6d6b
diff --git a/x11-wm/mutter/files/3.34.6-tests-dontreq-gdkwayland.patch b/x11-wm/mutter/files/3.34.6-tests-dontreq-gdkwayland.patch
new file mode 100644
index 000000000000..810801977af8
--- /dev/null
+++ b/x11-wm/mutter/files/3.34.6-tests-dontreq-gdkwayland.patch
@@ -0,0 +1,51 @@
+From fd10425c598f7b3db16521c2709032fd2ea5a396 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp
+Date: Sun, 28 Jun 2020 09:26:33 +0300
+Subject: [PATCH] test-client: Fix compilation without GDK_WINDOWING_WAYLAND
+
+---
+ src/tests/test-client.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/tests/test-client.c b/src/tests/test-client.c
+index 83a5ce485..80c239310 100644
+--- a/src/tests/test-client.c
++++ b/src/tests/test-client.c
+@@ -22,7 +22,9 @@
+ #include
+ #include
+ #include
++#ifdef GDK_WINDOWING_WAYLAND
+ #include
++#endif
+ #include
+ #include
+ #include
+@@ -46,8 +48,10 @@ window_export_handle_cb (GdkWindow *window,
+ {
+ GdkWindow *gdk_window = gtk_widget_get_window (GTK_WIDGET (user_data));
+
++#ifdef GDK_WINDOWING_WAYLAND
+ if (!gdk_wayland_window_set_transient_for_exported (gdk_window,
+ (gchar *) handle_str))
++#endif
+ g_print ("Fail to set transient_for exported window handle %s", handle_str);
+ gdk_window_set_modal_hint (gdk_window, TRUE);
+ }
+@@ -377,11 +381,13 @@ process_line (const char *line)
+ goto out;
+ }
+
++#ifdef GDK_WINDOWING_WAYLAND
+ GdkWindow *parent_gdk_window = gtk_widget_get_window (parent_window);
+ if (!gdk_wayland_window_export_handle (parent_gdk_window,
+ window_export_handle_cb,
+ window,
+ NULL))
++#endif
+ g_print ("Fail to export handle for window id %s", argv[2]);
+ }
+ else if (strcmp (argv[0], "accept_focus") == 0)
+--
+2.20.1
+
diff --git a/x11-wm/mutter/mutter-3.34.6-r1.ebuild b/x11-wm/mutter/mutter-3.34.6-r1.ebuild
index 722e7bb3d139..c6e568965e54 100644
--- a/x11-wm/mutter/mutter-3.34.6-r1.ebuild
+++ b/x11-wm/mutter/mutter-3.34.6-r1.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
test? ( wayland )"
RESTRICT="!test? ( test )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
# xorg-server is needed at build and runtime with USE=wayland for Xwayland
@@ -94,6 +94,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/3.32-eglmesaext-include.patch
"${FILESDIR}"/${PV}-XInitThreads.patch
+ "${FILESDIR}"/${PV}-tests-dontreq-gdkwayland.patch
)
src_configure() {
diff --git a/x11-wm/mutter/mutter-3.34.6-r2.ebuild b/x11-wm/mutter/mutter-3.34.6-r2.ebuild
new file mode 100644
index 000000000000..d04f56b67e4a
--- /dev/null
+++ b/x11-wm/mutter/mutter-3.34.6-r2.ebuild
@@ -0,0 +1,147 @@
+# 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="GNOME 3 compositing window manager based on Clutter"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/5" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-.pc) should use the subslot
+
+IUSE="elogind input_devices_wacom +introspection +sysprof systemd test udev wayland"
+# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
+REQUIRED_USE="
+ wayland? ( ^^ ( elogind systemd ) udev )
+ test? ( wayland )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
+# xorg-server is needed at build and runtime with USE=wayland for Xwayland
+# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
+DEPEND="
+ x11-libs/libX11
+ >=x11-libs/gtk+-3.19.8:3[X,introspection?]
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/pango-1.30[introspection?]
+ >=dev-libs/fribidi-1.0.0
+ >=x11-libs/cairo-1.14[X]
+ >=gnome-base/gsettings-desktop-schemas-3.33.0[introspection?]
+ >=dev-libs/glib-2.61.1:2
+ gnome-base/gnome-settings-daemon
+ >=dev-libs/json-glib-0.12.0[introspection?]
+ gnome-base/gnome-desktop:3=
+ >=x11-libs/libXcomposite-0.4
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ >=x11-libs/libXfixes-3
+ >=x11-libs/libXi-1.7.4
+ x11-libs/libXtst
+ x11-libs/libxkbfile
+ x11-misc/xkeyboard-config
+ >=x11-libs/libxkbcommon-0.4.3[X]
+ x11-libs/libXrender
+ >=x11-libs/libXrandr-1.5.0
+ x11-libs/libxcb
+ x11-libs/libXinerama
+ x11-libs/libXau
+ x11-libs/libICE
+ >=dev-libs/atk-2.5.3[introspection?]
+ >=media-libs/libcanberra-0.26
+ media-libs/mesa[X(+),egl]
+ wayland? (
+ >=dev-libs/wayland-protocols-1.18
+ >=dev-libs/wayland-1.13.0
+ x11-libs/libdrm:=
+ >=media-libs/mesa-10.3[egl,gbm,wayland,gles2]
+ >=dev-libs/libinput-1.4
+ systemd? ( sys-apps/systemd )
+ elogind? ( sys-auth/elogind )
+ x11-base/xorg-server[wayland]
+ )
+ udev? ( >=dev-libs/libgudev-232:=
+ >=virtual/libudev-232-r1:= )
+ x11-libs/libSM
+ input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
+ >=x11-libs/startup-notification-0.7
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+ gnome-extra/zenity
+"
+DEPEND="${DEPEND}
+ x11-base/xorg-proto
+ sysprof? ( >=dev-util/sysprof-capture-3.34.1-r1:3 )
+"
+# wayland bdepend for wayland-scanner, xorg-server for cvt utility
+BDEPEND="
+ dev-libs/wayland
+ >=dev-util/meson-0.50.0
+ dev-util/gdbus-codegen
+ dev-util/glib-utils
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ test? ( app-text/docbook-xml-dtd:4.5 )
+ wayland? ( >=sys-kernel/linux-headers-4.4
+ x11-base/xorg-server )
+"
+
+PATCHES=(
+ "${WORKDIR}"/patches/
+ "${FILESDIR}"/3.32-eglmesaext-include.patch
+ "${FILESDIR}"/${PV}-tests-dontreq-gdkwayland.patch
+)
+
+src_configure() {
+ # TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain
+ local emesonargs=(
+ -Dopengl=true
+ #opengl_libname
+ #gles2_libname
+ $(meson_use wayland gles2)
+ -Degl=true
+ -Dglx=true
+ $(meson_use wayland)
+ $(meson_use wayland native_backend)
+ -Dremote_desktop=false # not bothering with pipewire-0.2; to be reintroduced in newer mutter via pipewire-0.3
+ -Degl_device=false # This should be dependent on wayland,video_drivers_nvidia, once eglstream support is there
+ -Dwayland_eglstream=false # requires packages egl-wayland for wayland-eglstream-protocols.pc
+ $(meson_use udev)
+ $(meson_use input_devices_wacom libwacom)
+ -Dpango_ft2=true
+ -Dstartup_notification=true
+ -Dsm=true
+ $(meson_use introspection)
+ $(meson_use test cogl_tests)
+ $(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed
+ $(meson_use test clutter_tests)
+ $(meson_use test tests)
+ $(meson_use sysprof profiler)
+ -Dinstalled_tests=false
+ #verbose # Let upstream choose default for verbose mode
+ #xwayland_path
+ # TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops)
+ #xwayland_grab_default_access_rules
+ )
+ meson_src_configure
+}
+
+src_test() {
+ glib-compile-schemas "${BUILD_DIR}"/data
+ GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data virtx meson_src_test
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 2844b4f789db..880b4f346080 100644
Binary files a/xfce-extra/Manifest.gz and b/xfce-extra/Manifest.gz differ
diff --git a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.2.ebuild b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.2.ebuild
index 9aab5c50ce62..02d0d033f7fb 100644
--- a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.2.ebuild
+++ b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.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=7
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
IUSE="debug keybinder libnotify wnck"
RDEPEND=">=dev-libs/glib-2.42.0:=
diff --git a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.3.ebuild b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.3.ebuild
index 37630efd582c..b5e58098a79b 100644
--- a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.3.ebuild
+++ b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
IUSE="debug keybinder libnotify wnck"
RDEPEND=">=dev-libs/glib-2.42.0:=
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.4.3.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.4.3.ebuild
index 73770954f8a7..a6a2f1033366 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.4.3.ebuild
+++ b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE=""
RDEPEND="
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.4.4.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.4.4.ebuild
index f6208090e372..1d5070d62417 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.4.4.ebuild
+++ b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.4.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
IUSE=""
RDEPEND="