summaryrefslogtreecommitdiff
path: root/dev-util
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/android-studio/Manifest1
-rw-r--r--dev-util/android-studio/android-studio-4.1.1.0.201.6953283.ebuild129
-rw-r--r--dev-util/android-tools/Manifest17
-rw-r--r--dev-util/android-tools/android-tools-5.1.1_p13.ebuild65
-rw-r--r--dev-util/android-tools/android-tools-6.0.1_p79.ebuild87
-rw-r--r--dev-util/android-tools/android-tools-8.1.0_p1.ebuild125
-rw-r--r--dev-util/argouml/argouml-0.34.ebuild4
-rw-r--r--dev-util/astyle/astyle-3.0.1-r1.ebuild4
-rw-r--r--dev-util/astyle/astyle-3.1-r2.ebuild4
-rw-r--r--dev-util/bats/bats-1.2.1.ebuild4
-rw-r--r--dev-util/bats/metadata.xml1
-rw-r--r--dev-util/bcc/Manifest1
-rw-r--r--dev-util/bcc/bcc-0.17.0-r100.ebuild106
-rw-r--r--dev-util/bcc/bcc-0.18.0-r1.ebuild107
-rw-r--r--dev-util/bcpp/Manifest1
-rw-r--r--dev-util/bcpp/bcpp-20150811-r1.ebuild6
-rw-r--r--dev-util/bcpp/bcpp-20210108.ebuild34
-rw-r--r--dev-util/bitcoin-tx/bitcoin-tx-0.20.1.ebuild4
-rw-r--r--dev-util/bitrise/bitrise-1.24.0.ebuild2
-rw-r--r--dev-util/bnfc/Manifest1
-rw-r--r--dev-util/bnfc/bnfc-2.8.1.ebuild39
-rw-r--r--dev-util/bnfc/files/bnfc-2.8.1-ghc84-p2.patch130
-rw-r--r--dev-util/bnfc/files/bnfc-2.8.1-ghc84.patch31
-rw-r--r--dev-util/boost-build/Manifest2
-rw-r--r--dev-util/boost-build/boost-build-1.74.0.ebuild4
-rw-r--r--dev-util/boost-build/boost-build-1.75.0.ebuild (renamed from dev-util/boost-build/boost-build-1.72.0.ebuild)12
-rw-r--r--dev-util/boost-build/files/boost-build-1.71.0-add-none-feature-options.patch22
-rw-r--r--dev-util/boost-build/files/boost-build-1.71.0-no-implicit-march-flags.patch266
-rw-r--r--dev-util/bsdiff/bsdiff-4.3-r4.ebuild2
-rw-r--r--dev-util/btyacc/btyacc-3.0-r3.ebuild4
-rw-r--r--dev-util/buildbot-badges/Manifest1
-rw-r--r--dev-util/buildbot-badges/buildbot-badges-2.10.0.ebuild38
-rw-r--r--dev-util/buildbot-badges/buildbot-badges-2.8.2.ebuild4
-rw-r--r--dev-util/buildbot-badges/buildbot-badges-2.8.4.ebuild4
-rw-r--r--dev-util/buildbot-console-view/Manifest1
-rw-r--r--dev-util/buildbot-console-view/buildbot-console-view-2.10.0.ebuild37
-rw-r--r--dev-util/buildbot-console-view/buildbot-console-view-2.8.2.ebuild4
-rw-r--r--dev-util/buildbot-console-view/buildbot-console-view-2.8.4.ebuild4
-rw-r--r--dev-util/buildbot-grid-view/Manifest1
-rw-r--r--dev-util/buildbot-grid-view/buildbot-grid-view-2.10.0.ebuild37
-rw-r--r--dev-util/buildbot-grid-view/buildbot-grid-view-2.8.2.ebuild4
-rw-r--r--dev-util/buildbot-grid-view/buildbot-grid-view-2.8.4.ebuild4
-rw-r--r--dev-util/buildbot-pkg/Manifest1
-rw-r--r--dev-util/buildbot-pkg/buildbot-pkg-2.10.0.ebuild27
-rw-r--r--dev-util/buildbot-waterfall-view/Manifest1
-rw-r--r--dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.10.0.ebuild34
-rw-r--r--dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.8.2.ebuild4
-rw-r--r--dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.8.4.ebuild4
-rw-r--r--dev-util/buildbot-worker/Manifest1
-rw-r--r--dev-util/buildbot-worker/buildbot-worker-2.10.0.ebuild126
-rw-r--r--dev-util/buildbot-wsgi-dashboards/Manifest1
-rw-r--r--dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.10.0.ebuild32
-rw-r--r--dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.2.ebuild4
-rw-r--r--dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.4.ebuild4
-rw-r--r--dev-util/buildbot-www/Manifest1
-rw-r--r--dev-util/buildbot-www/buildbot-www-2.10.0.ebuild29
-rw-r--r--dev-util/buildbot-www/buildbot-www-2.8.2.ebuild4
-rw-r--r--dev-util/buildbot-www/buildbot-www-2.8.4.ebuild4
-rw-r--r--dev-util/buildbot/Manifest1
-rw-r--r--dev-util/buildbot/buildbot-2.10.0.ebuild198
-rw-r--r--dev-util/buildbot/buildbot-9999.ebuild7
-rw-r--r--dev-util/bustle/Manifest2
-rw-r--r--dev-util/bustle/bustle-0.8.0.ebuild (renamed from dev-util/bustle/bustle-0.5.4.ebuild)39
-rw-r--r--dev-util/bustle/metadata.xml5
-rw-r--r--dev-util/byacc/byacc-20200330.ebuild4
-rw-r--r--dev-util/byacc/byacc-20200910.ebuild4
-rw-r--r--dev-util/cargo-c/Manifest89
-rw-r--r--dev-util/cargo-c/cargo-c-0.7.0.ebuild176
-rw-r--r--dev-util/catalyst/Manifest1
-rw-r--r--dev-util/catalyst/catalyst-3.0.14.ebuild4
-rw-r--r--dev-util/catalyst/catalyst-3.0.15.ebuild69
-rw-r--r--dev-util/catalyst/catalyst-9999.ebuild4
-rw-r--r--dev-util/catfish/Manifest2
-rw-r--r--dev-util/catfish/catfish-1.4.13-r1.ebuild132
-rw-r--r--dev-util/catfish/catfish-1.4.13.ebuild49
-rw-r--r--dev-util/catfish/catfish-4.15.0.ebuild51
-rw-r--r--dev-util/catfish/catfish-4.16.0.ebuild51
-rw-r--r--dev-util/catfish/metadata.xml2
-rw-r--r--dev-util/catkin/Manifest2
-rw-r--r--dev-util/catkin/catkin-0.8.9.ebuild (renamed from dev-util/catkin/catkin-0.8.8-r1.ebuild)2
-rw-r--r--dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch26
-rw-r--r--dev-util/ccache/ccache-3.7.12.ebuild2
-rw-r--r--dev-util/ccache/ccache-4.1.ebuild12
-rw-r--r--dev-util/ccls/Manifest3
-rw-r--r--dev-util/ccls/ccls-0.20190823.6.ebuild45
-rw-r--r--dev-util/ccls/ccls-0.20201219.ebuild (renamed from dev-util/ccls/ccls-0.20201025.ebuild)1
-rw-r--r--dev-util/ccls/ccls-9999.ebuild1
-rw-r--r--dev-util/cgvg/cgvg-1.6.3.ebuild2
-rw-r--r--dev-util/checkbashisms/Manifest1
-rw-r--r--dev-util/checkbashisms/checkbashisms-2.20.4.ebuild4
-rw-r--r--dev-util/checkbashisms/checkbashisms-2.20.5.ebuild37
-rw-r--r--dev-util/checkstyle/checkstyle-7.2.ebuild4
-rw-r--r--dev-util/clazy/Manifest2
-rw-r--r--dev-util/clazy/clazy-1.8.ebuild4
-rw-r--r--dev-util/clazy/clazy-1.9.ebuild (renamed from dev-util/clazy/clazy-1.7-r1.ebuild)9
-rw-r--r--dev-util/clazy/files/clazy-1.7-gnuinstalldirs.patch82
-rw-r--r--dev-util/clazy/files/clazy-1.7-llvm11-1.patch343
-rw-r--r--dev-util/clazy/files/clazy-1.7-llvm11-2.patch28
-rw-r--r--dev-util/clion/Manifest5
-rw-r--r--dev-util/clion/clion-2020.2.4.ebuild80
-rw-r--r--dev-util/clion/clion-2020.3.1-r1.ebuild105
-rw-r--r--dev-util/clion/clion-2020.3.ebuild71
-rw-r--r--dev-util/clion/clion-9999.ebuild71
-rw-r--r--dev-util/clion/metadata.xml16
-rw-r--r--dev-util/cloc/cloc-1.86.ebuild2
-rw-r--r--dev-util/cmake/Manifest4
-rw-r--r--dev-util/cmake/cmake-3.13.5.ebuild4
-rw-r--r--dev-util/cmake/cmake-3.17.4-r1.ebuild4
-rw-r--r--dev-util/cmake/cmake-3.18.5.ebuild4
-rw-r--r--dev-util/cmake/cmake-3.19.2.ebuild (renamed from dev-util/cmake/cmake-3.19.1-r1.ebuild)9
-rw-r--r--dev-util/cmake/cmake-3.19.3.ebuild (renamed from dev-util/cmake/cmake-3.16.5.ebuild)68
-rw-r--r--dev-util/cmake/files/cmake-3.14.0_rc1-FindLAPACK.patch55
-rw-r--r--dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch8
-rw-r--r--dev-util/cmake/files/cmake-3.15.0_rc2-FindBLAS.patch37
-rw-r--r--dev-util/cmake/files/cmake-3.19.1-fix-spurious-include-target.patch198
-rw-r--r--dev-util/cmake/files/cmake-3.19.1-use-FPHSA-outside-find_package.patch40
-rw-r--r--dev-util/colm/Manifest4
-rw-r--r--dev-util/colm/colm-0.14.4.ebuild (renamed from dev-util/colm/colm-0.13.0.6-r1.ebuild)3
-rw-r--r--dev-util/colm/colm-0.14.5.ebuild (renamed from dev-util/colm/colm-0.13.0.7.ebuild)5
-rw-r--r--dev-util/colorgcc/colorgcc-1.3.2-r7.ebuild4
-rw-r--r--dev-util/conf2struct/conf2struct-1.0-r1.ebuild (renamed from dev-util/conf2struct/conf2struct-1.0.ebuild)4
-rw-r--r--dev-util/conf2struct/conf2struct-1.3-r1.ebuild (renamed from dev-util/conf2struct/conf2struct-1.3.ebuild)4
-rw-r--r--dev-util/conf2struct/conf2struct-9999.ebuild4
-rw-r--r--dev-util/confix-wrapper/confix-wrapper-1.ebuild4
-rw-r--r--dev-util/cppcheck/cppcheck-1.88.ebuild2
-rw-r--r--dev-util/cppunit/Manifest1
-rw-r--r--dev-util/cppunit/cppunit-1.14.0.ebuild4
-rw-r--r--dev-util/cppunit/cppunit-1.15.1.ebuild70
-rw-r--r--dev-util/cppunit/cppunit-9999.ebuild45
-rw-r--r--dev-util/cproto/Manifest2
-rw-r--r--dev-util/cproto/cproto-4.7q.ebuild4
-rw-r--r--dev-util/cproto/cproto-4.7r.ebuild (renamed from dev-util/cproto/cproto-4.7o.ebuild)6
-rw-r--r--dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild2
-rw-r--r--dev-util/cram/cram-0.7-r1.ebuild4
-rw-r--r--dev-util/cram/metadata.xml7
-rw-r--r--dev-util/crash/Manifest2
-rw-r--r--dev-util/crash/crash-7.2.9.ebuild41
-rw-r--r--dev-util/crash/crash-9999.ebuild41
-rw-r--r--dev-util/cscope/cscope-15.8a-r1.ebuild2
-rw-r--r--dev-util/cscope/cscope-15.8a-r2.ebuild4
-rw-r--r--dev-util/cscope/cscope-15.9.ebuild4
-rw-r--r--dev-util/ctags/ctags-20190331.ebuild4
-rw-r--r--dev-util/cvise/Manifest5
-rw-r--r--dev-util/cvise/cvise-1.6.0.ebuild59
-rw-r--r--dev-util/cvise/cvise-1.9.0.ebuild2
-rw-r--r--dev-util/cvise/cvise-2.0.0.ebuild (renamed from dev-util/cvise/cvise-1.8.0.ebuild)9
-rw-r--r--dev-util/cvise/cvise-2.1.0.ebuild (renamed from dev-util/cvise/cvise-1.7.0-r1.ebuild)7
-rw-r--r--dev-util/cvise/files/cvise-2.0.0-shebang.patch34
-rw-r--r--dev-util/cwdiff/cwdiff-0.4.0.ebuild4
-rw-r--r--dev-util/cwdiff/cwdiff-9999.ebuild4
-rw-r--r--dev-util/datagrip/Manifest3
-rw-r--r--dev-util/datagrip/datagrip-2020.3.ebuild69
-rw-r--r--dev-util/datagrip/datagrip-9999.ebuild69
-rw-r--r--dev-util/ddd/ddd-3.3.12-r4.ebuild2
-rw-r--r--dev-util/debhelper/Manifest3
-rw-r--r--dev-util/debhelper/debhelper-13.1.ebuild74
-rw-r--r--dev-util/debhelper/debhelper-13.2.ebuild74
-rw-r--r--dev-util/debhelper/debhelper-9.20160814.ebuild74
-rw-r--r--dev-util/debootstrap/debootstrap-1.0.123.ebuild2
-rw-r--r--dev-util/debugedit/Manifest3
-rw-r--r--dev-util/debugedit/debugedit-4.16.1.2.ebuild (renamed from dev-util/debugedit/debugedit-4.16.0.ebuild)4
-rw-r--r--dev-util/debugedit/debugedit-4.16.1.ebuild91
-rw-r--r--dev-util/dejagnu/dejagnu-1.6.2.ebuild4
-rw-r--r--dev-util/dejagnu/dejagnu-1.6.ebuild4
-rw-r--r--dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild4
-rw-r--r--dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild4
-rw-r--r--dev-util/devhelp/Manifest1
-rw-r--r--dev-util/devhelp/devhelp-3.36.2.ebuild2
-rw-r--r--dev-util/devhelp/devhelp-3.38.1.ebuild80
-rw-r--r--dev-util/dialog/dialog-1.3.20170131.ebuild2
-rw-r--r--dev-util/dialog/dialog-1.3.20200327.ebuild2
-rw-r--r--dev-util/diffoscope/Manifest3
-rw-r--r--dev-util/diffoscope/diffoscope-163.ebuild71
-rw-r--r--dev-util/diffoscope/diffoscope-164-r1.ebuild (renamed from dev-util/diffoscope/diffoscope-162.ebuild)6
-rw-r--r--dev-util/diffoscope/metadata.xml2
-rw-r--r--dev-util/diffstat/Manifest3
-rw-r--r--dev-util/diffstat/diffstat-1.60.ebuild19
-rw-r--r--dev-util/diffstat/diffstat-1.63.ebuild4
-rw-r--r--dev-util/diffstat/diffstat-1.64.ebuild (renamed from dev-util/diffstat/diffstat-1.61.ebuild)9
-rw-r--r--dev-util/dmake/dmake-4.12.2.ebuild4
-rw-r--r--dev-util/dogtail/dogtail-0.9.11.ebuild2
-rw-r--r--dev-util/dwarves/dwarves-1.19.ebuild2
-rw-r--r--dev-util/dwdiff/Manifest2
-rw-r--r--dev-util/dwdiff/dwdiff-2.1.1.ebuild47
-rw-r--r--dev-util/dwdiff/dwdiff-2.1.2.ebuild51
-rw-r--r--dev-util/dwdiff/dwdiff-2.1.3.ebuild33
-rw-r--r--dev-util/dwdiff/files/dwdiff-2.1.3-C99-fix.patch (renamed from dev-util/dwdiff/files/C99-fix.patch)0
-rw-r--r--dev-util/edb-debugger/Manifest1
-rw-r--r--dev-util/edb-debugger/edb-debugger-1.2.0.ebuild54
-rw-r--r--dev-util/edb-debugger/files/edb-debugger-1.2.0-gcc-11.patch48
-rw-r--r--dev-util/edb-debugger/files/edb-debugger-1.2.0-qt-5.15.patch20
-rw-r--r--dev-util/envman/envman-2.1.1.ebuild2
-rw-r--r--dev-util/eric/Manifest2
-rw-r--r--dev-util/eric/eric-18.03.ebuild82
-rw-r--r--dev-util/eric/eric-19.11-r1.ebuild61
-rw-r--r--dev-util/errcheck/Manifest3
-rw-r--r--dev-util/errcheck/errcheck-1.4.0.ebuild (renamed from dev-util/errcheck/errcheck-1.2.0.ebuild)4
-rw-r--r--dev-util/errcheck/errcheck-1.5.0.ebuild21
-rw-r--r--dev-util/errcheck/metadata.xml6
-rw-r--r--dev-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild4
-rw-r--r--dev-util/ftjam/ftjam-2.5.3_rc2-r2.ebuild2
-rw-r--r--dev-util/gdbus-codegen/Manifest1
-rw-r--r--dev-util/gdbus-codegen/gdbus-codegen-2.62.6.ebuild4
-rw-r--r--dev-util/gdbus-codegen/gdbus-codegen-2.64.5.ebuild4
-rw-r--r--dev-util/gdbus-codegen/gdbus-codegen-2.66.0.ebuild4
-rw-r--r--dev-util/gdbus-codegen/gdbus-codegen-2.66.3.ebuild4
-rw-r--r--dev-util/gdbus-codegen/gdbus-codegen-2.66.4.ebuild73
-rw-r--r--dev-util/geany-plugins/geany-plugins-1.37-r100.ebuild2
-rw-r--r--dev-util/git-delta/Manifest80
-rw-r--r--dev-util/git-delta/git-delta-0.4.4.ebuild4
-rw-r--r--dev-util/git-delta/git-delta-0.5.0.ebuild170
-rw-r--r--dev-util/git-delta/git-delta-0.5.1.ebuild152
-rw-r--r--dev-util/github-cli/Manifest180
-rw-r--r--dev-util/github-cli/github-cli-1.4.0.ebuild487
-rw-r--r--dev-util/gitlab-runner/Manifest4
-rw-r--r--dev-util/gitlab-runner/gitlab-runner-13.7.0.ebuild (renamed from dev-util/gitlab-runner/gitlab-runner-13.5.0.ebuild)0
-rw-r--r--dev-util/glib-utils/Manifest1
-rw-r--r--dev-util/glib-utils/glib-utils-2.62.6.ebuild4
-rw-r--r--dev-util/glib-utils/glib-utils-2.64.5.ebuild4
-rw-r--r--dev-util/glib-utils/glib-utils-2.66.2.ebuild4
-rw-r--r--dev-util/glib-utils/glib-utils-2.66.3.ebuild4
-rw-r--r--dev-util/glib-utils/glib-utils-2.66.4.ebuild65
-rw-r--r--dev-util/glslang/Manifest5
-rw-r--r--dev-util/glslang/files/glslang-7.12.3353_pre20191027-fix-relative-includes.patch26
-rw-r--r--dev-util/glslang/files/glslang-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch105
-rw-r--r--dev-util/glslang/glslang-10.11.0.0_pre20200924.ebuild2
-rw-r--r--dev-util/glslang/glslang-10.11.0.0_pre20201216.ebuild (renamed from dev-util/glslang/glslang-8.13.3560_pre20200404.ebuild)4
-rw-r--r--dev-util/glslang/glslang-7.12.3353_pre20191027-r2.ebuild30
-rw-r--r--dev-util/glslang/glslang-8.13.3559.ebuild28
-rw-r--r--dev-util/glslang/glslang-8.13.3743-r1.ebuild30
-rw-r--r--dev-util/gob/gob-2.0.20.ebuild2
-rw-r--r--dev-util/goland/Manifest2
-rw-r--r--dev-util/goland/goland-2020.3.ebuild111
-rw-r--r--dev-util/goland/goland-9999.ebuild68
-rw-r--r--dev-util/goland/metadata.xml9
-rw-r--r--dev-util/gosec/Manifest7
-rw-r--r--dev-util/gosec/gosec-2.5.0.ebuild29
-rw-r--r--dev-util/gperf/gperf-3.1.ebuild4
-rw-r--r--dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32-r1.ebuild4
-rw-r--r--dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild4
-rw-r--r--dev-util/gtk-doc-am/gtk-doc-am-1.33.1.ebuild4
-rw-r--r--dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild4
-rw-r--r--dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild4
-rw-r--r--dev-util/gtk-doc/gtk-doc-1.33.1-r3.ebuild4
-rw-r--r--dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.20.ebuild4
-rw-r--r--dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.21.ebuild4
-rw-r--r--dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.24.ebuild4
-rw-r--r--dev-util/hermes/hermes-2.8.ebuild2
-rw-r--r--dev-util/hfstospell/hfstospell-0.5.2-r1.ebuild45
-rw-r--r--dev-util/hfstospell/metadata.xml3
-rw-r--r--dev-util/hip/Manifest1
-rw-r--r--dev-util/hip/files/hip-3.5.1-config-cmake-in.patch28
-rw-r--r--dev-util/hip/files/hip-3.5.1-detect_offload-arch_for_clang-roc.patch21
-rw-r--r--dev-util/hip/files/hip-3.5.1-hip_vector_types.patch10
-rw-r--r--dev-util/hip/files/hip-3.9.0-DisableTest.patch87
-rw-r--r--dev-util/hip/files/hip-3.9.0-add-include-directories.patch13
-rw-r--r--dev-util/hip/files/hip-3.9.0-lpl_ca-add-include.patch10
-rw-r--r--dev-util/hip/hip-4.0.0.ebuild107
-rw-r--r--dev-util/hip/metadata.xml20
-rw-r--r--dev-util/howdoi/Manifest4
-rw-r--r--dev-util/howdoi/howdoi-1.2.1.ebuild25
-rw-r--r--dev-util/howdoi/howdoi-2.0.6.ebuild26
-rw-r--r--dev-util/howdoi/howdoi-2.0.8.ebuild (renamed from dev-util/howdoi/howdoi-2.0.5.ebuild)1
-rw-r--r--dev-util/idea-community/Manifest5
-rw-r--r--dev-util/idea-community/files/idea-community-jdk.patch11
-rw-r--r--dev-util/idea-community/idea-community-2020.3.1.203.6682.168.ebuild138
-rw-r--r--dev-util/idea-community/idea-community-2020.3.ebuild75
-rw-r--r--dev-util/idea-community/idea-community-2021.3.1.203.6682.168.ebuild138
-rw-r--r--dev-util/idea-community/idea-community-9999.ebuild75
-rw-r--r--dev-util/idea-community/metadata.xml16
-rw-r--r--dev-util/idea-ultimate/Manifest3
-rw-r--r--dev-util/idea-ultimate/idea-ultimate-2020.3.ebuild76
-rw-r--r--dev-util/idea-ultimate/idea-ultimate-9999.ebuild76
-rw-r--r--dev-util/indent/Manifest2
-rw-r--r--dev-util/indent/files/indent-2.2.11-ac_config_headers.patch11
-rw-r--r--dev-util/indent/files/indent-2.2.11-linguas.patch5
-rw-r--r--dev-util/indent/files/indent-2.2.11-segfault.patch16
-rw-r--r--dev-util/indent/files/indent-2.2.11-texi2html-5.patch40
-rw-r--r--dev-util/indent/indent-2.2.11-r1.ebuild52
-rw-r--r--dev-util/indent/indent-2.2.11_p5.ebuild61
-rw-r--r--dev-util/indent/indent-2.2.12.ebuild4
-rw-r--r--dev-util/intltool/intltool-0.51.0-r2.ebuild4
-rw-r--r--dev-util/itstool/itstool-2.0.6-r1.ebuild2
-rw-r--r--dev-util/japi-compliance-checker/metadata.xml2
-rw-r--r--dev-util/jenkins-bin/Manifest6
-rw-r--r--dev-util/jenkins-bin/jenkins-bin-2.249.3.ebuild46
-rw-r--r--dev-util/jenkins-bin/jenkins-bin-2.263.2.ebuild (renamed from dev-util/jenkins-bin/jenkins-bin-2.249.2.ebuild)2
-rw-r--r--dev-util/jenkins-bin/jenkins-bin-2.267.ebuild46
-rw-r--r--dev-util/jenkins-bin/jenkins-bin-2.275.ebuild (renamed from dev-util/jenkins-bin/jenkins-bin-2.264.ebuild)2
-rw-r--r--dev-util/kdevelop-php/Manifest1
-rw-r--r--dev-util/kdevelop-php/kdevelop-php-5.6.0.ebuild57
-rw-r--r--dev-util/kdevelop-php/kdevelop-php-5.6.1.ebuild4
-rw-r--r--dev-util/kdevelop-python/Manifest1
-rw-r--r--dev-util/kdevelop-python/kdevelop-python-5.6.0.ebuild55
-rw-r--r--dev-util/kdevelop-python/kdevelop-python-5.6.1.ebuild4
-rw-r--r--dev-util/kdevelop/Manifest1
-rw-r--r--dev-util/kdevelop/kdevelop-5.6.0-r1.ebuild133
-rw-r--r--dev-util/kdevelop/kdevelop-5.6.1.ebuild4
-rw-r--r--dev-util/kup/kup-0.3.4-r1.ebuild2
-rw-r--r--dev-util/linklint/linklint-2.3.5.ebuild4
-rw-r--r--dev-util/lldb/Manifest3
-rw-r--r--dev-util/lldb/lldb-11.0.1.ebuild (renamed from dev-util/lldb/lldb-11.0.1.9999.ebuild)14
-rw-r--r--dev-util/lldb/lldb-11.1.0_rc1.ebuild (renamed from dev-util/lldb/lldb-11.0.1_rc1.ebuild)12
-rw-r--r--dev-util/lldb/lldb-12.0.0.9999.ebuild8
-rw-r--r--dev-util/lttng-tools/Manifest3
-rw-r--r--dev-util/lttng-tools/lttng-tools-2.10.9.ebuild39
-rw-r--r--dev-util/lttng-tools/lttng-tools-2.12.0.ebuild (renamed from dev-util/lttng-tools/lttng-tools-2.11.0.ebuild)15
-rw-r--r--dev-util/lttng-ust/Manifest3
-rw-r--r--dev-util/lttng-ust/lttng-ust-2.12.0.ebuild (renamed from dev-util/lttng-ust/lttng-ust-2.10.6.ebuild)17
-rw-r--r--dev-util/lttng-ust/lttng-ust-2.7.1.ebuild30
-rw-r--r--dev-util/lttng-ust/lttng-ust-2.8.1.ebuild2
-rw-r--r--dev-util/meson-format-array/files/meson-format-array26
-rw-r--r--dev-util/meson-format-array/meson-format-array-0.ebuild22
-rw-r--r--dev-util/meson-format-array/metadata.xml (renamed from dev-util/eric/metadata.xml)10
-rw-r--r--dev-util/meson/Manifest1
-rw-r--r--dev-util/meson/meson-0.55.3.ebuild4
-rw-r--r--dev-util/meson/meson-0.56.2.ebuild92
-rw-r--r--dev-util/meson/meson-9999.ebuild4
-rw-r--r--dev-util/netbeans/Manifest4
-rw-r--r--dev-util/netbeans/netbeans-12.2.ebuild (renamed from dev-util/netbeans/netbeans-12.0.ebuild)0
-rw-r--r--dev-util/netsurf-buildsystem/netsurf-buildsystem-1.8-r1.ebuild2
-rw-r--r--dev-util/netsurf-buildsystem/netsurf-buildsystem-1.9.ebuild4
-rw-r--r--dev-util/ninja/ninja-1.10.0.ebuild4
-rw-r--r--dev-util/ninja/ninja-1.10.1.ebuild4
-rw-r--r--dev-util/ninja/ninja-1.10.2-r1.ebuild136
-rw-r--r--dev-util/ninja/ninja-1.10.2.ebuild4
-rw-r--r--dev-util/ninja/ninja-9999.ebuild4
-rw-r--r--dev-util/nvidia-cuda-sdk/Manifest7
-rw-r--r--dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-10.1.243.ebuild141
-rw-r--r--dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.19.ebuild156
-rw-r--r--dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-7.5.18.ebuild143
-rw-r--r--dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-8.0.44-r1.ebuild143
-rw-r--r--dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.0.176.ebuild144
-rw-r--r--dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.1.85.ebuild144
-rw-r--r--dev-util/nvidia-cuda-toolkit/Manifest1
-rw-r--r--dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.0.ebuild228
-rw-r--r--dev-util/ostree/ostree-2020.8.ebuild4
-rw-r--r--dev-util/patchutils/patchutils-0.3.3.ebuild2
-rw-r--r--dev-util/patchutils/patchutils-0.3.4.ebuild2
-rw-r--r--dev-util/peg/metadata.xml5
-rw-r--r--dev-util/perf/perf-5.9.9.ebuild2
-rw-r--r--dev-util/phpstorm/Manifest4
-rw-r--r--dev-util/phpstorm/phpstorm-2020.3.1.ebuild (renamed from dev-util/phpstorm/phpstorm-2020.3.ebuild)0
-rw-r--r--dev-util/pkgconf/files/pkgconf-1.7.3-darwin9.patch24
-rw-r--r--dev-util/pkgconf/pkgconf-1.7.3-r1.ebuild6
-rw-r--r--dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild6
-rw-r--r--dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild6
-rw-r--r--dev-util/pkgconfig/pkgconfig-0.29.1.ebuild6
-rw-r--r--dev-util/pkgconfig/pkgconfig-0.29.2.ebuild20
-rw-r--r--dev-util/pkgconfig/pkgconfig-9999.ebuild6
-rw-r--r--dev-util/pretrace/Manifest2
-rw-r--r--dev-util/pretrace/files/pretrace-0.4-build.patch4
-rw-r--r--dev-util/pretrace/files/pretrace-0.4-qa.patch39
-rw-r--r--dev-util/pretrace/pretrace-0.4-r2.ebuild (renamed from dev-util/pretrace/pretrace-0.4-r1.ebuild)14
-rw-r--r--dev-util/promu/Manifest1
-rw-r--r--dev-util/promu/promu-0.7.0.ebuild32
-rw-r--r--dev-util/pscan/pscan-20000721-r1.ebuild4
-rw-r--r--dev-util/pycharm-community/Manifest5
-rw-r--r--dev-util/pycharm-community/files/README.gentoo5
-rw-r--r--dev-util/pycharm-community/metadata.xml12
-rw-r--r--dev-util/pycharm-community/pycharm-community-2020.1.1.ebuild54
-rw-r--r--dev-util/pycharm-community/pycharm-community-2020.1.3.ebuild54
-rw-r--r--dev-util/pycharm-community/pycharm-community-2020.1.ebuild54
-rw-r--r--dev-util/pycharm-community/pycharm-community-2020.3.ebuild67
-rw-r--r--dev-util/pycharm-community/pycharm-community-9999.ebuild69
-rw-r--r--dev-util/pycharm-professional/Manifest5
-rw-r--r--dev-util/pycharm-professional/files/README.gentoo5
-rw-r--r--dev-util/pycharm-professional/metadata.xml12
-rw-r--r--dev-util/pycharm-professional/pycharm-professional-2020.1.1.ebuild55
-rw-r--r--dev-util/pycharm-professional/pycharm-professional-2020.1.3.ebuild55
-rw-r--r--dev-util/pycharm-professional/pycharm-professional-2020.1.ebuild55
-rw-r--r--dev-util/pycharm-professional/pycharm-professional-2020.3.ebuild77
-rw-r--r--dev-util/pycharm-professional/pycharm-professional-9999.ebuild78
-rw-r--r--dev-util/qbs/Manifest4
-rw-r--r--dev-util/qbs/qbs-1.12.2.ebuild115
-rw-r--r--dev-util/qbs/qbs-1.14.1.ebuild115
-rw-r--r--dev-util/qbs/qbs-1.18.0.ebuild (renamed from dev-util/qbs/qbs-1.15.0.ebuild)16
-rw-r--r--dev-util/quilt/quilt-0.66.ebuild4
-rw-r--r--dev-util/quilt/quilt-9999.ebuild4
-rw-r--r--dev-util/radare2/Manifest1
-rw-r--r--dev-util/radare2/files/radare2-4.5.1-docdir.patch12
-rw-r--r--dev-util/radare2/radare2-4.5.1-r1.ebuild78
-rw-r--r--dev-util/radare2/radare2-4.5.1.ebuild6
-rw-r--r--dev-util/radare2/radare2-5.0.0.ebuild78
-rw-r--r--dev-util/radare2/radare2-9999.ebuild26
-rw-r--r--dev-util/ragel/Manifest4
-rw-r--r--dev-util/ragel/files/colm_version.patch80
-rw-r--r--dev-util/ragel/files/ragel-7.0.0.10-use-pkginclude.patch41
-rw-r--r--dev-util/ragel/ragel-7.0.1-r1.ebuild (renamed from dev-util/ragel/ragel-7.0.0.10-r2.ebuild)9
-rw-r--r--dev-util/ragel/ragel-7.0.2.ebuild (renamed from dev-util/ragel/ragel-7.0.0.12.ebuild)6
-rw-r--r--dev-util/rats/rats-2.4.ebuild4
-rw-r--r--dev-util/rbtools/rbtools-2.0.ebuild2
-rw-r--r--dev-util/re2c/re2c-2.0.3.ebuild4
-rw-r--r--dev-util/rider/Manifest4
-rw-r--r--dev-util/rider/rider-2020.3.2.ebuild (renamed from dev-util/rider/rider-2020.2.4.ebuild)0
-rw-r--r--dev-util/rocm-cmake/Manifest1
-rw-r--r--dev-util/rocm-cmake/rocm-cmake-4.0.0.ebuild26
-rw-r--r--dev-util/rocm-smi/Manifest1
-rw-r--r--dev-util/rocm-smi/metadata.xml20
-rw-r--r--dev-util/rocm-smi/rocm-smi-4.0.0.ebuild34
-rw-r--r--dev-util/rocm-smi/rocm-smi-9999.ebuild34
-rw-r--r--dev-util/rocminfo/Manifest1
-rw-r--r--dev-util/rocminfo/rocminfo-4.0.0.ebuild23
-rw-r--r--dev-util/rosdep/Manifest2
-rw-r--r--dev-util/rosdep/files/tests.patch13
-rw-r--r--dev-util/rosdep/rosdep-0.20.0.ebuild (renamed from dev-util/rosdep/rosdep-0.19.0-r1.ebuild)2
-rw-r--r--dev-util/rt-tests/Manifest2
-rw-r--r--dev-util/rt-tests/files/rt-tests-1.10-musl.patch (renamed from dev-util/rt-tests/files/rt-tests-1.9-musl.patch)65
-rw-r--r--dev-util/rt-tests/rt-tests-1.10.ebuild (renamed from dev-util/rt-tests/rt-tests-1.9.ebuild)2
-rw-r--r--dev-util/rubymine/Manifest4
-rw-r--r--dev-util/rubymine/rubymine-2020.3.1.ebuild (renamed from dev-util/rubymine/rubymine-2020.3.ebuild)0
-rw-r--r--dev-util/sasm/metadata.xml5
-rw-r--r--dev-util/scons/scons-3.1.1.ebuild4
-rw-r--r--dev-util/scons/scons-3.1.2.ebuild4
-rw-r--r--dev-util/scons/scons-4.0.1.ebuild4
-rw-r--r--dev-util/sel/sel-0.08.4-r2.ebuild8
-rw-r--r--dev-util/shadowman/shadowman-2.ebuild2
-rw-r--r--dev-util/shflags/shflags-1.0.3.ebuild2
-rw-r--r--dev-util/shtool/shtool-2.0.8-r1.ebuild2
-rw-r--r--dev-util/source-highlight/source-highlight-3.1.9.ebuild4
-rw-r--r--dev-util/spirv-headers/Manifest2
-rw-r--r--dev-util/spirv-headers/spirv-headers-1.5.4.1.ebuild (renamed from dev-util/spirv-headers/spirv-headers-1.5.3.ebuild)4
-rw-r--r--dev-util/spirv-headers/spirv-headers-1.5.4.ebuild2
-rw-r--r--dev-util/spirv-tools/Manifest2
-rw-r--r--dev-util/spirv-tools/spirv-tools-2020.5_pre20201107.ebuild2
-rw-r--r--dev-util/spirv-tools/spirv-tools-2020.6.ebuild (renamed from dev-util/spirv-tools/spirv-tools-2020.3.ebuild)11
-rw-r--r--dev-util/spirv-tools/spirv-tools-9999.ebuild2
-rw-r--r--dev-util/splint/splint-3.1.2-r1.ebuild46
-rw-r--r--dev-util/splint/splint-3.1.2-r2.ebuild4
-rw-r--r--dev-util/stepman/stepman-0.10.5.ebuild2
-rw-r--r--dev-util/stubgen/stubgen-2.08.ebuild2
-rw-r--r--dev-util/sysdig/sysdig-0.27.1-r100.ebuild74
-rw-r--r--dev-util/systemtap/Manifest1
-rw-r--r--dev-util/systemtap/files/systemtap-4.0-configure.ac-non-posix-test.patch214
-rw-r--r--dev-util/systemtap/files/systemtap-4.4-configure.ac-non-posix-test.patch199
-rw-r--r--dev-util/systemtap/systemtap-4.0-r1.ebuild5
-rw-r--r--dev-util/systemtap/systemtap-4.0-r2.ebuild117
-rw-r--r--dev-util/systemtap/systemtap-4.4.ebuild116
-rw-r--r--dev-util/treecc/treecc-0.3.10-r1.ebuild2
-rw-r--r--dev-util/txt2regex/txt2regex-0.8-r3.ebuild2
-rw-r--r--dev-util/uftrace/uftrace-0.9.4-r100.ebuild61
-rw-r--r--dev-util/uncrustify/Manifest1
-rw-r--r--dev-util/uncrustify/uncrustify-0.71.0.ebuild6
-rw-r--r--dev-util/uncrustify/uncrustify-0.72.0.ebuild27
-rw-r--r--dev-util/unifdef/unifdef-2.10.ebuild2
-rw-r--r--dev-util/valgrind/valgrind-3.16.1.ebuild5
-rw-r--r--dev-util/valgrind/valgrind-9999.ebuild5
-rw-r--r--dev-util/vbindiff/vbindiff-3.0_beta5.ebuild2
-rw-r--r--dev-util/vulkan-headers/Manifest2
-rw-r--r--dev-util/vulkan-headers/vulkan-headers-1.2.154.ebuild2
-rw-r--r--dev-util/vulkan-headers/vulkan-headers-1.2.162.ebuild (renamed from dev-util/vulkan-headers/vulkan-headers-1.2.143.ebuild)2
-rw-r--r--dev-util/vulkan-tools/Manifest2
-rw-r--r--dev-util/vulkan-tools/vulkan-tools-1.2.154.ebuild2
-rw-r--r--dev-util/vulkan-tools/vulkan-tools-1.2.162.ebuild (renamed from dev-util/vulkan-tools/vulkan-tools-1.2.141.ebuild)2
-rw-r--r--dev-util/wayland-scanner/Manifest2
-rw-r--r--dev-util/wayland-scanner/metadata.xml9
-rw-r--r--dev-util/wayland-scanner/wayland-scanner-1.18.91.ebuild49
-rw-r--r--dev-util/wayland-scanner/wayland-scanner-1.18.92.ebuild49
-rw-r--r--dev-util/wayland-scanner/wayland-scanner-9999.ebuild49
-rw-r--r--dev-util/webstorm/Manifest4
-rw-r--r--dev-util/webstorm/webstorm-2020.3.1.ebuild (renamed from dev-util/webstorm/webstorm-2020.3.ebuild)0
-rw-r--r--dev-util/wiggle/wiggle-1.0.ebuild2
-rw-r--r--dev-util/xdelta/xdelta-1.1.4-r3.ebuild2
-rw-r--r--dev-util/xdelta/xdelta-3.0.11.ebuild2
-rw-r--r--dev-util/xfce4-dev-tools/Manifest2
-rw-r--r--dev-util/xfce4-dev-tools/xfce4-dev-tools-4.16.0.ebuild (renamed from dev-util/xfce4-dev-tools/xfce4-dev-tools-4.15.0.ebuild)6
-rw-r--r--dev-util/yacc/yacc-1.9.1-r6.ebuild2
-rw-r--r--dev-util/ydiff/Manifest1
-rw-r--r--dev-util/ydiff/ydiff-1.1.ebuild30
469 files changed, 6982 insertions, 6244 deletions
diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
index 5b7b7012fe0b..67ff9c6135a6 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -1,2 +1,3 @@
DIST android-studio-ide-193.6626763-linux.tar.gz 907569312 BLAKE2B 602170eea29e632dd5720ef364510a20056a4d98c61e77d5436a2f624a60e0cfa4e0533174613a74f359d8fdeb4e87489caeb5c34b292fcdc35843a76440a9a3 SHA512 7fba99efccdf3bbbfcbc94625aba3789b1bad0e830b2ac890bd681b9089e6789e87b2dbdc80c6ef3d8db2b2438678a8bb58aefb3c311f61f619042ab1ec9dfac
DIST android-studio-ide-201.6858069-linux.tar.gz 926181537 BLAKE2B ed815f5565ef97ca3f4e1c6cbae3548c70ba94a94a7ae522102044ada31468f241db68ef3d1a1ce6acef60a1bc2e6cd7eba1375a1cebbf01c73063a3d85eb9b2 SHA512 b473e9573e21c666042befa17fde8fc9cb0d6ffd41513d64b74779815079d8971c66afcd1dda5663b503324d14851c4f24a454e5da97e2473550323c09919825
+DIST android-studio-ide-201.6953283-linux.tar.gz 926213072 BLAKE2B bdcca29e75348230c37a141423faf27eae75f299ded1abb3aad12605cb5be144c222d15b998ff16203a035311a6a26d8ae4ee28f337098c78377c5df4e7fcf08 SHA512 554d53596280aa96349ed0b3808599cf315c4f1a439ff57cd2368c6a68b57afac620b86d742c2f2ff72d718a62e33f4353202b3bc3671c0fe934cd8d79f74c0c
diff --git a/dev-util/android-studio/android-studio-4.1.1.0.201.6953283.ebuild b/dev-util/android-studio/android-studio-4.1.1.0.201.6953283.ebuild
new file mode 100644
index 000000000000..8240f740094a
--- /dev/null
+++ b/dev-util/android-studio/android-studio-4.1.1.0.201.6953283.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop eutils java-pkg-2
+
+RESTRICT="strip"
+QA_PREBUILT="
+ opt/${PN}/bin/fsnotifier*
+ opt/${PN}/bin/libdbm64.so
+ opt/${PN}/bin/lldb/*
+ opt/${PN}/custom-jdk/*
+ opt/${PN}/lib/pty4j-native/linux/*/libpty.so
+ opt/${PN}/plugins/android/lib/libwebp_jni*.so
+ opt/${PN}/plugins/android/resources/installer/*
+ opt/${PN}/plugins/android/resources/perfetto/*
+ opt/${PN}/plugins/android/resources/simpleperf/*
+ opt/${PN}/plugins/android/resources/transport/*
+"
+
+VER_CMP=( $(ver_rs 1- ' ') )
+if [[ ${#VER_CMP[@]} -eq 6 ]]; then
+ STUDIO_V=$(ver_cut 1-4)
+ BUILD_V=$(ver_cut 5-6)
+else
+ STUDIO_V=$(ver_cut 1-3)
+ BUILD_V=$(ver_cut 4-5)
+fi
+
+DESCRIPTION="Android development environment based on IntelliJ IDEA"
+HOMEPAGE="https://developer.android.com/sdk/installing/studio.html"
+SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="custom-jdk selinux"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ dev-java/commons-logging:0
+ dev-java/log4j:0"
+
+RDEPEND="${DEPEND}
+ >=virtual/jdk-1.7
+ selinux? ( sec-policy/selinux-android )
+ >=app-arch/bzip2-1.0.6-r4
+ dev-java/commons-logging:0
+ dev-java/log4j:0
+ >=dev-libs/expat-2.1.0-r3
+ >=dev-libs/libffi-3.0.13-r1
+ >=media-libs/fontconfig-2.10.92
+ >=media-libs/freetype-2.5.5
+ >=media-libs/libpng-1.2.51
+ >=media-libs/mesa-10.2.8[X(+)]
+ || ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
+ sys-libs/ncurses-compat:5[tinfo]
+ >=sys-libs/zlib-1.2.8-r1
+ >=x11-libs/libX11-1.6.2
+ >=x11-libs/libXau-1.0.7-r1
+ >=x11-libs/libXdamage-1.1.4-r1
+ >=x11-libs/libXdmcp-1.1.1-r1
+ >=x11-libs/libXext-1.3.2
+ >=x11-libs/libXfixes-5.0.1
+ >=x11-libs/libXrender-0.9.8
+ >=x11-libs/libXxf86vm-1.1.3
+ >=x11-libs/libdrm-2.4.46
+ >=x11-libs/libxcb-1.9.1
+ >=x11-libs/libxshmfence-1.1"
+BDEPEND="dev-util/patchelf"
+S=${WORKDIR}/${PN}
+PATCHES=( "${FILESDIR}/0001-use-java-home-before-bundled.patch" )
+
+src_prepare() {
+ eapply "${PATCHES[@]}"
+ eapply_user
+
+ # This is really a bundled jdk not a jre
+ # If custom-jdk is not set bundled jre is replaced with system vm/jdk
+ if use custom-jdk; then
+ mv -f "${S}/jre" "${S}/custom-jdk" || die "Could not move bundled jdk"
+ else
+ rm -rf "${S}/jre" || die "Could not remove bundled jdk"
+ fi
+ # Replace bundled jars with system
+ # has problems with newer jdom:0 not updated to jdom:2
+ cd "${S}/lib" || die
+ local JARS="commons-logging log4j"
+ local j
+ for j in ${JARS}; do
+ rm -v ${j/:*/}*.jar || die
+ java-pkg_jar-from ${j}
+ done
+
+ cd "${S}" || die
+
+ # bug 629404
+ echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio64.vmoptions || die
+ echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio.vmoptions || die
+}
+
+src_compile() {
+ patchelf --set-rpath '$ORIGIN' bin/lldb/lib/readline.so || die "Failed to fix insecure RPATH"
+}
+
+src_install() {
+ local dir="/opt/${PN}"
+
+ insinto "${dir}"
+ doins -r *
+
+ # This is really a bundled jdk not a jre
+ # If custom-jdk is not set bundled jre is replaced with system vm/jdk
+ if use custom-jdk; then
+ dosym "custom-jdk" "${dir}/jre"
+ else
+ dosym "../../etc/java-config-2/current-system-vm" "${dir}/jre"
+ fi
+
+ fperms 755 "${dir}"/bin/{fsnotifier{,64},printenv.py,restart.py,format.sh,inspect.sh,studio.sh}
+ fperms -R 755 "${dir}"/bin/lldb/{android,bin}
+ if use custom-jdk; then
+ fperms -R 755 "${dir}"/jre/{bin,jre/bin}
+ fperms 755 ${dir}/jre/jre/lib/jexec
+ fi
+
+ newicon "bin/studio.png" "${PN}.png"
+ make_wrapper ${PN} ${dir}/bin/studio.sh
+ make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" "StartupWMClass=jetbrains-studio"
+}
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index 0fd7758e4575..2975ba071703 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -1,19 +1,3 @@
-DIST android-tools-5.1.1_r13-arch.tar.gz 4078 BLAKE2B 718f94b0854189533f11545a8962c2cc85bc01797057a77525babd7f5e01c76f12764cab0da30cf8abe364c0ec757193cc8c49bef3278925076efd3633fc5fcf SHA512 e38e0d1c966b569defc6df185c0e2b35b3766a7f89bcc3f60cea9b536f37b5b6b76f40457735b509d806c4c5b24f6b3805b51b85ffeb4d04fc14a731f81414c3
-DIST android-tools-5.1.1_r13-core.tar.gz 1210720 BLAKE2B 0ec56b07c206ab122d1286dfa55424c3ffa4382cbe3f55f6ca351ca9e4555537e9404a5ee239adb90667d91c9212de85c8c264662489b69d3b7846c4b4bcd80d SHA512 2ce2f03193840bd894cb4638bd23a321e53c6185e9816729193714b9e2d068f5ca4ebcee4edc7febaa4ea1ee3621aa6977217a5a84d2f116f35b000969a4af15
-DIST android-tools-5.1.1_r13-extras.tar.gz 282690 BLAKE2B b0be4168ca4cdf6c7ed359f01104b2b20cf36678153bae00ffb8cdc9d79e0518f850d9f1ad3eb3a2f998418a6fcd1c54cf4199a2ae37c696e5f657bbed8c778c SHA512 322d45be02d3d5a5bf677e3a38a44085258ee7b9a8c0a7bc08ddb4104168170d5969699ee54e19009a2bd0d7e0ac6ad7971ccc67e2a0311c6f1ba7fb76cfce83
-DIST android-tools-5.1.1_r13-f2fs-tools.tar.gz 65931 BLAKE2B 658bae1a0d713887522eba2264971ae1f68093d9f3cf8ac1c2de96600219fc9f3624595de273ca3af76a69edf3a36b8136d9bb6b75a147beb2fc804864fd7b82 SHA512 66f4be04164df8bb5138105db4e9d5b79c09cd8c28a0d30a6d1e6dead77961614172c96fa680953bf445b934f14b4dbbc21ce89a909d9f278f2eca1ca2e1e656
-DIST android-tools-5.1.1_r13-libselinux.tar.gz 49085 BLAKE2B 50136b205fd6a6b055f82b16fe4e234bf060d40400e62e2a53c9943f67181d35564b000ec27fa060c2e01f7e4dea441079c5b06d1b5de21a9bcd15e8fa271a9b SHA512 b1a8960b98206118a07f11e7e67429c0d4b8f89c4f65919bcd02a6ba1c7f30e5b73a9431ce8d10fc6ffa6e487b79061b84a969490bf22a49188dc5cd9dd46a2f
-DIST android-tools-6.0.1_r79-arch.tar.gz 13466 BLAKE2B ddb064303659468b648a46ea24aae648968088de4aaea2b64e7b9d946d867daaf6ed1f4094cb7b29beb803387d2253580c85a46e9392bc1ccb2461186f2e52ef SHA512 90b8638d247897da33f6e861492c58df0e9877738650083c3307bd787d234d728e6c9097ac1401c254eb3daf4c6b18da4ee84dd16749acf6359fcb42781862fc
-DIST android-tools-6.0.1_r79-core.tar.gz 1186562 BLAKE2B 473454d340e65f98201508cb04293118d6e2ecc06e33d0d76ca81c536ea00a7818ebe4c4ccd30efef36aaaa1a9ec6ee3a57c00e2a82af28cbc49f4c973ab46be SHA512 a48f8c562305cbc951e008979920d9efe02e232c41997423457ff1e2f115e526b295c260a501d4050ce280ca7155793b95f7a60bad5cbc165ba80d6a225152f0
-DIST android-tools-6.0.1_r79-extras.tar.gz 648657 BLAKE2B 4582ddd57b729492e08987e17304c62778504ffc316ab26df8c83fff1aed33226106474131d5ad0e3e302b577c83a2b78d0be04fef9711e39861a223580ab1b9 SHA512 e10694737c518f591eff4e808bb826c83bf45dc44c5c1ee8a4082a6e0653350ffe2986e299348cb4a1219203192d01546a05e9354ce05e29897f856c147de8c3
-DIST android-tools-6.0.1_r79-f2fs-tools.tar.gz 70255 BLAKE2B ab9ce3efd33c28a1a0a9cb8a5415057498dd493e059183cc9d3fcc9de1b5ca4d7488c75695c94700fc6a4e5503beb8647576c7096fa50229f98485d2983ce152 SHA512 0871f99f78006028889b42668ec627b6515bb812ad3ec4a489f62187a79f64d2a74f66556698a5f05fc99932f75fefd8810dedceeab744b212beb764e97b82c8
-DIST android-tools-6.0.1_r79-libselinux.tar.gz 50814 BLAKE2B f09f26c801be83bc97f4b18606f513ce0fae791126a30c90067e3b2066c991fa1390ab2d0fac2475f755f3245179718204d5014f47ece46801dc0f80caf9758b SHA512 686557271271c4d59fb968c5aa76b433955009733f3151c4c86faa996ce846088d6632b0969b23699822b7a6f09eae60abedba6abb0edc9d444159bbdb5c6f91
-DIST android-tools-8.1.0_r1-arch.tar.gz 6250 BLAKE2B 65447517a33438c8531a9d707c6107703eaccb558e505e51a88ef51e70f83488620f76eb0240dc0899211cf120e9e1ffbea041086f1d8133f30b56358aba76d6 SHA512 5746e0b2f6aae37ebe60b7b1e939699a11de2f44286497f77d700c3896e02559d55002f036ecdc1c412844bfce4ab245b9086193dc982e6be74bcaea61010c5c
-DIST android-tools-8.1.0_r1-core.tar.gz 5227179 BLAKE2B afb280d67fe1b926e1f1ad68409584ad0209eb48921542e2bd490448c888cdf4bf6fb4c6f9552d580c7a396e79c2c85019e79a9a6c9881ea962c2f1064c33d82 SHA512 2c8e67232ca6348a4fd4b5d7077715491d2168c46fc8e336635a961bbbed156ef480718ee58393501196e9315c6c1bda807f8966944e3bc209dd5a0f7088642e
-DIST android-tools-8.1.0_r1-extras.tar.xz 275952 BLAKE2B 0fd3c536fee6ffbe2cdd4321604d32dc3a2b48a1b3edcb9121e83ceea760e491b47b301c3d8126565efd6b11adabd4f89c79bbe8731585660ce395af9e643fe7 SHA512 bfe3af89eadf38ce6805637e41f3fb15feb85455902f6a43e52a2f95dd1595cc896a9f46ccc82ab8db433f56a05f2f4c0ba85b77f40b03d5d69c8fec4082a2da
-DIST android-tools-8.1.0_r1-f2fs-tools.tar.xz 93924 BLAKE2B b8b6c7ba4c3f5309bfcfc91bd57d018d7af66f8dd25590207fd545f0dba02961826bf9963a56c7994feea5db8f9caedfe4fe62870420d9544283f87ec337cfb8 SHA512 de726be0691c58a5093098bd30cfc06c4312c44bec040cbecd594694cb7b38742dafd1f00b08c18f1b70abf56571738eb3e85e612f082e09e51a98980444e069
-DIST android-tools-8.1.0_r1-selinux.tar.xz 3188060 BLAKE2B 8c513d858e8dcaed705975ad61f362d7b1c2252685a63a1ad6035f36b0b402f1857ac5d2635d35ffa10f05b4a2605f30f27dcc5e9d91930eb0656f3ce2da036d SHA512 8799f10b4dba840ecea8f6abb8166c2e137eb3f0d9c5cfb132c661cf17800f2eeaafb1b4ec9e8974fc3324fae99e3654e52397c987faf1d48ab6148152d84f11
-DIST android-tools-8.1.0_r1.ninja.xz 2740 BLAKE2B 34473e33970cefdaf82bbe4524665fd50e6617cf867757ca07cdccc2e7356f43ef4bb455080ef4bac516ddba3c4e4120f0b27306e84725f8d5738a81800e3a53 SHA512 707e0e1c53832a42384e93d363f80007b76f18166b9f3f7d516431410b05319b1acc804daa1fddc218e11feb48de48683efb5203f4fa6d80646dcb1a2953139f
DIST android-tools-9.0.0_p3-bug-706946-fno-common.patch.xz 2696 BLAKE2B de8083846d6cb24d2fcb12789b302f5df766753989e004154746d4402a5777bbabff2e9c67758e9185c0ea56dde7e647a8a15dd696671c28f2f708703bcad9f0 SHA512 e65818e9d06295f7de8f8bc52270054f9936659b2bf07f7abc15f2ea7b138536396a24c39bb6a260a931250396b04022170f2045336f0ba6444cd90fb0dfdbb0
DIST android-tools-9.0.0_p3-fix-build-with-glibc-2.30.patch 1262 BLAKE2B fa2d3cd31e82dd3b17bb840096c6158f1b117cb12b8b3c6f6c604efd85f880346c04e8e98b17bebd68d56e06cdc126677ad96dbd6214175544a9b93020292956 SHA512 21c2501fa24f59489e656ac5122c906476ad573e63f6dcc88605dafde9d4b8927ea904708caaababd12155153d969d2480aff591d98057859e8b885e94aa126a
DIST android-tools-9.0.0_r3-arch.tar.gz 8451 BLAKE2B b28649333aa0e5a6f4bc83f9e42e1749a4d138075d03559c5871a24f782bf8608bcf07a609bd791ee29afabcb4435ece2ed8f8abc171265ef9d67da231c8a29e SHA512 d3409f89d2c334b66e694fd77e068e2d863dc9a99b9ef332b0a08c9c186c26eb9d969ef5cde5aa6e28b866847b4a85a4d3a4c2b0951a37752510b2f3b41c5943
@@ -23,5 +7,4 @@ DIST android-tools-9.0.0_r3-extras.tar.xz 1653548 BLAKE2B 1a8c2ee2e564adc04d646a
DIST android-tools-9.0.0_r3-f2fs-tools.tar.xz 212092 BLAKE2B 32775e5b049bd2ff2ce7c9ea3362a602dcda6328e39036902020bd372a812898d84912f686cf347b225af630c2dea81ce30b601ac968b1168e2851b94ac2da2e SHA512 4fac8f18533c5c2270aed6e60b21721c643a44a27b37482ff8fd8fa4d7c875eb8a626d544ec4e6efb89c7408ae97e66ffd123588e90b98312e5291575ca8baa6
DIST android-tools-9.0.0_r3-selinux.tar.xz 3202332 BLAKE2B 60a884eb1bd34fe5796f8fb33e5aefd7f9ffc85ac91784e0a8f0ca663010cf2222c80f4c419019b5817f9cbd8037ab78914e42417193e1b802a2682bb82c0097 SHA512 f0a77dc0ac91d434573370110c70529caabfd5f036c02ae5f1a4b2097e48324198d03ecdc92a622e1590012dd3f20f103384fed468f5e27aebcaf9315bb87078
DIST android-tools-9.0.0_r3.ninja.xz 4244 BLAKE2B 14cea7523f22a7f4e02e93c32e4d4684e057abbe8e2b537b7e942cc27c13ea2aa13bcdb5c3ccafc261b8d7fc4b4cd4b9394e0970734b36111ccffbacecc5cfb9 SHA512 46956a608d6a9b93f1a035d6b0e153c476b55d4f8a2db4915b18ac9904a6d07befcbceb8e2e50054e7dbe2970be8539243134cd9722d2f2ec8a36a3153e03c56
-DIST boringssl-14308731e5446a73ac2258688a9688b524483cb6.tar.gz 13030361 BLAKE2B 6982416b6e193e7faccd41fff3bd35f80b11d7495251d876e6b081bd94a887ec3c6bf5b7852d9595594fc2bdc57353f268272ef01fb79f7c93b52d46cbda69ac SHA512 171b524b0452a48853b2c8010ff5e14d5d720e69eeaf1d3b79f675838f3afa94aee9de2f47b37303feb2d92cbf77639efe585786625b7b37b8cc2ba727c37fdc
DIST boringssl-45210dd4e21ace9d28cb76b3f83303fcdd2efcce.tar.gz 13581532 BLAKE2B ca2f6757807adc265314a7444605c6199a19847fb426384bafa201bf63f4e3c7c567fb8094b740b8a00caf0d106bb1efea2893b00d45c9772740a81dc0a186f3 SHA512 c6695d078ee7b3694898dfdc0ee3382d01f9bb592ea46eb64026c73565735fd7251bbb0fd3e8c8552394bcdad5717de7ee5106cf1ed91aacec05d779ad693f6a
diff --git a/dev-util/android-tools/android-tools-5.1.1_p13.ebuild b/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
deleted file mode 100644
index 62e4096698a0..000000000000
--- a/dev-util/android-tools/android-tools-5.1.1_p13.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit bash-completion-r1 eutils toolchain-funcs
-
-MY_PV="${PV/_p/_r}"
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
-HOMEPAGE="https://android.googlesource.com/platform/system/core.git/"
-# For stable digests, git tarballs generated by android.googlesource.com
-# are fetched from mirror://gentoo/.
-SRC_URI="https://projects.archlinux.org/svntogit/community.git/snapshot/community-caa300cf262afcf5bdb4dcc923dee54e3715fd5c.tar.gz -> ${MY_P}-arch.tar.gz
-https://github.com/android/platform_system_core/archive/android-${MY_PV}.tar.gz -> ${MY_P}-core.tar.gz
-mirror://gentoo/${MY_P}-extras.tar.gz
-mirror://gentoo/${MY_P}-libselinux.tar.gz
-mirror://gentoo/${MY_P}-f2fs-tools.tar.gz"
-
-# The entire source code is Apache-2.0, except for fastboot which is BSD-2.
-LICENSE="Apache-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-linux"
-IUSE="libressl"
-
-RDEPEND="sys-libs/zlib:=
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- dev-libs/libpcre"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}
-
-src_unpack() {
- local dir filename
- for filename in ${A}; do
- if [[ ${filename} =~ ^${MY_P}-(.*)\.tar\.gz$ ]]; then
- dir=${BASH_REMATCH[1]}
- mkdir -p "${dir}" || die
- pushd "${dir}" >/dev/null
- unpack "${filename}"
- popd > /dev/null
- else
- die "unrecognized file in \${A}: ${filename}"
- fi
- done
-}
-
-src_prepare() {
- mv core/*/* core/ || die
- sed -e 's|#include <dlfcn.h>|\0\n#include <stddef.h>\n#include <string.h>\n|' \
- -i extras/f2fs_utils/f2fs_utils.c || die
- mv arch/*/trunk/Makefile ./ || die
- sed -i '1i#include <sys/sysmacros.h>' core/adb/usb_linux.c || die #580058
- sed -e 's|^#include <sys/cdefs.h>$|/*\0*/|' \
- -e 's|^__BEGIN_DECLS$|#ifdef __cplusplus\nextern "C" {\n#endif|' \
- -e 's|^__END_DECLS$|#ifdef __cplusplus\n}\n#endif|' \
- -i extras/ext4_utils/sha1.{c,h} || die #580686
- tc-export CC
-}
-
-src_install() {
- emake DESTDIR="${ED}" install
- newbashcomp arch/*/trunk/bash_completion fastboot
-}
diff --git a/dev-util/android-tools/android-tools-6.0.1_p79.ebuild b/dev-util/android-tools/android-tools-6.0.1_p79.ebuild
deleted file mode 100644
index 6ad2b5147928..000000000000
--- a/dev-util/android-tools/android-tools-6.0.1_p79.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit bash-completion-r1 eutils toolchain-funcs
-
-MY_PV="${PV/_p/_r}"
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
-HOMEPAGE="https://android.googlesource.com/platform/system/core.git/"
-# Downloading git tarballs generated by android.googlesource.com
-# Archlinux package contains patches and build script generation mechanism.
-SRC_URI="https://git.archlinux.org/svntogit/community.git/snapshot/community-6a03c4736c9734f5ac3d6b5b912605690a6eaa5f.tar.gz -> ${MY_P}-arch.tar.gz
-https://github.com/android/platform_system_core/archive/android-${MY_PV}.tar.gz -> ${MY_P}-core.tar.gz
-mirror://gentoo/${MY_P}-extras.tar.gz
-mirror://gentoo/${MY_P}-libselinux.tar.gz
-mirror://gentoo/${MY_P}-f2fs-tools.tar.gz"
-
-# The entire source code is Apache-2.0, except for fastboot which is BSD-2.
-LICENSE="Apache-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-linux"
-IUSE="libressl"
-
-RDEPEND="sys-libs/zlib:=
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- dev-libs/libpcre"
-# dev-lang/ruby is necessary for build script generation.
-DEPEND="${RDEPEND}
- virtual/rubygems"
-
-S=${WORKDIR}
-
-src_unpack() {
- local dir filename
- for filename in ${A}; do
- if [[ ${filename} =~ ^${MY_P}-(.*)\.tar\.gz$ ]]; then
- dir=${BASH_REMATCH[1]}
- mkdir -p "${dir}" || die
- pushd "${dir}" >/dev/null
- unpack "${filename}"
- popd > /dev/null
- else
- die "unrecognized file in \${A}: ${filename}"
- fi
- done
-}
-
-src_prepare() {
- mv core/*/* core/ || die
- epatch arch/*/trunk/fix_build.patch
- cp arch/*/trunk/generate_build.rb ./ || die
- sed -i '1i#include <sys/sysmacros.h>' core/adb/usb_linux.cpp || die #616508
- sed -e 's|^#include <sys/cdefs.h>$|/*\0*/|' \
- -e 's|^__BEGIN_DECLS$|#ifdef __cplusplus\nextern "C" {\n#endif|' \
- -e 's|^__END_DECLS$|#ifdef __cplusplus\n}\n#endif|' \
- -i extras/ext4_utils/sha1.{c,h} || die #580686
- default
-}
-
-src_compile() {
- # Dynamically detect rubygems interpreter (bug 631398).
- local ruby_bin=$(type -P ruby) ruby_error_log=${T}/generate_build.rb.log success=
- for ruby_bin in "${ruby_bin}" "${ruby_bin}"[[:digit:]][[:digit:]]; do
- "${ruby_bin}" ./generate_build.rb 1> build.sh 2> "${ruby_error_log}" && \
- { success=1; break; }
- done
- if [[ -z ${success} ]]; then
- cat "${ruby_error_log}" >&2
- die "${ruby_bin} ./generate_build.rb failed"
- fi
- sed -e 's:^gcc:${CC}:' -e 's:^g++:${CXX}:' -i build.sh || die
- chmod +x build.sh || die
- tc-export CC CXX
- bash -e ./build.sh || die
-}
-
-src_install() {
- dobin adb
- dobin fastboot
- dobin mkbootimg
- # Omitting, app-shells/bash-completion contains completion for adb
- #newbashcomp arch/*/trunk/bash_completion.adb adb
- newbashcomp arch/*/trunk/bash_completion.fastboot fastboot
-}
diff --git a/dev-util/android-tools/android-tools-8.1.0_p1.ebuild b/dev-util/android-tools/android-tools-8.1.0_p1.ebuild
deleted file mode 100644
index bcb5f12a74d1..000000000000
--- a/dev-util/android-tools/android-tools-8.1.0_p1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit flag-o-matic bash-completion-r1 ninja-utils toolchain-funcs cmake-utils python-r1
-
-MY_PV="${PV/_p/_r}"
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Android platform tools (adb, fastboot, and mkbootimg)"
-HOMEPAGE="https://android.googlesource.com/platform/system/core.git/"
-# See helper scripts in files/ for creating these tarballs and getting this hash.
-BORINGSSL_SHA1="14308731e5446a73ac2258688a9688b524483cb6"
-# The ninja file was created by running the ruby script from archlinux by hand and fixing the build vars.
-# No point in depending on something large/uncommon like ruby just to generate a ninja file.
-SRC_URI="https://git.archlinux.org/svntogit/community.git/snapshot/community-2b7f9774cc468205fec145e64e9103aee8e5c6f9.tar.gz -> ${MY_P}-arch.tar.gz
- https://github.com/android/platform_system_core/archive/android-${MY_PV}.tar.gz -> ${MY_P}-core.tar.gz
- https://github.com/google/boringssl/archive/${BORINGSSL_SHA1}.tar.gz -> boringssl-${BORINGSSL_SHA1}.tar.gz
- mirror://gentoo/${MY_P}-extras.tar.xz https://dev.gentoo.org/~vapier/dist/${MY_P}-extras.tar.xz
- mirror://gentoo/${MY_P}-selinux.tar.xz https://dev.gentoo.org/~vapier/dist/${MY_P}-selinux.tar.xz
- mirror://gentoo/${MY_P}-f2fs-tools.tar.xz https://dev.gentoo.org/~vapier/dist/${MY_P}-f2fs-tools.tar.xz
- mirror://gentoo/${MY_P}.ninja.xz https://dev.gentoo.org/~vapier/dist/${MY_P}.ninja.xz"
-
-# The entire source code is Apache-2.0, except for fastboot which is BSD-2.
-LICENSE="Apache-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~x86-linux"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="sys-libs/zlib:=
- dev-libs/libpcre2:=
- virtual/libusb:1="
-RDEPEND="${DEPEND}
- python? ( ${PYTHON_DEPS} )"
-DEPEND+="
- dev-lang/go"
-
-S=${WORKDIR}
-CMAKE_USE_DIR="${S}/boringssl"
-
-unpack_into() {
- local archive="$1"
- local dir="$2"
-
- mkdir -p "${dir}"
- pushd "${dir}" >/dev/null || die
- unpack "${archive}"
- if [[ ${dir} != ./* ]] ; then
- mv */* ./ || die
- fi
- popd >/dev/null
-}
-
-src_unpack() {
- unpack_into "${MY_P}-arch.tar.gz" arch
- unpack_into "${MY_P}-core.tar.gz" core
- unpack_into "${MY_P}-extras.tar.xz" extras
- unpack_into "${MY_P}-f2fs-tools.tar.xz" ./f2fs-tools
- unpack_into "${MY_P}-selinux.tar.xz" ./selinux
- unpack_into boringssl-${BORINGSSL_SHA1}.tar.gz boringssl
-
- unpack "${MY_P}.ninja.xz"
- mv "${MY_P}.ninja" "build.ninja" || die
-
- # Avoid depending on gtest just for its prod headers when boringssl bundles it.
- ln -s ../../boringssl/third_party/googletest/include/gtest core/include/ || die
-}
-
-src_prepare() {
- cd "${S}"/core
- eapply "${WORKDIR}"/arch/trunk/fix_build_core.patch
- eapply "${FILESDIR}"/${P}-build.patch
- sed -i '1i#include <sys/sysmacros.h>' adb/client/usb_linux.cpp || die #616508
-
- cd "${S}"/selinux
- eapply "${WORKDIR}"/arch/trunk/fix_build_selinux.patch
-
- cd "${S}"/extras
- sed -e 's|^#include <sys/cdefs.h>$|/*\0*/|' \
- -e 's|^__BEGIN_DECLS$|#ifdef __cplusplus\nextern "C" {\n#endif|' \
- -e 's|^__END_DECLS$|#ifdef __cplusplus\n}\n#endif|' \
- -i ext4_utils/sha1.{c,h} || die #580686
-
- cd "${S}"
- default
-
- # The pregenerated ninja file expects the build/ dir.
- BUILD_DIR="${CMAKE_USE_DIR}/build"
- cmake-utils_src_prepare
-}
-
-src_configure() {
- append-lfs-flags
-
- cmake-utils_src_configure
-
- sed -i \
- -e "s|@CC@|$(tc-getCC)|g" \
- -e "s|@CXX@|$(tc-getCXX)|g" \
- -e "s|@CFLAGS@|${CFLAGS}|g" \
- -e "s|@CPPFLAGS@|${CPPFLAGS}|g" \
- -e "s|@CXXFLAGS@|${CXXFLAGS}|g" \
- -e "s|@LDFLAGS@|${LDFLAGS}|g" \
- -e "s|@PV@|${PV}|g" \
- build.ninja || die
-}
-
-src_compile() {
- # We only need a few libs from boringssl.
- cmake-utils_src_compile libcrypto.a libssl.a
-
- eninja
-}
-
-src_install() {
- dobin adb fastboot
- dodoc core/adb/*.{txt,TXT} core/fastboot/README.md
- use python && python_foreach_impl python_doexe core/mkbootimg/mkbootimg
- newbashcomp arch/trunk/bash_completion.fastboot fastboot
-}
diff --git a/dev-util/argouml/argouml-0.34.ebuild b/dev-util/argouml/argouml-0.34.ebuild
index e2ecbafcd6c7..7328dcd63990 100644
--- a/dev-util/argouml/argouml-0.34.ebuild
+++ b/dev-util/argouml/argouml-0.34.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="${BASE_URI}/ArgoUML-${PV}.tar.gz
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="doc"
DEPEND="app-arch/unzip"
diff --git a/dev-util/astyle/astyle-3.0.1-r1.ebuild b/dev-util/astyle/astyle-3.0.1-r1.ebuild
index d7a9bc9ea02c..70a847525ab2 100644
--- a/dev-util/astyle/astyle-3.0.1-r1.ebuild
+++ b/dev-util/astyle/astyle-3.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/astyle/astyle_${PV}_linux.tar.gz"
LICENSE="MIT"
SLOT="0/3.0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="examples java static-libs"
DEPEND="app-arch/xz-utils
diff --git a/dev-util/astyle/astyle-3.1-r2.ebuild b/dev-util/astyle/astyle-3.1-r2.ebuild
index 13bdc2341e60..366c02bb1cfc 100644
--- a/dev-util/astyle/astyle-3.1-r2.ebuild
+++ b/dev-util/astyle/astyle-3.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/astyle/astyle_${PV}_linux.tar.gz"
LICENSE="MIT"
SLOT="0/3.1"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="examples java static-libs"
DEPEND="app-arch/xz-utils
diff --git a/dev-util/bats/bats-1.2.1.ebuild b/dev-util/bats/bats-1.2.1.ebuild
index 82cdfda1600c..6647ae0daa0e 100644
--- a/dev-util/bats/bats-1.2.1.ebuild
+++ b/dev-util/bats/bats-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
DEPEND="app-shells/bash:*"
RDEPEND="${DEPEND}"
diff --git a/dev-util/bats/metadata.xml b/dev-util/bats/metadata.xml
index f51651a3f9b1..c39fc813fbf2 100644
--- a/dev-util/bats/metadata.xml
+++ b/dev-util/bats/metadata.xml
@@ -9,6 +9,7 @@
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
+ <stabilize-allarches/>
<upstream>
<remote-id type="github">bats-core/bats-core</remote-id>
</upstream>
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index f6f3cb4c4b2e..ef27183d785b 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -1,2 +1,3 @@
DIST bcc-0.16.0.tar.gz 4124285 BLAKE2B 443077ffd5ad02e34d28a86ee64b8ec52fa4a18696295d58e87aaf2aeb833c394047cd0d87b3bf1da52d5512b889f8873b788e8141bdd91c9463e27cf30a1ef6 SHA512 50d09d6d02335a63d7c01c22f16a706584f231ee16973a80df5b640c31b8e25775da13a2bdff9e57c04c7f6181bb8c46cf3bd11c1e59741234024da71c7f6cdb
DIST bcc-0.17.0.tar.gz 4166410 BLAKE2B 6833c7a58ed9e99b58bf147dc499ba7c7c113961ff5c21a3ac388abab8caa01dc2a67378899e26050460c4af851a5ddd8747911bda7c7b405dfcb6df29981f85 SHA512 32f27bdd3d8f3e850e59011bcf662b91842b1dcef94d118a0662ffda3b2c48c97a359d736d01f6d06afd74e3d7a4efda4966c71a5c9146b2076d4fba087a85cf
+DIST bcc-0.18.0.tar.gz 4171881 BLAKE2B c5bdf70965e16f0391306b004b4f51b370e7de3d061c8c318f25de478bdcb0c4dc083ceb00e19a66115e31e4c3da63e3b5dded750d44d56985f18bf87eb7617e SHA512 9d3e4c60c6415d40fe803bab44d4372028c210a084e3bff87a71771f06810bbafebe10760aedce9fff704c51235f71ff20458942fc1e67d0b83988ce57cfc493
diff --git a/dev-util/bcc/bcc-0.17.0-r100.ebuild b/dev-util/bcc/bcc-0.17.0-r100.ebuild
new file mode 100644
index 000000000000..9322ad7c2540
--- /dev/null
+++ b/dev-util/bcc/bcc-0.17.0-r100.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit cmake linux-info llvm lua-single python-r1
+
+DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
+HOMEPAGE="https://iovisor.github.io/bcc/"
+
+SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+lua test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ lua? ( ${LUA_REQUIRED_USE} )"
+
+RDEPEND="
+ >=dev-libs/libbpf-0.2[static-libs(-)]
+ >=sys-kernel/linux-headers-4.14
+ >=dev-libs/elfutils-0.166:=
+ <=sys-devel/clang-12:=
+ <=sys-devel/llvm-12:=[llvm_targets_BPF(+)]
+ lua? ( ${LUA_DEPS} )
+ ${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}
+ test? (
+ || (
+ net-misc/iputils[arping]
+ net-analyzer/arping
+ )
+ net-analyzer/netperf
+ net-misc/iperf:*
+ )
+"
+BDEPEND="
+ dev-util/cmake
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
+ "${FILESDIR}/bcc-0.14.0-cmakelists.patch"
+)
+
+# tests need root access
+RESTRICT="test"
+
+pkg_pretend() {
+ local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
+ ~HAVE_EBPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
+ ~KPROBES"
+
+ check_extra_config
+}
+
+pkg_setup() {
+ LLVM_MAX_SLOT=11 llvm_pkg_setup
+ python_setup
+}
+
+src_prepare() {
+ local bpf_link_path
+
+ # this avoids bundling
+ bpf_link_path="$(realpath --relative-to="${S}/src/cc/libbpf" /usr/include/bpf)" || die
+ ln -sfn "${bpf_link_path}" src/cc/libbpf/include || die
+
+ cmake_src_prepare
+}
+
+python_add_impl() {
+ bcc_python_impls+="${EPYTHON};"
+}
+
+src_configure() {
+ local bcc_python_impls
+ python_foreach_impl python_add_impl
+
+ local -a mycmakeargs=(
+ -DREVISION=${PV%%_*}
+ -DENABLE_LLVM_SHARED=ON
+ -DCMAKE_USE_LIBBPF_PACKAGE=ON
+ -DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}"
+ -DPYTHON_CMD="${bcc_python_impls%;}"
+ )
+ if use lua && use lua_single_target_luajit; then
+ mycmakeargs+=( -DWITH_LUAJIT=1 )
+ fi
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ python_foreach_impl python_optimize
+ python_replicate_script $(grep -Flr '#!/usr/bin/python' "${ED}/usr/share/bcc/tools")
+
+ newenvd "${FILESDIR}"/60bcc.env 60bcc.env
+}
diff --git a/dev-util/bcc/bcc-0.18.0-r1.ebuild b/dev-util/bcc/bcc-0.18.0-r1.ebuild
new file mode 100644
index 000000000000..01de6128ed35
--- /dev/null
+++ b/dev-util/bcc/bcc-0.18.0-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit cmake linux-info llvm lua-single python-r1
+
+DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
+HOMEPAGE="https://iovisor.github.io/bcc/"
+
+SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+lua test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ lua? ( ${LUA_REQUIRED_USE} )"
+
+RDEPEND="
+ >=dev-libs/libbpf-0.3[static-libs(-)]
+ >=sys-kernel/linux-headers-4.14
+ >=dev-libs/elfutils-0.166:=
+ <=sys-devel/clang-12:=
+ <=sys-devel/llvm-12:=[llvm_targets_BPF(+)]
+ lua? ( ${LUA_DEPS} )
+ ${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}
+ test? (
+ || (
+ net-misc/iputils[arping]
+ net-analyzer/arping
+ )
+ net-analyzer/netperf
+ net-misc/iperf:*
+ )
+"
+BDEPEND="
+ dev-util/cmake
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
+ "${FILESDIR}/bcc-0.14.0-cmakelists.patch"
+)
+
+# tests need root access
+RESTRICT="test"
+
+pkg_pretend() {
+ local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
+ ~HAVE_EBPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
+ ~KPROBES"
+
+ check_extra_config
+}
+
+pkg_setup() {
+ LLVM_MAX_SLOT=11 llvm_pkg_setup
+ python_setup
+}
+
+src_prepare() {
+ local bpf_link_path
+
+ # this avoids bundling
+ bpf_link_path="$(realpath --relative-to="${S}/src/cc/libbpf" /usr/include/bpf)" || die
+ ln -sfn "${bpf_link_path}" src/cc/libbpf/include || die
+
+ cmake_src_prepare
+}
+
+python_add_impl() {
+ bcc_python_impls+="${EPYTHON};"
+}
+
+src_configure() {
+ local bcc_python_impls
+ python_foreach_impl python_add_impl
+
+ local -a mycmakeargs=(
+ -DREVISION=${PV%%_*}
+ -DENABLE_LLVM_SHARED=ON
+ -DCMAKE_USE_LIBBPF_PACKAGE=ON
+ -DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}"
+ -DPYTHON_CMD="${bcc_python_impls%;}"
+
+ )
+ if use lua && use lua_single_target_luajit; then
+ mycmakeargs+=( -DWITH_LUAJIT=1 )
+ fi
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ python_replicate_script $(grep -Flr '#!/usr/bin/python' "${ED}/usr/share/bcc/tools")
+ python_foreach_impl python_optimize
+
+ newenvd "${FILESDIR}"/60bcc.env 60bcc.env
+}
diff --git a/dev-util/bcpp/Manifest b/dev-util/bcpp/Manifest
index 20396938c7bc..c31b8dc2d74e 100644
--- a/dev-util/bcpp/Manifest
+++ b/dev-util/bcpp/Manifest
@@ -1 +1,2 @@
DIST bcpp-20150811.tgz 145969 BLAKE2B c7cdb21b6c07599c93c6f3fdf6ca4f5e825d4ae5f955e1c969d744a9ff2594bf3c7dcded1582dff695201f6e7e8ed57d5796883b63c5c57476c6601da6a49717 SHA512 a11462574bd87cf66dc50ce23f188d335480aae5448b527694791d4b7ae5cde27c0e0c0850dc8899b2b66198c37a434985c833f95f7f2d2d88a3b7dfe4ff34a9
+DIST bcpp-20210108.tgz 150080 BLAKE2B 5614b1e9957d63532ed6ba6d4588ae8b899201c363984bc99726bf48ae49ee9d16a71c407e3988fdeb715fef5e67343bc56c94eb1c8e977a14a6c2b08ee6668a SHA512 46a8fff766bbca4833c898d550ce4f0ac5e6ea64a2e05e63e4680186345a080aa30e54a4a5a3d22d47df8e8c8cbc4e738578fd59ec647d305c32a228d3b01e73
diff --git a/dev-util/bcpp/bcpp-20150811-r1.ebuild b/dev-util/bcpp/bcpp-20150811-r1.ebuild
index 983e05a2945e..bf4a9d304e7a 100644
--- a/dev-util/bcpp/bcpp-20150811-r1.ebuild
+++ b/dev-util/bcpp/bcpp-20150811-r1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
DESCRIPTION="Indents C/C++ source code"
HOMEPAGE="https://invisible-island.net/bcpp/"
-SRC_URI="ftp://invisible-island.net/bcpp/${P}.tgz"
+SRC_URI="ftp://ftp.invisible-island.net/bcpp/${P}.tgz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
src_compile() {
diff --git a/dev-util/bcpp/bcpp-20210108.ebuild b/dev-util/bcpp/bcpp-20210108.ebuild
new file mode 100644
index 000000000000..2ef7dd6cee6c
--- /dev/null
+++ b/dev-util/bcpp/bcpp-20210108.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Indents C/C++ source code"
+HOMEPAGE="https://invisible-island.net/bcpp/"
+SRC_URI="ftp://ftp.invisible-island.net/bcpp/${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+src_compile() {
+ emake CPPFLAGS='-DBCPP_CONFIG_DIR=\"/etc/bcpp/\"'
+}
+
+src_install() {
+ default
+ dodoc CHANGES MANIFEST README VERSION txtdocs/hirachy.txt \
+ txtdocs/manual.txt
+
+ insinto /etc/bcpp
+ doins bcpp.cfg indent.cfg
+}
+
+pkg_postinst() {
+ elog "Check the documentation for more information on how to"
+ elog "Run bcpp. Please note that in order to get help for"
+ elog "bcpp, please run bcpp -h and not the command by itself."
+ elog ""
+ elog "Configuration files are at ${EPREFIX}/etc/bcpp."
+ elog "To use them, use the -c option followed by the filename."
+}
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.20.1.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.20.1.ebuild
index 48114a6e5290..17e2eb88472d 100644
--- a/dev-util/bitcoin-tx/bitcoin-tx-0.20.1.ebuild
+++ b/dev-util/bitcoin-tx/bitcoin-tx-0.20.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="knots"
DEPEND="
diff --git a/dev-util/bitrise/bitrise-1.24.0.ebuild b/dev-util/bitrise/bitrise-1.24.0.ebuild
index 2bfc659d0fc8..59ddcd2ba0d4 100644
--- a/dev-util/bitrise/bitrise-1.24.0.ebuild
+++ b/dev-util/bitrise/bitrise-1.24.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
diff --git a/dev-util/bnfc/Manifest b/dev-util/bnfc/Manifest
index 6a5c50e3f536..1fc836c2732c 100644
--- a/dev-util/bnfc/Manifest
+++ b/dev-util/bnfc/Manifest
@@ -1,2 +1 @@
-DIST BNFC-2.8.1.tar.gz 225015 BLAKE2B 973f7a5ebc5fb995bf0014621ba7bfebe0d6adbb35bd276b3f7ec56e3fe1ab08c3811d27a2d58a73ca52ac4bf9ba35fba3d172a82684b1ef999a2fdd6dc4ece9 SHA512 d5ea9b4129a4f71c2d66cda2f859a2c39be6d4400cddbd5a5303b5b408f4cf03ce7a92825224f4674c6cc48bec07429c447b9b39fc4e6d144c922bf1b0829561
DIST BNFC-2.8.3.tar.gz 286964 BLAKE2B 5c8a5d08b1b705e064ef0a7a685dab455e933d0fa84946b4526aebee8698e94ea2cdfa797eb63320e9632b3503da5c41ea2aa59d0bb1f0fa9bda3588a19552d9 SHA512 742937cb0674f5e890376f51aeeccaf2f4c986f6b27e77faaee1ac8baebec553e70c623844c7c63e1caf441592b53113ba4ba187d88a9e869885d40201c54bef
diff --git a/dev-util/bnfc/bnfc-2.8.1.ebuild b/dev-util/bnfc/bnfc-2.8.1.ebuild
deleted file mode 100644
index b0e5fb49a630..000000000000
--- a/dev-util/bnfc/bnfc-2.8.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour" # Broken test-suite: missing files
-inherit haskell-cabal
-
-MY_PN="BNFC"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A compiler front-end generator"
-HOMEPAGE="https://bnfc.digitalgrammars.com/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # missing files
-
-RDEPEND="dev-haskell/mtl:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- dev-haskell/alex
- >=dev-haskell/cabal-1.8
- dev-haskell/happy
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-ghc84.patch
- "${FILESDIR}"/${P}-ghc84-p2.patch
-)
diff --git a/dev-util/bnfc/files/bnfc-2.8.1-ghc84-p2.patch b/dev-util/bnfc/files/bnfc-2.8.1-ghc84-p2.patch
deleted file mode 100644
index a1e944c2d154..000000000000
--- a/dev-util/bnfc/files/bnfc-2.8.1-ghc84-p2.patch
+++ /dev/null
@@ -1,130 +0,0 @@
---- a/src/BNFC/Backend/C/CFtoCAbs.hs
-+++ b/src/BNFC/Backend/C/CFtoCAbs.hs
-@@ -50,3 +50,3 @@ import Data.List
- import Data.Char(toLower)
--
-+import Prelude hiding ((<>))
-
---- a/src/BNFC/Backend/C/CFtoCPrinter.hs
-+++ b/src/BNFC/Backend/C/CFtoCPrinter.hs
-@@ -53,2 +53,3 @@ import Data.Either (lefts)
- import BNFC.PrettyPrint
-+import Prelude hiding ((<>))
-
---- a/src/BNFC/Backend/C/CFtoCSkel.hs
-+++ b/src/BNFC/Backend/C/CFtoCSkel.hs
-@@ -49,2 +49,3 @@ import Data.Either (lefts)
- import Text.PrettyPrint
-+import Prelude hiding ((<>))
-
---- a/src/BNFC/Backend/CPP/NoSTL/CFtoCPPAbs.hs
-+++ b/src/BNFC/Backend/CPP/NoSTL/CFtoCPPAbs.hs
-@@ -50,3 +50,3 @@ import Data.Char(toLower)
- import Text.PrettyPrint
--
-+import Prelude hiding ((<>))
-
---- a/src/BNFC/Backend/CPP/NoSTL/CFtoCVisitSkel.hs
-+++ b/src/BNFC/Backend/CPP/NoSTL/CFtoCVisitSkel.hs
-@@ -49,2 +49,3 @@ import Data.Either (lefts)
- import BNFC.PrettyPrint
-+import Prelude hiding ((<>))
-
---- a/src/BNFC/Backend/CPP/PrettyPrinter.hs
-+++ b/src/BNFC/Backend/CPP/PrettyPrinter.hs
-@@ -32,2 +32,3 @@ import BNFC.Backend.CPP.STL.STLUtils
- import BNFC.PrettyPrint
-+import Prelude hiding ((<>))
-
---- a/src/BNFC/Backend/CPP/STL/CFtoBisonSTL.hs
-+++ b/src/BNFC/Backend/CPP/STL/CFtoBisonSTL.hs
-@@ -56,2 +56,3 @@ import BNFC.Backend.C.CFtoBisonC (startSymbol)
- import BNFC.PrettyPrint
-+import Prelude hiding ((<>))
-
---- a/src/BNFC/Backend/Common.hs
-+++ b/src/BNFC/Backend/Common.hs
-@@ -4,2 +4,3 @@ module BNFC.Backend.Common (renderListSepByPrecedence) where
- import BNFC.PrettyPrint
-+import Prelude hiding ((<>))
-
---- a/src/BNFC/Backend/Common/NamedVariables.hs
-+++ b/src/BNFC/Backend/Common/NamedVariables.hs
-@@ -75,2 +75,3 @@ import Control.Arrow (left, (&&&))
- import Data.Either (lefts)
-+import Prelude hiding ((<>))
-
---- a/src/BNFC/Backend/Java.hs
-+++ b/src/BNFC/Backend/Java.hs
-@@ -56,2 +56,3 @@ import qualified BNFC.Backend.Common.Makefile as Makefile
- import BNFC.PrettyPrint
-+import Prelude hiding ((<>))
- -------------------------------------------------------------------
---- a/src/BNFC/Backend/Java/CFtoComposVisitor.hs
-+++ b/src/BNFC/Backend/Java/CFtoComposVisitor.hs
-@@ -29,2 +29,3 @@ import Data.Either (lefts)
- import BNFC.PrettyPrint
-+import Prelude hiding ((<>))
-
---- a/src/BNFC/Backend/Java/CFtoFoldVisitor.hs
-+++ b/src/BNFC/Backend/Java/CFtoFoldVisitor.hs
-@@ -28,2 +28,3 @@ import Data.Either (lefts)
- import BNFC.PrettyPrint
-+import Prelude hiding ((<>))
-
---- a/src/BNFC/Backend/Java/CFtoJLex15.hs
-+++ b/src/BNFC/Backend/Java/CFtoJLex15.hs
-@@ -46,2 +46,3 @@ import BNFC.Backend.Common.NamedVariables
- import Text.PrettyPrint
-+import Prelude hiding ((<>))
-
---- a/src/BNFC/Backend/Java/CFtoJavaAbs15.hs
-+++ b/src/BNFC/Backend/Java/CFtoJavaAbs15.hs
-@@ -56,2 +56,3 @@ import Data.Maybe (mapMaybe)
- import Text.PrettyPrint
-+import Prelude hiding ((<>))
-
---- a/src/BNFC/Backend/Java/CFtoJavaPrinter15.hs
-+++ b/src/BNFC/Backend/Java/CFtoJavaPrinter15.hs
-@@ -58,2 +58,3 @@ import Data.Either (lefts)
- import BNFC.PrettyPrint
-+import Prelude hiding ((<>))
-
---- a/src/BNFC/Backend/Java/CFtoVisitSkel15.hs
-+++ b/src/BNFC/Backend/Java/CFtoVisitSkel15.hs
-@@ -48,2 +48,3 @@ import Text.PrettyPrint
- import Data.Either (lefts)
-+import Prelude hiding ((<>))
-
---- a/src/BNFC/Backend/OCaml/CFtoOCamlLex.hs
-+++ b/src/BNFC/Backend/OCaml/CFtoOCamlLex.hs
-@@ -34,2 +34,3 @@ import BNFC.Backend.OCaml.CFtoOCamlYacc (terminal)
- import BNFC.Utils ((+++))
-+import Prelude hiding ((<>))
-
---- a/src/BNFC/Backend/OCaml/CFtoOCamlPrinter.hs
-+++ b/src/BNFC/Backend/OCaml/CFtoOCamlPrinter.hs
-@@ -30,3 +30,3 @@ import BNFC.PrettyPrint
- import BNFC.Backend.Haskell.CFtoPrinter (compareRules)
--
-+import Prelude hiding ((<>))
-
---- a/src/BNFC/Backend/OCaml/CFtoOCamlTest.hs
-+++ b/src/BNFC/Backend/OCaml/CFtoOCamlTest.hs
-@@ -25,2 +25,3 @@ import BNFC.CF
- import BNFC.Backend.OCaml.OCamlUtil
-+import Prelude hiding ((<>))
-
---- a/src/BNFC/Backend/Pygments.hs
-+++ b/src/BNFC/Backend/Pygments.hs
-@@ -17,2 +17,3 @@ import BNFC.Utils
- import BNFC.PrettyPrint
-+import Prelude hiding ((<>))
-
---- a/src/BNFC/Lexing.hs
-+++ b/src/BNFC/Lexing.hs
-@@ -8,3 +8,3 @@ import PrintBNF
- import BNFC.CF
--
-+import Prelude hiding ((<>))
-
diff --git a/dev-util/bnfc/files/bnfc-2.8.1-ghc84.patch b/dev-util/bnfc/files/bnfc-2.8.1-ghc84.patch
deleted file mode 100644
index 884b0a7e57a6..000000000000
--- a/dev-util/bnfc/files/bnfc-2.8.1-ghc84.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/src/BNFC/Backend/Haskell/CFtoAbstract.hs
-+++ b/src/BNFC/Backend/Haskell/CFtoAbstract.hs
-@@ -25,2 +25,4 @@ import BNFC.Backend.Haskell.Utils (catToType, catvars)
- import Text.PrettyPrint
-+import Prelude hiding ((<>))
-+
-
---- a/src/BNFC/Backend/Haskell/CFtoPrinter.hs
-+++ b/src/BNFC/Backend/Haskell/CFtoPrinter.hs
-@@ -29,2 +29,3 @@ import Data.Maybe (fromJust)
- import Text.PrettyPrint
-+import Prelude hiding ((<>))
-
---- a/src/BNFC/Backend/Haskell/CFtoTemplate.hs
-+++ b/src/BNFC/Backend/Haskell/CFtoTemplate.hs
-@@ -25,2 +25,3 @@ import BNFC.CF
- import BNFC.PrettyPrint
-+import Prelude hiding ((<>))
-
---- a/src/BNFC/Backend/Haskell/Utils.hs
-+++ b/src/BNFC/Backend/Haskell/Utils.hs
-@@ -10,2 +10,3 @@ import BNFC.CF (Cat(..), identCat, normCat)
- import BNFC.Utils (mkNames, NameStyle(..))
-+import Prelude hiding ((<>))
-
---- a/src/BNFC/PrettyPrint.hs
-+++ b/src/BNFC/PrettyPrint.hs
-@@ -10,2 +10,3 @@ module BNFC.PrettyPrint
- import Text.PrettyPrint
-+import Prelude hiding ((<>))
-
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index c833789b4102..98c80b335c33 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -1,2 +1,2 @@
-DIST boost_1_72_0.tar.bz2 106907358 BLAKE2B ab270a0e3cb24da687d86785e2d2e6d7731b4dbc07bd839eadb642dfa5a428ad584acb1f3529661a8de9a986008ff3427491041059ea2b742348d02e00761cd8 SHA512 63bbd1743e7c904b2e69fdc2eafd1c2a8a30fd70d960dcd366059d0100f000cb605d56cbd9397bb18421631f1c9552a772c434d0f0caddbe56302273f51fd1f6
DIST boost_1_74_0.tar.bz2 109600630 BLAKE2B 2982f64fccf6fdb3b4b74452e603f459242d7abb42df4162278d9b558b637786a2eb97442126967b19088d591777c64ced8f60a23e71eaa0b7545e80f800de63 SHA512 4ec9c1164ec9b95ce46ba1c073e586c94b3882dce5b7347ea14bbef0c1da230e12aa5328a501ce38cae1b1d7623daa3246325625899179b4cc309242540982a4
+DIST boost_1_75_0.tar.bz2 121849575 BLAKE2B ce7ecd8bcee518ce54f7e5302f202acbea60cedd6ae9248708c0bb5bbc2713607b2e1967a9e6f77cc20a4c008c1ee4db651def55937efc80407487a7a44fa8d6 SHA512 d86f060245e98dca5c7f3f831c98ea9ccbfa8310f20830dd913d9d4c939fbe7cb94accd35f1128e7c4faf6c27adb6f4bb54e5477a6bde983dfc7aa33c4eed03a
diff --git a/dev-util/boost-build/boost-build-1.74.0.ebuild b/dev-util/boost-build/boost-build-1.74.0.ebuild
index 5074670c2b5d..04bdff2f15e0 100644
--- a/dev-util/boost-build/boost-build-1.74.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.74.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar
LICENSE="Boost-1.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples"
RESTRICT="test"
diff --git a/dev-util/boost-build/boost-build-1.72.0.ebuild b/dev-util/boost-build/boost-build-1.75.0.ebuild
index b06584c1dc8d..7c8a04b4304a 100644
--- a/dev-util/boost-build/boost-build-1.72.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.75.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar
LICENSE="Boost-1.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples"
RESTRICT="test"
@@ -22,9 +22,9 @@ S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
PATCHES=(
"${FILESDIR}"/${PN}-1.71.0-disable_python_rpath.patch
"${FILESDIR}"/${PN}-1.71.0-darwin-gentoo-toolchain.patch
- "${FILESDIR}"/${PN}-1.71.0-add-none-feature-options.patch
+ "${FILESDIR}"/${PN}-1.73.0-add-none-feature-options.patch
"${FILESDIR}"/${PN}-1.71.0-respect-c_ld-flags.patch
- "${FILESDIR}"/${PN}-1.71.0-no-implicit-march-flags.patch
+ "${FILESDIR}"/${PN}-1.74.0-no-implicit-march-flags.patch
)
src_unpack() {
@@ -40,8 +40,10 @@ src_prepare() {
}
src_configure() {
- hprefixify engine/Jambase
tc-export CXX
+
+ # need to enable LFS explicitly for 64-bit offsets on 32-bit hosts (#761100)
+ append-lfs-flags
}
src_compile() {
diff --git a/dev-util/boost-build/files/boost-build-1.71.0-add-none-feature-options.patch b/dev-util/boost-build/files/boost-build-1.71.0-add-none-feature-options.patch
deleted file mode 100644
index ddd1641d15cc..000000000000
--- a/dev-util/boost-build/files/boost-build-1.71.0-add-none-feature-options.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/tools/features/debug-feature.jam
-+++ b/tools/features/debug-feature.jam
-@@ -8,7 +8,7 @@
- import feature ;
-
- feature.feature debug-symbols
-- : on off
-+ : on off none
- : propagated ;
-
- feature.feature profiling
---- a/tools/features/optimization-feature.jam
-+++ b/tools/features/optimization-feature.jam
-@@ -8,7 +8,7 @@
- import feature ;
-
- feature.feature optimization
-- : off speed space
-+ : off none speed space
- : propagated ;
-
- feature.feature inlining
diff --git a/dev-util/boost-build/files/boost-build-1.71.0-no-implicit-march-flags.patch b/dev-util/boost-build/files/boost-build-1.71.0-no-implicit-march-flags.patch
deleted file mode 100644
index cd184030deeb..000000000000
--- a/dev-util/boost-build/files/boost-build-1.71.0-no-implicit-march-flags.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-Prevent bjam from injecting what it thinks are great -march/-mcpu flags
-in order to optimize code for you. This breaks on 32-bit builds, because
--march=i686 will not work on an i486 CHOST.
-
-See also:
-https://bugs.gentoo.org/624616
-
---- a/tools/gcc.jam
-+++ b/tools/gcc.jam
-@@ -1187,128 +1187,8 @@
- # x86 and compatible
- # The 'native' option appeared in gcc 4.2 so we cannot safely use it as default.
- # Use i686 instead for 32-bit.
--toolset.flags gcc OPTIONS <architecture>x86/<address-model>32/<instruction-set> : -march=i686 ;
--cpu-flags gcc OPTIONS : x86 : native : -march=native ;
--cpu-flags gcc OPTIONS : x86 : i486 : -march=i486 ;
--cpu-flags gcc OPTIONS : x86 : i586 : -march=i586 ;
--cpu-flags gcc OPTIONS : x86 : i686 : -march=i686 ;
--cpu-flags gcc OPTIONS : x86 : pentium : -march=pentium ;
--cpu-flags gcc OPTIONS : x86 : pentium-mmx : -march=pentium-mmx ;
--cpu-flags gcc OPTIONS : x86 : pentiumpro : -march=pentiumpro ;
--cpu-flags gcc OPTIONS : x86 : pentium2 : -march=pentium2 ;
--cpu-flags gcc OPTIONS : x86 : pentium3 : -march=pentium3 ;
--cpu-flags gcc OPTIONS : x86 : pentium3m : -march=pentium3m ;
--cpu-flags gcc OPTIONS : x86 : pentium-m : -march=pentium-m ;
--cpu-flags gcc OPTIONS : x86 : pentium4 : -march=pentium4 ;
--cpu-flags gcc OPTIONS : x86 : pentium4m : -march=pentium4m ;
--cpu-flags gcc OPTIONS : x86 : prescott : -march=prescott ;
--cpu-flags gcc OPTIONS : x86 : nocona : -march=nocona ;
--cpu-flags gcc OPTIONS : x86 : core2 : -march=core2 ;
--cpu-flags gcc OPTIONS : x86 : conroe : -march=core2 ;
--cpu-flags gcc OPTIONS : x86 : conroe-xe : -march=core2 ;
--cpu-flags gcc OPTIONS : x86 : conroe-l : -march=core2 ;
--cpu-flags gcc OPTIONS : x86 : allendale : -march=core2 ;
--cpu-flags gcc OPTIONS : x86 : wolfdale : -march=core2 -msse4.1 ;
--cpu-flags gcc OPTIONS : x86 : merom : -march=core2 ;
--cpu-flags gcc OPTIONS : x86 : merom-xe : -march=core2 ;
--cpu-flags gcc OPTIONS : x86 : kentsfield : -march=core2 ;
--cpu-flags gcc OPTIONS : x86 : kentsfield-xe : -march=core2 ;
--cpu-flags gcc OPTIONS : x86 : yorksfield : -march=core2 ;
--cpu-flags gcc OPTIONS : x86 : penryn : -march=core2 ;
--cpu-flags gcc OPTIONS : x86 : corei7 : -march=corei7 ;
--cpu-flags gcc OPTIONS : x86 : nehalem : -march=corei7 ;
--cpu-flags gcc OPTIONS : x86 : corei7-avx : -march=corei7-avx ;
--cpu-flags gcc OPTIONS : x86 : sandy-bridge : -march=corei7-avx ;
--cpu-flags gcc OPTIONS : x86 : core-avx-i : -march=core-avx-i ;
--cpu-flags gcc OPTIONS : x86 : ivy-bridge : -march=core-avx-i ;
--cpu-flags gcc OPTIONS : x86 : haswell : -march=core-avx-i -mavx2 -mfma -mbmi -mbmi2 -mlzcnt ;
--cpu-flags gcc OPTIONS : x86 : broadwell : -march=broadwell ;
--cpu-flags gcc OPTIONS : x86 : skylake : -march=skylake ;
--cpu-flags gcc OPTIONS : x86 : skylake-avx512 : -march=skylake-avx512 ;
--cpu-flags gcc OPTIONS : x86 : cannonlake : -march=skylake-avx512 -mavx512vbmi -mavx512ifma -msha ;
--cpu-flags gcc OPTIONS : x86 : icelake : -march=icelake ;
--cpu-flags gcc OPTIONS : x86 : k6 : -march=k6 ;
--cpu-flags gcc OPTIONS : x86 : k6-2 : -march=k6-2 ;
--cpu-flags gcc OPTIONS : x86 : k6-3 : -march=k6-3 ;
--cpu-flags gcc OPTIONS : x86 : athlon : -march=athlon ;
--cpu-flags gcc OPTIONS : x86 : athlon-tbird : -march=athlon-tbird ;
--cpu-flags gcc OPTIONS : x86 : athlon-4 : -march=athlon-4 ;
--cpu-flags gcc OPTIONS : x86 : athlon-xp : -march=athlon-xp ;
--cpu-flags gcc OPTIONS : x86 : athlon-mp : -march=athlon-mp ;
- ##
--cpu-flags gcc OPTIONS : x86 : k8 : -march=k8 ;
--cpu-flags gcc OPTIONS : x86 : opteron : -march=opteron ;
--cpu-flags gcc OPTIONS : x86 : athlon64 : -march=athlon64 ;
--cpu-flags gcc OPTIONS : x86 : athlon-fx : -march=athlon-fx ;
--cpu-flags gcc OPTIONS : x86 : k8-sse3 : -march=k8-sse3 ;
--cpu-flags gcc OPTIONS : x86 : opteron-sse3 : -march=opteron-sse3 ;
--cpu-flags gcc OPTIONS : x86 : athlon64-sse3 : -march=athlon64-sse3 ;
--cpu-flags gcc OPTIONS : x86 : amdfam10 : -march=amdfam10 ;
--cpu-flags gcc OPTIONS : x86 : barcelona : -march=barcelona ;
--cpu-flags gcc OPTIONS : x86 : bdver1 : -march=bdver1 ;
--cpu-flags gcc OPTIONS : x86 : bdver2 : -march=bdver2 ;
--cpu-flags gcc OPTIONS : x86 : bdver3 : -march=bdver3 ;
--cpu-flags gcc OPTIONS : x86 : bdver4 : -march=bdver4 ;
--cpu-flags gcc OPTIONS : x86 : btver1 : -march=btver1 ;
--cpu-flags gcc OPTIONS : x86 : btver2 : -march=btver2 ;
--cpu-flags gcc OPTIONS : x86 : znver1 : -march=znver1 ;
--cpu-flags gcc OPTIONS : x86 : winchip-c6 : -march=winchip-c6 ;
--cpu-flags gcc OPTIONS : x86 : winchip2 : -march=winchip2 ;
--cpu-flags gcc OPTIONS : x86 : c3 : -march=c3 ;
--cpu-flags gcc OPTIONS : x86 : c3-2 : -march=c3-2 ;
- ##
--cpu-flags gcc OPTIONS : x86 : atom : -march=atom ;
--# Sparc
--cpu-flags gcc OPTIONS : sparc : v7 : -mcpu=v7 : default ;
--cpu-flags gcc OPTIONS : sparc : cypress : -mcpu=cypress ;
--cpu-flags gcc OPTIONS : sparc : v8 : -mcpu=v8 ;
--cpu-flags gcc OPTIONS : sparc : supersparc : -mcpu=supersparc ;
--cpu-flags gcc OPTIONS : sparc : sparclite : -mcpu=sparclite ;
--cpu-flags gcc OPTIONS : sparc : hypersparc : -mcpu=hypersparc ;
--cpu-flags gcc OPTIONS : sparc : sparclite86x : -mcpu=sparclite86x ;
--cpu-flags gcc OPTIONS : sparc : f930 : -mcpu=f930 ;
--cpu-flags gcc OPTIONS : sparc : f934 : -mcpu=f934 ;
--cpu-flags gcc OPTIONS : sparc : sparclet : -mcpu=sparclet ;
--cpu-flags gcc OPTIONS : sparc : tsc701 : -mcpu=tsc701 ;
--cpu-flags gcc OPTIONS : sparc : v9 : -mcpu=v9 ;
--cpu-flags gcc OPTIONS : sparc : ultrasparc : -mcpu=ultrasparc ;
--cpu-flags gcc OPTIONS : sparc : ultrasparc3 : -mcpu=ultrasparc3 ;
- # RS/6000 & PowerPC
--cpu-flags gcc OPTIONS : power : 403 : -mcpu=403 ;
--cpu-flags gcc OPTIONS : power : 505 : -mcpu=505 ;
--cpu-flags gcc OPTIONS : power : 601 : -mcpu=601 ;
--cpu-flags gcc OPTIONS : power : 602 : -mcpu=602 ;
--cpu-flags gcc OPTIONS : power : 603 : -mcpu=603 ;
--cpu-flags gcc OPTIONS : power : 603e : -mcpu=603e ;
--cpu-flags gcc OPTIONS : power : 604 : -mcpu=604 ;
--cpu-flags gcc OPTIONS : power : 604e : -mcpu=604e ;
--cpu-flags gcc OPTIONS : power : 620 : -mcpu=620 ;
--cpu-flags gcc OPTIONS : power : 630 : -mcpu=630 ;
--cpu-flags gcc OPTIONS : power : 740 : -mcpu=740 ;
--cpu-flags gcc OPTIONS : power : 7400 : -mcpu=7400 ;
--cpu-flags gcc OPTIONS : power : 7450 : -mcpu=7450 ;
--cpu-flags gcc OPTIONS : power : 750 : -mcpu=750 ;
--cpu-flags gcc OPTIONS : power : 801 : -mcpu=801 ;
--cpu-flags gcc OPTIONS : power : 821 : -mcpu=821 ;
--cpu-flags gcc OPTIONS : power : 823 : -mcpu=823 ;
--cpu-flags gcc OPTIONS : power : 860 : -mcpu=860 ;
--cpu-flags gcc OPTIONS : power : 970 : -mcpu=970 ;
--cpu-flags gcc OPTIONS : power : 8540 : -mcpu=8540 ;
--cpu-flags gcc OPTIONS : power : power : -mcpu=power ;
--cpu-flags gcc OPTIONS : power : power2 : -mcpu=power2 ;
--cpu-flags gcc OPTIONS : power : power3 : -mcpu=power3 ;
--cpu-flags gcc OPTIONS : power : power4 : -mcpu=power4 ;
--cpu-flags gcc OPTIONS : power : power5 : -mcpu=power5 ;
--cpu-flags gcc OPTIONS : power : powerpc : -mcpu=powerpc ;
--cpu-flags gcc OPTIONS : power : powerpc64 : -mcpu=powerpc64 ;
--cpu-flags gcc OPTIONS : power : rios : -mcpu=rios ;
--cpu-flags gcc OPTIONS : power : rios1 : -mcpu=rios1 ;
--cpu-flags gcc OPTIONS : power : rios2 : -mcpu=rios2 ;
--cpu-flags gcc OPTIONS : power : rsc : -mcpu=rsc ;
--cpu-flags gcc OPTIONS : power : rs64a : -mcpu=rs64 ;
--cpu-flags gcc OPTIONS : s390x : z196 : -march=z196 ;
--cpu-flags gcc OPTIONS : s390x : zEC12 : -march=zEC12 ;
--cpu-flags gcc OPTIONS : s390x : z13 : -march=z13 ;
--cpu-flags gcc OPTIONS : s390x : z14 : -march=z14 ;
- # AIX variant of RS/6000 & PowerPC
- toolset.flags gcc AROPTIONS <address-model>64/<target-os>aix : "-X64" ;
---- a/tools/gcc.py
-+++ b/tools/gcc.py
-@@ -745,125 +745,14 @@
- # x86 and compatible
- flags('gcc', 'OPTIONS', ['<architecture>x86/<address-model>32'], ['-m32'])
- flags('gcc', 'OPTIONS', ['<architecture>x86/<address-model>64'], ['-m64'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'native', ['-march=native'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'i486', ['-march=i486'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'i586', ['-march=i586'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'i686', ['-march=i686'], default=True)
--cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium', ['-march=pentium'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium-mmx', ['-march=pentium-mmx'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'pentiumpro', ['-march=pentiumpro'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium2', ['-march=pentium2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium3', ['-march=pentium3'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium3m', ['-march=pentium3m'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium-m', ['-march=pentium-m'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium4', ['-march=pentium4'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'pentium4m', ['-march=pentium4m'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'prescott', ['-march=prescott'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'nocona', ['-march=nocona'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'core2', ['-march=core2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'conroe', ['-march=core2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'conroe-xe', ['-march=core2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'conroe-l', ['-march=core2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'allendale', ['-march=core2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'wolfdale', ['-march=core2', '-msse4.1'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'merom', ['-march=core2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'merom-xe', ['-march=core2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'kentsfield', ['-march=core2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'kentsfield-xe', ['-march=core2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'yorksfield', ['-march=core2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'penryn', ['-march=core2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'corei7', ['-march=corei7'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'nehalem', ['-march=corei7'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'corei7-avx', ['-march=corei7-avx'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'sandy-bridge', ['-march=corei7-avx'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'core-avx-i', ['-march=core-avx-i'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'ivy-bridge', ['-march=core-avx-i'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'haswell', ['-march=core-avx-i', '-mavx2', '-mfma', '-mbmi', '-mbmi2', '-mlzcnt'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'k6', ['-march=k6'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'k6-2', ['-march=k6-2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'k6-3', ['-march=k6-3'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon', ['-march=athlon'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon-tbird', ['-march=athlon-tbird'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon-4', ['-march=athlon-4'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon-xp', ['-march=athlon-xp'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon-mp', ['-march=athlon-mp'])
- ##
--cpu_flags('gcc', 'OPTIONS', 'x86', 'k8', ['-march=k8'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'opteron', ['-march=opteron'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon64', ['-march=athlon64'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon-fx', ['-march=athlon-fx'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'k8-sse3', ['-march=k8-sse3'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'opteron-sse3', ['-march=opteron-sse3'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'athlon64-sse3', ['-march=athlon64-sse3'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'amdfam10', ['-march=amdfam10'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'barcelona', ['-march=barcelona'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'bdver1', ['-march=bdver1'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'bdver2', ['-march=bdver2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'bdver3', ['-march=bdver3'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'btver1', ['-march=btver1'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'btver2', ['-march=btver2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'winchip-c6', ['-march=winchip-c6'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'winchip2', ['-march=winchip2'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'c3', ['-march=c3'])
--cpu_flags('gcc', 'OPTIONS', 'x86', 'c3-2', ['-march=c3-2'])
- ##
--cpu_flags('gcc', 'OPTIONS', 'x86', 'atom', ['-march=atom'])
- # Sparc
- flags('gcc', 'OPTIONS', ['<architecture>sparc/<address-model>32'], ['-m32'])
- flags('gcc', 'OPTIONS', ['<architecture>sparc/<address-model>64'], ['-m64'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'v7', ['-mcpu=v7'], default=True)
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'cypress', ['-mcpu=cypress'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'v8', ['-mcpu=v8'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'supersparc', ['-mcpu=supersparc'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'sparclite', ['-mcpu=sparclite'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'hypersparc', ['-mcpu=hypersparc'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'sparclite86x', ['-mcpu=sparclite86x'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'f930', ['-mcpu=f930'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'f934', ['-mcpu=f934'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'sparclet', ['-mcpu=sparclet'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'tsc701', ['-mcpu=tsc701'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'v9', ['-mcpu=v9'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'ultrasparc', ['-mcpu=ultrasparc'])
--cpu_flags('gcc', 'OPTIONS', 'sparc', 'ultrasparc3', ['-mcpu=ultrasparc3'])
- # RS/6000 & PowerPC
- flags('gcc', 'OPTIONS', ['<architecture>power/<address-model>32'], ['-m32'])
- flags('gcc', 'OPTIONS', ['<architecture>power/<address-model>64'], ['-m64'])
--cpu_flags('gcc', 'OPTIONS', 'power', '403', ['-mcpu=403'])
--cpu_flags('gcc', 'OPTIONS', 'power', '505', ['-mcpu=505'])
--cpu_flags('gcc', 'OPTIONS', 'power', '601', ['-mcpu=601'])
--cpu_flags('gcc', 'OPTIONS', 'power', '602', ['-mcpu=602'])
--cpu_flags('gcc', 'OPTIONS', 'power', '603', ['-mcpu=603'])
--cpu_flags('gcc', 'OPTIONS', 'power', '603e', ['-mcpu=603e'])
--cpu_flags('gcc', 'OPTIONS', 'power', '604', ['-mcpu=604'])
--cpu_flags('gcc', 'OPTIONS', 'power', '604e', ['-mcpu=604e'])
--cpu_flags('gcc', 'OPTIONS', 'power', '620', ['-mcpu=620'])
--cpu_flags('gcc', 'OPTIONS', 'power', '630', ['-mcpu=630'])
--cpu_flags('gcc', 'OPTIONS', 'power', '740', ['-mcpu=740'])
--cpu_flags('gcc', 'OPTIONS', 'power', '7400', ['-mcpu=7400'])
--cpu_flags('gcc', 'OPTIONS', 'power', '7450', ['-mcpu=7450'])
--cpu_flags('gcc', 'OPTIONS', 'power', '750', ['-mcpu=750'])
--cpu_flags('gcc', 'OPTIONS', 'power', '801', ['-mcpu=801'])
--cpu_flags('gcc', 'OPTIONS', 'power', '821', ['-mcpu=821'])
--cpu_flags('gcc', 'OPTIONS', 'power', '823', ['-mcpu=823'])
--cpu_flags('gcc', 'OPTIONS', 'power', '860', ['-mcpu=860'])
--cpu_flags('gcc', 'OPTIONS', 'power', '970', ['-mcpu=970'])
--cpu_flags('gcc', 'OPTIONS', 'power', '8540', ['-mcpu=8540'])
--cpu_flags('gcc', 'OPTIONS', 'power', 'power', ['-mcpu=power'])
--cpu_flags('gcc', 'OPTIONS', 'power', 'power2', ['-mcpu=power2'])
--cpu_flags('gcc', 'OPTIONS', 'power', 'power3', ['-mcpu=power3'])
--cpu_flags('gcc', 'OPTIONS', 'power', 'power4', ['-mcpu=power4'])
--cpu_flags('gcc', 'OPTIONS', 'power', 'power5', ['-mcpu=power5'])
--cpu_flags('gcc', 'OPTIONS', 'power', 'powerpc', ['-mcpu=powerpc'])
--cpu_flags('gcc', 'OPTIONS', 'power', 'powerpc64', ['-mcpu=powerpc64'])
--cpu_flags('gcc', 'OPTIONS', 'power', 'rios', ['-mcpu=rios'])
--cpu_flags('gcc', 'OPTIONS', 'power', 'rios1', ['-mcpu=rios1'])
--cpu_flags('gcc', 'OPTIONS', 'power', 'rios2', ['-mcpu=rios2'])
--cpu_flags('gcc', 'OPTIONS', 'power', 'rsc', ['-mcpu=rsc'])
--cpu_flags('gcc', 'OPTIONS', 'power', 'rs64a', ['-mcpu=rs64'])
--cpu_flags('gcc', 'OPTIONS', 's390x', 'z196', ['-march=z196'])
--cpu_flags('gcc', 'OPTIONS', 's390x', 'zEC12', ['-march=zEC12'])
--cpu_flags('gcc', 'OPTIONS', 's390x', 'z13', ['-march=z13'])
--cpu_flags('gcc', 'OPTIONS', 's390x', 'z14', ['-march=z14'])
- # AIX variant of RS/6000 & PowerPC
- flags('gcc', 'OPTIONS', ['<architecture>power/<address-model>32/<target-os>aix'], ['-maix32'])
- flags('gcc', 'OPTIONS', ['<architecture>power/<address-model>64/<target-os>aix'], ['-maix64'])
diff --git a/dev-util/bsdiff/bsdiff-4.3-r4.ebuild b/dev-util/bsdiff/bsdiff-4.3-r4.ebuild
index 0bda0b152631..08e45256bd2b 100644
--- a/dev-util/bsdiff/bsdiff-4.3-r4.ebuild
+++ b/dev-util/bsdiff/bsdiff-4.3-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.daemonology.net/bsdiff/${P}.tar.gz"
SLOT="0"
LICENSE="BSD-2"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
RDEPEND="app-arch/bzip2"
diff --git a/dev-util/btyacc/btyacc-3.0-r3.ebuild b/dev-util/btyacc/btyacc-3.0-r3.ebuild
index e27bce30647f..8949c4f6fe14 100644
--- a/dev-util/btyacc/btyacc-3.0-r3.ebuild
+++ b/dev-util/btyacc/btyacc-3.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://www.siber.com/btyacc/${MY_P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos"
S="${WORKDIR}"
diff --git a/dev-util/buildbot-badges/Manifest b/dev-util/buildbot-badges/Manifest
index d63b05c3221f..96466fbbec54 100644
--- a/dev-util/buildbot-badges/Manifest
+++ b/dev-util/buildbot-badges/Manifest
@@ -1,2 +1,3 @@
+DIST buildbot-badges-2.10.0.tar.gz 3989 BLAKE2B d158aaab8b61146bd02470619ffcb7eb1809c8a6370ad8546119590faf9e9408dff76ba0457cce432a2bd709e36437ecc973eff38bf0a69cde45abf19c49fd21 SHA512 f0179ed0cec4611022affdefbee67ea59545cb3325cf96d532a6825171cc46cc7ea062512681ab0e93d34ae96988e41a4ec5bb91629a02e094c40fa3a37cfcc7
DIST buildbot-badges-2.8.2.tar.gz 3982 BLAKE2B d2320979c3c8530089ddad3c9c57e9f77576da8979b5834ab7f4e6766c5d210c822e7ab582103e897591db0efc63139dc7cb9f9d834bf81ae199dd25929c6b49 SHA512 e2f6ca0178428db90812633c9af47e8f5c40220f506e62745a150a5572a95f99d3a4115621c29b8188b4b5d48aa3b0bac1862b6c5793cd87a4971798a5aae28a
DIST buildbot-badges-2.8.4.tar.gz 3983 BLAKE2B 24d77c179a2f3287f80b46b66abcc42897016f1094a0b5cfa36dc691be1e7d3c3c709f2c7f13c789bfcecb50d59788e5c8d660f45414855831f31892d34b63af SHA512 bfd11c0dedcf4586e73eff3cc158953d2d3eb8f75c7d900354381e962b5215ca52d2e14c5f20d558c3ae6068a680a4af17967ee7dd7d677a2ba8af2d9cf4e725
diff --git a/dev-util/buildbot-badges/buildbot-badges-2.10.0.ebuild b/dev-util/buildbot-badges/buildbot-badges-2.10.0.ebuild
new file mode 100644
index 000000000000..fc66b86c9549
--- /dev/null
+++ b/dev-util/buildbot-badges/buildbot-badges-2.10.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+DISTUTILS_USE_SETUPTOOLS="bdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="Buildbot badges plugin produces an image in SVG or PNG format..."
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+IUSE=""
+
+RDEPEND=""
+
+DEPEND="${RDEPEND}
+ ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+ ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+ ~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
+ dev-python/cairocffi[${PYTHON_USEDEP}]
+ media-gfx/cairosvg[${PYTHON_USEDEP}]
+ >=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+ dev-python/klein[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-badges/buildbot-badges-2.8.2.ebuild b/dev-util/buildbot-badges/buildbot-badges-2.8.2.ebuild
index 0db95e92aab3..fc66b86c9549 100644
--- a/dev-util/buildbot-badges/buildbot-badges-2.8.2.ebuild
+++ b/dev-util/buildbot-badges/buildbot-badges-2.8.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
PYTHON_REQ_USE="sqlite"
PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
+DISTUTILS_USE_SETUPTOOLS="bdepend"
inherit distutils-r1
diff --git a/dev-util/buildbot-badges/buildbot-badges-2.8.4.ebuild b/dev-util/buildbot-badges/buildbot-badges-2.8.4.ebuild
index 0db95e92aab3..fc66b86c9549 100644
--- a/dev-util/buildbot-badges/buildbot-badges-2.8.4.ebuild
+++ b/dev-util/buildbot-badges/buildbot-badges-2.8.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
PYTHON_REQ_USE="sqlite"
PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
+DISTUTILS_USE_SETUPTOOLS="bdepend"
inherit distutils-r1
diff --git a/dev-util/buildbot-console-view/Manifest b/dev-util/buildbot-console-view/Manifest
index ed1412ff4846..4264458d1645 100644
--- a/dev-util/buildbot-console-view/Manifest
+++ b/dev-util/buildbot-console-view/Manifest
@@ -1,2 +1,3 @@
+DIST buildbot-console-view-2.10.0.tar.gz 18720 BLAKE2B 00ae39bbd4ec9ee13dea161e4ee853fc65ed61c5aef11ece5766c2ca17db292fedf8c636726c5616c7e2f76edbe6c0c9e2cd442da3d52311857c13947dc6f9b1 SHA512 cb1899179e14df9076224d33d8a0364cde4c74825c5ba1c281dabb1cdab976c7eb4fcb8a1e73274a3198d36b8e24a85e4736dde1ae8f42244e4001a340536785
DIST buildbot-console-view-2.8.2.tar.gz 17575 BLAKE2B e036429dd40fdfdadd65a10d4f6fc025b00d9a61153aecd4f31e0c6c133ba1e546b1c810254ec1fb83913cd4434db223c3cd782481ef5785ec48162a2f111682 SHA512 dbec358933865aa79ad86754ef454d89fa369fc64f3df54eb079c0f1ebadb027131d4bd7ac14dd29a16d34aa416e21f90cbecc873944a7ab8ef7da637e20c999
DIST buildbot-console-view-2.8.4.tar.gz 18531 BLAKE2B 8d997e34eefea4be6bbbb33902b992a4864b601ef689cedbd7051667e5cab1ee45b13e2d5ad888af4a805ab1a60f0bc79439580583b3c3e233d321b52b28e0d9 SHA512 ccaa8b9ab18bd6e6609ab017ce4f2d447f99310b3448584decb8a572c573426bf84e6b86837f68b715863c66de013a8cad546e35dbbfb051c1c8d32a3825fe7f
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-2.10.0.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-2.10.0.ebuild
new file mode 100644
index 000000000000..94ef6b8b5f68
--- /dev/null
+++ b/dev-util/buildbot-console-view/buildbot-console-view-2.10.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+DISTUTILS_USE_SETUPTOOLS="bdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="Buildbot console-view plugin"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+IUSE=""
+
+RDEPEND="
+ ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+ ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+python_install_all() {
+ distutils-r1_python_install_all
+}
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-2.8.2.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-2.8.2.ebuild
index 696cf99d93e9..94ef6b8b5f68 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-2.8.2.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-2.8.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
PYTHON_REQ_USE="sqlite"
PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
+DISTUTILS_USE_SETUPTOOLS="bdepend"
inherit distutils-r1
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-2.8.4.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-2.8.4.ebuild
index 696cf99d93e9..94ef6b8b5f68 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-2.8.4.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-2.8.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
PYTHON_REQ_USE="sqlite"
PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
+DISTUTILS_USE_SETUPTOOLS="bdepend"
inherit distutils-r1
diff --git a/dev-util/buildbot-grid-view/Manifest b/dev-util/buildbot-grid-view/Manifest
index 91d0f666e38b..9ab810f7ceb2 100644
--- a/dev-util/buildbot-grid-view/Manifest
+++ b/dev-util/buildbot-grid-view/Manifest
@@ -1,2 +1,3 @@
+DIST buildbot-grid-view-2.10.0.tar.gz 13685 BLAKE2B 56c871b24c48ce6723e8fba803f82b1c751b7a3ca61b8d7ec8adc50aa87f9d64d04ff6551b0a99535c04cbaf9b18763cf6469eadbd115d2f20c060cb97a3a27c SHA512 4e5099922e3e08f18a77aede09b25ee60ee629c7c94d76149164d3e1e4ea1cdb0bd1cb6689bad060c55f55f9a3527d3f49e9a99b963479e39c076e62c5ade085
DIST buildbot-grid-view-2.8.2.tar.gz 13373 BLAKE2B 0a7a73011655e9a57574575943a3560c395ca4358c0f2169def8413a60f8381644512a227b54f016b23e6dcd18641d1ea7a3295f6c0a983c6f3caa9ab1dda60d SHA512 9b136d96f5a38f0d28f6c37db6269e039eca0cff5bbc7d75d43346566ba2e9f7924e453098f4777792429a7a9bbbb5e02c34a9b81e131d40dc3e339f4dd377f1
DIST buildbot-grid-view-2.8.4.tar.gz 13510 BLAKE2B 97816ae90c06cbc3ac63920da4dd2e1152750181a5c23c59d3f227f46131228140e676328aa80741626ff071679dd8c9385f3895ce92d27ce6d0264afe299872 SHA512 dfeb454f9d9162e30e0ea8555a0978ecfad2266e1a9412e0633924ad44ae404144ae4a51b58fdca31fa54b67fe53bab57cac1f54926fee346decf90623f91f89
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-2.10.0.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-2.10.0.ebuild
new file mode 100644
index 000000000000..ffdc419233b9
--- /dev/null
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-2.10.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+DISTUTILS_USE_SETUPTOOLS="bdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="BuildBot grid view web interface"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+IUSE=""
+
+RDEPEND=""
+
+DEPEND="${RDEPEND}
+ ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+ ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+
+python_install_all() {
+ distutils-r1_python_install_all
+}
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-2.8.2.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-2.8.2.ebuild
index 8f8e3a8dbd6e..ffdc419233b9 100644
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-2.8.2.ebuild
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-2.8.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
PYTHON_REQ_USE="sqlite"
PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
+DISTUTILS_USE_SETUPTOOLS="bdepend"
inherit distutils-r1
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-2.8.4.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-2.8.4.ebuild
index 8f8e3a8dbd6e..ffdc419233b9 100644
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-2.8.4.ebuild
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-2.8.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
PYTHON_REQ_USE="sqlite"
PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
+DISTUTILS_USE_SETUPTOOLS="bdepend"
inherit distutils-r1
diff --git a/dev-util/buildbot-pkg/Manifest b/dev-util/buildbot-pkg/Manifest
index 38e309198162..f6c995b59786 100644
--- a/dev-util/buildbot-pkg/Manifest
+++ b/dev-util/buildbot-pkg/Manifest
@@ -1,2 +1,3 @@
+DIST buildbot-pkg-2.10.0.tar.gz 4777 BLAKE2B 59f37eb1765b47d3b912b98e9d1483bb6360ec06aa35bb015018c17ebdb4e44143367e926c09c218b6c93500069238dc18e2e07b3902e15ac1fbb0d78425e558 SHA512 0f4ffa6a3d1b0a14a80c17ba573d51e6a719a6172f8ff528c19088ba2fba9ddef6ec6d82d42c280f7eda2f4260df3e5f0bbe273978fc253f4776346d3f207080
DIST buildbot-pkg-2.8.2.tar.gz 4736 BLAKE2B afbd5213b51240845f8becfcc727dc3280aa1510dd62305a5e029099da4f8e7cbbf749365baba568a2205354205e97dbdbff78a1740e464164e0c2bbc3148194 SHA512 611b5600df181adfbbe203947c36ad64a99c10c6c63c0f4e65ffd2ae4551f2d879559007b59302434cd1a2ae915a2a7125afb90f6c896110ebf514212434a2a7
DIST buildbot-pkg-2.8.4.tar.gz 4772 BLAKE2B 08e1bdf7db8a4b1f007b12475937638575afa3e16511c28f24dab59fda88d83b03420b84d4e674aaf8e2e7962e80291f759fc7083424d3d96df2643946e8d2d5 SHA512 c5ca0c36315807bb458e16f4bdc015659b32e0c6047a067d5717251e6054249aa8a162873aa196b4fb6367c68a9a99ec3a698e861a5c70de1f81e90601b3467f
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-2.10.0.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-2.10.0.ebuild
new file mode 100644
index 000000000000..03284a2d96e6
--- /dev/null
+++ b/dev-util/buildbot-pkg/buildbot-pkg-2.10.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot common www build tools for packaging releases"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+# No real integration tests for this pkg.
+# all tests are related to making releases and final checks for distribution
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-util/buildbot-waterfall-view/Manifest b/dev-util/buildbot-waterfall-view/Manifest
index a4245089aed3..bc4447434100 100644
--- a/dev-util/buildbot-waterfall-view/Manifest
+++ b/dev-util/buildbot-waterfall-view/Manifest
@@ -1,2 +1,3 @@
+DIST buildbot-waterfall-view-2.10.0.tar.gz 191695 BLAKE2B 910cff873d4b3ecbfd37ebb9035f4ac967ef55f64a0840467ff49176220b7982c71596aede3553b88345ad66586903cc08ad5856070fb7ee547369ed01e09c6c SHA512 e671cc1582f4944bad8b5f56daf04a0aeffe2ee55437f22f4ff0d20c4a82887e3635f79b3a3fa09295495293d34a1fd43b695c790796ee683f0febdf9b56a260
DIST buildbot-waterfall-view-2.8.2.tar.gz 190551 BLAKE2B 9db81d1cf17357a57c34eb8f3b1e4412635c4804708d3d99646a68293af52594952884f96f7d528c6a87302c3563a8d4f4411ed410da2fe1043b4439d4113d73 SHA512 e252874745a623c1ec8fefcfb10c742a783ec677f172d20ef8165687ec5981f4df09092096f7922381e886f4ea7ba4c795997ad8ff8fd58fd6aa40d8bc057b00
DIST buildbot-waterfall-view-2.8.4.tar.gz 191026 BLAKE2B f81dea767bf881182eeb6eb750cdcf4bc289ac92097b9b8e13a5b5a237873aa4ea16f48625e56de2dc69fe849e5602d96a3d7991cdeb427dae169de5740f0bcb SHA512 c15b7bd23193742b50deaceb1810f8dbeedb77768f0d8a3d0a7bf72c89d914b963aa2141475464f9f3701881da6abed49e730ccb39d824a755ad9c567590dd7f
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.10.0.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.10.0.ebuild
new file mode 100644
index 000000000000..04f55b79df0d
--- /dev/null
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.10.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+DISTUTILS_USE_SETUPTOOLS="bdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="Buildbot waterfall-view plugin"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+ KEYWORDS="~amd64"
+
+IUSE=""
+
+RDEPEND="
+ ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.8.2.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.8.2.ebuild
index 116af0a1e5b9..04f55b79df0d 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.8.2.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.8.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
PYTHON_REQ_USE="sqlite"
PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
+DISTUTILS_USE_SETUPTOOLS="bdepend"
inherit distutils-r1
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.8.4.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.8.4.ebuild
index 116af0a1e5b9..04f55b79df0d 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.8.4.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-2.8.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
PYTHON_REQ_USE="sqlite"
PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
+DISTUTILS_USE_SETUPTOOLS="bdepend"
inherit distutils-r1
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index 8e21e4f93aec..8dadd0a69a98 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -1,2 +1,3 @@
+DIST buildbot-worker-2.10.0.tar.gz 107279 BLAKE2B 415b950b81862ac4c08ca00217e27351152b74c19e0395451e6cb965a039ccc8d16d3a63534053c15783cb904c279e8c80354f8b33d956cd3c45c5d5c1f5c1f4 SHA512 94b96abdad97d306998b995409f5220c967b0f7a2e33d1310fc99723bb3d54aa055e0ae2e6b771cd53340b132eb95515c266f08bf08e10bede29e2a93fe72b0a
DIST buildbot-worker-2.8.2.tar.gz 101707 BLAKE2B 451dff979c6934bf6dd4e1579abbe18e9cf43551c906bd516c788a6a5f6170650a5468927bec0a8d4ab242e5886247406b2e098e1908a8d9b5777744982c7be6 SHA512 0628825ac023a66cd249dc6b42ff2f3ad3b5c0cb97561fd332ce4775abaa5368a8b7b636115259ab4aa842c811178c9b641ef4453b06167315eb81117ffef815
DIST buildbot-worker-2.8.4.tar.gz 101175 BLAKE2B 23077305d26ab282eaa4c633ebee7ca7c502285862604ecafe25d6b666ce802729c5478d676e6834bf9a2e27ccf48e1ad0e69449e55532aa81b0dcd3c6780011 SHA512 16ad9a0e5e9c875f90383fc90c359ee843e0b82a7878f87f2ac9e7091d8d907707c69210876f25b4fdf7148bcaafab10d10a8a0a8865c73808db707320757107
diff --git a/dev-util/buildbot-worker/buildbot-worker-2.10.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-2.10.0.ebuild
new file mode 100644
index 000000000000..d7b1fac66b25
--- /dev/null
+++ b/dev-util/buildbot-worker/buildbot-worker-2.10.0.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit readme.gentoo-r1 distutils-r1
+
+DESCRIPTION="BuildBot Worker (slave) Daemon"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
+
+MY_V="${PV/_p/.post}"
+MY_P="${PN}-${MY_V}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ acct-user/buildbot
+ >=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
+ dev-python/future[${PYTHON_USEDEP}]
+ !<dev-util/buildbot-1.0.0
+"
+DEPEND="${RDEPEND}
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/setuptools_trial[${PYTHON_USEDEP}]
+ )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
+ to support starting buildbot_worker through Gentoo's init system. To use this,
+ execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
+ Set up your build worker following the documentation, make sure the
+ resulting directories are owned by the \"buildbot\" user and point
+ \"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
+ The scripts can run as a different user if desired."
+}
+
+distutils_enable_tests setup.py
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ doman docs/buildbot-worker.1
+
+ newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
+ newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
+
+ dodir /var/lib/buildbot_worker
+ cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ ewarn
+ ewarn "More than one instance of a buildbot_worker can be run simultaneously."
+ ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file"
+ ewarn "is now the common base directory for all instances. If you are migrating from an older"
+ ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
+ ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
+ ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
+ ewarn " ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
+ ewarn " rc-update add buildbot_worker.myinstance default"
+ ewarn " /etc/init.d/buildbot_worker.myinstance start"
+ ewarn "Systems using systemd can do the following:"
+ ewarn " systemctl enable buildbot_worker@myinstance.service"
+ ewarn " systemctl enable buildbot_worker.target"
+ ewarn " systemctl start buildbot_worker.target"
+ fi
+}
+
+pkg_config() {
+ local buildworker_path="/var/lib/buildbot_worker"
+ local log_path="/var/log/buildbot_worker"
+
+ einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
+ einfo "Press Control-C to abort."
+
+ einfo "Enter the name for the new instance: "
+ read instance_name
+ [[ -z "${instance_name}" ]] && die "Invalid instance name"
+
+ local instance_path="${buildworker_path}/${instance_name}"
+ local instance_log_path="${log_path}/${instance_name}"
+
+ if [[ -e "${instance_path}" ]]; then
+ eerror "The instance with the specified name already exists:"
+ eerror "${instance_path}"
+ die "Instance already exists"
+ fi
+
+ if [[ ! -d "${instance_path}" ]]; then
+ mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
+ fi
+ chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
+ cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
+ || die "Moving sample configuration failed"
+ ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
+ || die "Unable to create link to init file"
+
+ if [[ ! -d "${instance_log_path}" ]]; then
+ mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
+ chown --recursive buildbot:buildbot "${instance_log_path}" \
+ || die "Setting permissions for instance failed"
+ fi
+ ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
+ || die "Unable to create link to log file"
+
+ einfo "Successfully created a buildbot_worker instance at ${instance_path}."
+ einfo "To change the default settings edit the buildbot.tac file in this directory."
+}
diff --git a/dev-util/buildbot-wsgi-dashboards/Manifest b/dev-util/buildbot-wsgi-dashboards/Manifest
index 5d52d05513f8..ca1467cc7bca 100644
--- a/dev-util/buildbot-wsgi-dashboards/Manifest
+++ b/dev-util/buildbot-wsgi-dashboards/Manifest
@@ -1,2 +1,3 @@
+DIST buildbot-wsgi-dashboards-2.10.0.tar.gz 5582 BLAKE2B 84b8ba49d967e40ab5cee28cac49d58ef97f794b07dff2eba5b27ddd712a4c34ae50d0b948f345fafe23549d1ab5d19aa0a5d799b6fb3eceb66591e70061cadd SHA512 15388a7acdacd22e8aa99e13f2a3bef75f097e64767751b246cdc5a72e19270928d61325217224cdb196eafffde0cda1dcc6a33d69cca5ef05f0d8b9836ccf72
DIST buildbot-wsgi-dashboards-2.8.2.tar.gz 5566 BLAKE2B 487b816862366acae9e55c39cb440a21c8e5c438299c43e2d6fad049ff946ece5ab647390955fbbad403ad1d7c0a2707a7612129442dc398cc7210d831aa49ef SHA512 2b75a61331aa457b3f168e1955b8905f95d11008ab6bee611ac92488f988cb0cf73fbf92321e594ac0a6e5ae03b82dfa05daab5a0647ae636a96922c0f4e8eff
DIST buildbot-wsgi-dashboards-2.8.4.tar.gz 5588 BLAKE2B 3298edaebe2f9eb5e31f8298598e892d64d653648843e3c107710d4df3a24977bd3e77db06f7edecdf8d85bbbdeedfc66a75c6f3eef93ec8374d0df1973790dc SHA512 656f0626c8cad2c21d64ebc3eb4d6e1ac24a10909afc28819e54046be8e843a7383f3648a00a908cfddd9543767e1c3293825170d7c6c64c40a61bdcd55245bd
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.10.0.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.10.0.ebuild
new file mode 100644
index 000000000000..b1265e82b977
--- /dev/null
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.10.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+DISTUTILS_USE_SETUPTOOLS="bdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+RDEPEND=""
+
+DEPEND="${RDEPEND}
+ >=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+ ~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+ ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.2.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.2.ebuild
index 4473aded5b5a..b1265e82b977 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.2.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
PYTHON_REQ_USE="sqlite"
PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
+DISTUTILS_USE_SETUPTOOLS="bdepend"
inherit distutils-r1
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.4.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.4.ebuild
index 4473aded5b5a..b1265e82b977 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.4.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-2.8.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
PYTHON_REQ_USE="sqlite"
PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
+DISTUTILS_USE_SETUPTOOLS="bdepend"
inherit distutils-r1
diff --git a/dev-util/buildbot-www/Manifest b/dev-util/buildbot-www/Manifest
index 854beeaa6325..5565bb732495 100644
--- a/dev-util/buildbot-www/Manifest
+++ b/dev-util/buildbot-www/Manifest
@@ -1,2 +1,3 @@
+DIST buildbot-www-2.10.0.tar.gz 3179700 BLAKE2B e9a8324c483896ee6f27468ce4658495277bc4e8e7b920bfc371440378d537473db1053373b8294e89519932eab486fb036743c8d069604c4646bb95c0680d41 SHA512 3ca30f65eb191451a718f102344c2230026cc252fa2a8a780cab20be309f1191567f5816c4f894e2e3b6c462f70b5bb8d22c96c9bb372818d4673a11e42c69ec
DIST buildbot-www-2.8.2.tar.gz 3172352 BLAKE2B 8ead9e9eb046bf773bd70d312ae612dced839b263b02d300f600d066fcf21ef98a7884fef36c494bdc8eb26129d5bf7897c319256f0fe6ef8e1515dc8507a26e SHA512 22d0ccb3e5b3badeb5a59db18dd7b0b925fe84936c1be1773437e899122df95bc9b0a4205a0c87182cf6be4ca4275ab20cb86a4da6098c9d9c73927cb9b3c784
DIST buildbot-www-2.8.4.tar.gz 3170166 BLAKE2B d3d5c8a6b4b963cffaa75035e2f4a076af27c9f816a8e80b346bdeade55f01c7c8403612b8e6d12036261dabe6ab4f05ddb7ffce4e7369565d361fe7b062f691 SHA512 8b698b8b99b3f9b51df0ce230c3d6e5dea8d1c1278cb7372edd170844ec46f7fe213be20db628da244cd38daaa53b1e2fcbffd3ab3980eee35ccc6a9824c7ae5
diff --git a/dev-util/buildbot-www/buildbot-www-2.10.0.ebuild b/dev-util/buildbot-www/buildbot-www-2.10.0.ebuild
new file mode 100644
index 000000000000..0bf8f835e191
--- /dev/null
+++ b/dev-util/buildbot-www/buildbot-www-2.10.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+DISTUTILS_USE_SETUPTOOLS="bdepend"
+
+inherit distutils-r1
+
+DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+DEPEND="
+ ~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/buildbot-www/buildbot-www-2.8.2.ebuild b/dev-util/buildbot-www/buildbot-www-2.8.2.ebuild
index 4e9567fe9b25..0bf8f835e191 100644
--- a/dev-util/buildbot-www/buildbot-www-2.8.2.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-2.8.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
PYTHON_REQ_USE="sqlite"
PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
+DISTUTILS_USE_SETUPTOOLS="bdepend"
inherit distutils-r1
diff --git a/dev-util/buildbot-www/buildbot-www-2.8.4.ebuild b/dev-util/buildbot-www/buildbot-www-2.8.4.ebuild
index 4e9567fe9b25..0bf8f835e191 100644
--- a/dev-util/buildbot-www/buildbot-www-2.8.4.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-2.8.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
PYTHON_REQ_USE="sqlite"
PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
+DISTUTILS_USE_SETUPTOOLS="bdepend"
inherit distutils-r1
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index 459e87fc240a..74a160173e34 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -1,3 +1,4 @@
+DIST buildbot-2.10.0.tar.gz 2270072 BLAKE2B 467c774bb50076e16731edeced969366b3960a8032da2ebed56baf2c7de8affa730482878e45aca1523ff4b7e16b6bd913bb83e3cded274faeb75148f2b6fb8f SHA512 086864dd67b883a11ba565ae3e6530c1f396e35fcb8d4346f751c05de684bc3bfd7e709a428781be79e7e6a2e0eda1eefcd7140efd529d85ed336acfb398b262
DIST buildbot-2.8.0-fakedb.tar.xz 16204 BLAKE2B 741676e2c9117b1ab174ce49747bdfcd07766ad3e471e308398dff476f167fd231b7772c2f02002cbafb27e2ef535242d84d5aa84f4bc8942d4d216b2d5bf1f6 SHA512 c2b00d8621b3a1e521f6c17e902ae331b606dda3d319187895f26629dbdaf50caefc5d49fb150fb780e682ae431515c7ded4950d62448e8a73b8efba821c0fa1
DIST buildbot-2.8.2.tar.gz 3181035 BLAKE2B 40a3e424cc03c982549f25993a4abd2fe04bdc089ad22288af4d25724972f9f3541ef32549d2761c808845df44a972b00cf631adfc564bf4852c4b6b6ab14404 SHA512 7d7f15becc7fc1803ae4e9f1906d547c89dfe1efaa51e8fda0674a3d9b060bafbaae4cb671ec844750313247edb73f17c9014c545bce58070df0ca322a0fd9a2
DIST buildbot-2.8.4.tar.gz 3134447 BLAKE2B 67052a060c9951e584a5e94f36b92262b9a1956c22efbce7ac17d83f93edde3d9443b00a7bc3afc5918006d68cc023ea0ae913e7bbf0e7cede0d9345992f83ae SHA512 45a6e6116ab5fec18b9b3a6d54886bcf86d3a821a79fd151f9311c8c3646c61051a194250395e203f02b9aa0161e12a9ca54b623897c74eee6133df752f1742c
diff --git a/dev-util/buildbot/buildbot-2.10.0.ebuild b/dev-util/buildbot/buildbot-2.10.0.ebuild
new file mode 100644
index 000000000000..83ddbc0ed88c
--- /dev/null
+++ b/dev-util/buildbot/buildbot-2.10.0.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+inherit readme.gentoo-r1 systemd distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot build automation system"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz
+ https://dev.gentoo.org/~dolsen/distfiles/buildbot-2.8.0-fakedb.tar.xz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~x86-linux"
+
+IUSE="crypt doc docker examples irc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ acct-user/buildbot
+ >=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+ >=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt?]
+ >=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-migrate-0.13[${PYTHON_USEDEP}]
+ >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
+ >=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
+ dev-python/pyjwt[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ >=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
+ ~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
+ crypt? (
+ >=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
+ dev-python/idna[${PYTHON_USEDEP}]
+ dev-python/service_identity[${PYTHON_USEDEP}]
+ )
+ irc? (
+ dev-python/txrequests[${PYTHON_USEDEP}]
+ )
+ docker? (
+ >=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ )
+"
+DEPEND="${RDEPEND}
+ doc? (
+ >=dev-python/sphinx-3.2.0[${PYTHON_USEDEP}]
+ dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
+ dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
+ dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+ dev-python/pyenchant[${PYTHON_USEDEP}]
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/sphinx-jinja[${PYTHON_USEDEP}]
+ dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+ )
+ test? (
+ >=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+ dev-python/moto[${PYTHON_USEDEP}]
+ >=dev-python/boto3-1.12.48[${PYTHON_USEDEP}]
+ dev-python/parameterized[${PYTHON_USEDEP}]
+ dev-python/pypugjs[${PYTHON_USEDEP}]
+ dev-python/txrequests[${PYTHON_USEDEP}]
+ dev-python/lz4[${PYTHON_USEDEP}]
+ dev-python/treq[${PYTHON_USEDEP}]
+ dev-python/setuptools_trial[${PYTHON_USEDEP}]
+ ~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
+ ~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
+ ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+distutils_enable_tests setup.py
+
+pkg_setup() {
+ DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
+ to support starting buildbot through Gentoo's init system. To use this,
+ execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
+ The scripts can run as a different user if desired."
+}
+
+src_compile() {
+ distutils-r1_src_compile
+
+ # missing files, so skip building
+ if use doc; then
+ einfo "Generation of documentation"
+ pushd docs > /dev/null
+ #'man' target is currently broken
+ emake html || die "Docs generation failed"
+ popd > /dev/null
+ fi
+}
+
+src_install() {
+ distutils-r1_src_install
+
+ doman docs/buildbot.1
+
+ if use doc; then
+ HTML_DOCS=( docs/_build/html/ )
+ fi
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}
+ doins -r docs/examples
+ fi
+
+ newconfd "${FILESDIR}/buildmaster.confd" buildmaster
+ newinitd "${FILESDIR}/buildmaster.initd" buildmaster
+ systemd_dounit "${FILESDIR}/buildmaster.target"
+ systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
+ systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ ewarn
+ ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
+ ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
+ ewarn "is now the common base directory for all instances. If you are migrating from an older"
+ ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
+ ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
+ ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
+ ewarn " ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
+ ewarn " rc-update add buildmaster.myinstance default"
+ ewarn " /etc/init.d/buildmaster.myinstance start"
+ ewarn "Systems using systemd can do the following:"
+ ewarn " systemctl enable buildmaster@myinstance.service"
+ ewarn " systemctl enable buildmaster.target"
+ ewarn " systemctl start buildmaster.target"
+ elog
+ elog "Upstream recommends the following when upgrading:"
+ elog "Each time you install a new version of Buildbot, you should run the"
+ elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
+ elog "This will add files and fix (or at least detect) incompatibilities between"
+ elog "your old config and the new code."
+ fi
+ elog
+ elog "In order to create a new instance of buildmaster, execute:"
+ elog " emerge --config =${CATEGORY}/${PF}"
+}
+
+pkg_config() {
+ local buildmaster_path="/var/lib/buildmaster"
+ local log_path="/var/log/buildmaster"
+
+ einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
+ einfo "Press Control-C to abort."
+
+ einfo "Enter the name for the new instance: "
+ read instance_name
+ [[ -z "${instance_name}" ]] && die "Invalid instance name"
+
+ local instance_path="${buildmaster_path}/${instance_name}"
+ local instance_log_path="${log_path}/${instance_name}"
+
+ if [[ -e "${instance_path}" ]]; then
+ eerror "The instance with the specified name already exists:"
+ eerror "${instance_path}"
+ die "Instance already exists"
+ fi
+
+ local buildbot="/usr/bin/buildbot"
+ if [[ ! -d "${buildmaster_path}" ]]; then
+ mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
+ fi
+ "${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
+ chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
+ mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
+ || die "Moving sample configuration failed"
+ ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
+ || die "Unable to create link to init file"
+
+ if [[ ! -d "${instance_log_path}" ]]; then
+ mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
+ chown --recursive buildbot:buildbot "${instance_log_path}" \
+ || die "Setting permissions for instance failed"
+ fi
+ ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
+ || die "Unable to create link to log file"
+
+ einfo "Successfully created a buildmaster instance at ${instance_path}."
+ einfo "To change the default settings edit the master.cfg file in this directory."
+}
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
index a48c2804814d..427457d4d494 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -31,9 +31,8 @@ RDEPEND="
>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt?]
>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
- >=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]
- >=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
- dev-python/future[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-migrate-0.13[${PYTHON_USEDEP}]
>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
dev-python/pyjwt[${PYTHON_USEDEP}]
diff --git a/dev-util/bustle/Manifest b/dev-util/bustle/Manifest
index 03f54b60f84a..d1939ed3d9e1 100644
--- a/dev-util/bustle/Manifest
+++ b/dev-util/bustle/Manifest
@@ -1 +1 @@
-DIST bustle-0.5.4.tar.gz 122720 BLAKE2B b5a2315919644ab5c7712f9e9bde1bdea226b4e8898981f7150558bde648a5c7965be6ad8484c09727665292e5fe3f0cb545544dbb27f2a2553e513910289620 SHA512 56eaeef831fb5929d57a008ae71d8409048ce5d12eaada98830ef742baf3479264203465d77591cb338374096eac2dc2b68b44f075b2761f16df63fad54b91fd
+DIST bustle-0.8.0.tar.gz 101175 BLAKE2B 30359a51da16631eda8f74239de7955d5887e12e7e99853dd930b12b351a0dd56425487c339ddf297dae02b271019c11329130aa0caabc4bf0c87e21600b707b SHA512 92f4757c4ed9dd88bfa144a0626d7530b6a1f859a8069d8631a9990b6a523dbb59d573c6ba142614c371171ccf391a3e77d1e8ba0c2155ecf231f9e7aa735f72
diff --git a/dev-util/bustle/bustle-0.5.4.ebuild b/dev-util/bustle/bustle-0.8.0.ebuild
index 6e92a1f7bcb4..cf60600336ea 100644
--- a/dev-util/bustle/bustle-0.5.4.ebuild
+++ b/dev-util/bustle/bustle-0.8.0.ebuild
@@ -1,42 +1,36 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-# ebuild generated by hackport 0.4.5.9999
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: -hgettext
-CABAL_FEATURES="bin test-suite"
-inherit eutils haskell-cabal toolchain-funcs
+CABAL_FEATURES="test-suite"
+inherit haskell-cabal
DESCRIPTION="Draw sequence diagrams of D-Bus traffic"
-HOMEPAGE="https://hackage.haskell.org/package/bustle"
+HOMEPAGE="https://gitlab.freedesktop.org/bustle/bustle#readme"
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-LICENSE="LGPL-2 GPL-2 GPL-3"
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="interactivetests +threaded"
-RESTRICT=test # fails one propery test
-
RDEPEND="dev-haskell/cairo:=
- >=dev-haskell/dbus-0.10:=
dev-haskell/gio:=
dev-haskell/glib:=
- >=dev-haskell/gtk3-0.13.7:0=
- >=dev-haskell/hgettext-0.1.5:=
- dev-haskell/mtl:=
+ dev-haskell/gtk3:=
+ >=dev-haskell/mtl-2.2.1:=
dev-haskell/pango:=
- dev-haskell/parsec:=
- dev-haskell/pcap:=
- dev-haskell/setlocale:=
dev-haskell/text:=
- >=dev-lang/ghc-7.4.1:=
+ >=dev-lang/ghc-8.4.3:=
dev-libs/glib:2
- dev-perl/Locale-gettext
+ net-libs/libpcap
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
+ >=dev-haskell/cabal-2.2.0.1
virtual/pkgconfig
test? ( dev-haskell/hunit
dev-haskell/quickcheck
@@ -46,13 +40,14 @@ DEPEND="${RDEPEND}
src_configure() {
haskell-cabal_src_configure \
+ --flag=-hgettext \
$(cabal_flag interactivetests interactivetests) \
$(cabal_flag threaded threaded)
}
src_compile() {
# compile haskell part
- cabal_src_compile || die "could not build haskell parts"
+ haskell-cabal_src_compile || die "could not build haskell parts"
# compile C part
emake \
@@ -64,9 +59,9 @@ src_compile() {
src_install() {
# install haskell part
- cabal_src_install || die "could not install haskell parts"
+ haskell-cabal_src_install || die "could not install haskell parts"
dobin "${S}"/dist/build/bustle-pcap
doman bustle-pcap.1
- dodoc README.md HACKING.md NEWS.md
+ dodoc README.md NEWS.md
}
diff --git a/dev-util/bustle/metadata.xml b/dev-util/bustle/metadata.xml
index 38b025a7f4bb..3171cd3d39e3 100644
--- a/dev-util/bustle/metadata.xml
+++ b/dev-util/bustle/metadata.xml
@@ -7,7 +7,10 @@
</maintainer>
<use>
<flag name="interactivetests">Build interactive test programs</flag>
- <flag name="threaded">Build with support for multithreaded execution.</flag>
+ <flag name="threaded">Build with the multi-threaded runtime</flag>
</use>
+ <longdescription>
+ Bustle records and draws sequence diagrams of D-Bus activity, showing signal emissions, method calls and their corresponding returns, with timestamps for each individual event and the duration of each method call. This can help you check for unwanted D-Bus traffic, and pinpoint why your D-Bus-based application isn&#39;t performing as well as you like. It also provides statistics like signal frequencies and average method call times.
+ </longdescription>
<origin>gentoo-staging</origin>
</pkgmetadata>
diff --git a/dev-util/byacc/byacc-20200330.ebuild b/dev-util/byacc/byacc-20200330.ebuild
index 5a73d932b404..bb2ce413af79 100644
--- a/dev-util/byacc/byacc-20200330.ebuild
+++ b/dev-util/byacc/byacc-20200330.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
diff --git a/dev-util/byacc/byacc-20200910.ebuild b/dev-util/byacc/byacc-20200910.ebuild
index dd0f7b254f65..556684fdc8ae 100644
--- a/dev-util/byacc/byacc-20200910.ebuild
+++ b/dev-util/byacc/byacc-20200910.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
diff --git a/dev-util/cargo-c/Manifest b/dev-util/cargo-c/Manifest
index d6dd7dcd6922..0ff4ec923a9b 100644
--- a/dev-util/cargo-c/Manifest
+++ b/dev-util/cargo-c/Manifest
@@ -1,133 +1,222 @@
+DIST adler-0.2.3.crate 12168 BLAKE2B c7743569d700d7ec3185e0459a18181148f8cd7579f4da1fab30eb2e3c3cabbe5a7467f7760f0cba4b2fdeb62f8d988ee1f24637685d76db7acb56f679cfc996 SHA512 565849eba122eb94d240a0cba875035537058cc168f137a8a3b99392d753815d56fa0e1a1e851062632700b0e3d12caf67f5f768b9f727956a2e5b599029e9dc
DIST adler32-1.0.4.crate 5105 BLAKE2B 344a5258e77328a24a545e32f9bc653fa25b7ea43803ed7861db261bce227aa1599520a42acea3de1f2acebb8fa9fad251e2688413b752eafe2401ca1a2ee34a SHA512 5990e1e277a1c3aae5adef5e4601b807a756a40e88578bb91f1c70d70babfa97fb3f2c1b963482ec8e18c16d5e722bf90fb42f9646c8dd840373f28965a2d123
DIST aho-corasick-0.7.10.crate 111039 BLAKE2B 69f984dbe528ece5ce4345bc0f39c122507a88e781d7c2d5c9175d1788aeef8d21e0487c7c449e28fbbdaae8203fe68627d23ac0a58d30dc70befd26ac9af32f SHA512 e8a1cb252015435009883662ca23408f1491d8f01461f3a81082feabeeff72ec61beb4f1f3271fc8a87f1379899ecfc38036ac208dca17889f70ddaca2406a9b
+DIST aho-corasick-0.7.15.crate 113071 BLAKE2B a22743be74f873b9545648db6a994250e3e39b92ac99601580e3b02194d205e921bff0b1952a4cca3399a3a7828555a1abfb0c1466f3930811c6b95c1a07ec5e SHA512 e67816efa7305937a7cbbb0079b91b8afa3fdab52cfb8eeddeee156f18bbeed26f941cd4cb18ab2bdc1da5a9ff1dcbe9d2090deec68c00287bd99ace18ee8b24
DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
DIST anyhow-1.0.27.crate 26395 BLAKE2B f510c352ba6cb6be2e20d40e176bd48f7bf39dff4a0be288f54da60346f2fcb9b6376a4f139fbe13a9178ec8feb58a28badc209814d6ed9d1decd7b327ac8a4b SHA512 ed880d594fa5d17f14abecee56f7b2742b9ceb744bf8548c99c0ac6f3880f761df657959ecf512d7d194f75055db668eaf1a8306876d596b471b12ccffb8c959
+DIST anyhow-1.0.36.crate 29083 BLAKE2B 62166679a01ba1a2935316efa74b97a990f3ad720cbe339abc333a8609462438ec0268c4f3e6f5ede1ec972a23ce982d8e5de057c3f76b3f711b1d1d1cba8fe9 SHA512 4128dade4fa361230581973809598556b188195f5cbd951f2be651cb9bdb9ce6bbc45e70e0f05044080b054524d379bf2661cddc85ca157f0b260c1c0b492bda
DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
+DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
DIST bitmaps-2.0.0.crate 17026 BLAKE2B 61559f3ea68cf54ea51426a3655a095eda21f0f4078aeb1254655e97ec92b53ecd5fe29835ce073949d5277f567f11de432643258428b5223b8624e23dc318c1 SHA512 6e89076a6ebe8256b99054a62e5112e8aba12f4393905bb4f6577f8cb19179a566df4fac01533aa83e3ae25950b9818828a9526ad370936355b8e5f761b6c81c
+DIST bitmaps-2.1.0.crate 16717 BLAKE2B 817045077c198a84d114f68474b14515309bf56abde29398fcb47d7593d41c3fac069825d8a2aa1a598dea5b4865b94a21e83d03dc8d069672e1b835bc1ad551 SHA512 a423ea009bf61629e6dd7cb954f2781dd3c578d2216cd843957e0db05abc8f8c5971d2cca1915929b2b3c7b712450c817bb1de8d08715a1ca2641ace015a1dc7
DIST bstr-0.2.12.crate 344435 BLAKE2B b55a55be4875d9aefcff0091be82d80a19c1c92d5d6e17b751dd41bebd37f6a5f72d884fa8a70e829905baf3526ce4d854b162d10d894573dd2801ed030460e9 SHA512 2d14ac85274814bb29439acf67c3aaf84ac32ad361dd6d2cbca58bf571c968f594eeb1443a632b625296929b84047652fc60ec39983c110737ba1950d88bce89
+DIST bstr-0.2.14.crate 345490 BLAKE2B 96095cf4d70d88cd5cb4a61bd0e72a673933c7d1d95b713bd44375e739037ae12451602fa539ebf98e73d39a6786728ad145e882117b98108d945ba96b810e83 SHA512 de62c0f31ad672f90a8038fa163c7cdaf474b35ec24592aee5549af7c76d43e6ed00f8d7237e15ab27576c27a7232033a217955de6a0a3b40c83661b3a7e1e8a
DIST bytesize-1.0.0.crate 7522 BLAKE2B cd4f9687753ec1ea4e7435f34b64afdf6e5534d33515d00c413da37081dea57eb76b2f3b8e001e65ca40908efccddcfa458ce1e3b5974aa79232567d9df7faff SHA512 a8837bc05efbf6faf55ce76cffb0f8ef2f47baad2f65875da246f4a8f1052af0fcd8f156950deac0e57e015183d740e0d8ced1e6da1aaecf03244ad370d926b8
+DIST bytesize-1.0.1.crate 7629 BLAKE2B c1f969f809abf5ac432e8590158781c26d11448ff0590647f2d60ad62d416a9f93e8bf1d5a650a40cac21bda90310c02f323bcc4fd1e2ee122de1588aff29352 SHA512 99a11059c27ed3c0279acafff1c0fa27fb7e5021876d2ad3a79ff8f31030fdc8a1b5969063ec6578499412804564cd3cb325c9198196bd4a078225a47179f605
DIST cargo-0.43.1.crate 1119258 BLAKE2B b6ab277b4c06064fc7ba84f829363a5bcc2e484136b2f50f75354234f6114bd424d2f88952dc45c7f671751cd1ebff3ba3076c5cc648de0550d5ef1e122dc3ab SHA512 950e6f30643b38c90bddcb2be34f02c7e57da1e3f8afeb2f0f1037d93a877928064748339b40ca520ed045d36ef5c25a8bb3ad294316fe657368cfb50163f399
+DIST cargo-0.49.0.crate 1312720 BLAKE2B 700e677b5b2ec9567219bcb3103829542d459e5ef79a40093626cf056370176c68be008b741a21684661661cb079c085869e56bdaa21d5eb6cc0cd4b9884c6c7 SHA512 2590a4a71f756e5f614ec500be39c08c627994b6c3fff76c5d5c7fbe06bd7bdcd4fe1bb4971b54eb4d8b5b10780931fdbc1a410c049d97ee84b9eb8c2502a6ac
DIST cargo-c-0.6.2.crate 19994 BLAKE2B fe2c9a8eabaf940082628ffcc481ff45640d16fd95e6e9dc8fa447aef13569db3257e73c81b1b0abea6a61aa57ca2a86eccc28f2a9ecad9bc698c6e73f9fa6c6 SHA512 430a5c96ee230419b79d80cd979d8baf59ebd93bbb75115c0c77dcffac1dc6b1c9bdf1e91fcf45619d3aca608f91573e854dd41921c1cc2a53655a7d7c7c8f0b
+DIST cargo-c-0.7.0+cargo-0.49.crate 28605 BLAKE2B 9d202186eecf8d42799338277b583cf2cb6efff1f98d22442070d63c57599bbe6201d20144172a210f7c1e2334a8e8d61c3c89e7113d2afd2f2b17b944a85d0e SHA512 d76147240b30811f6085dca040a68ee90d3304d38635bdb594d8cb04089050b687322a05cffcaf4dd32f6cdeaa355a983b8b6cb2843df40dc7cb3766b3df6342
DIST cargo-platform-0.1.1.crate 7409 BLAKE2B 503bc17f9cf08cecdc02371cfb69c70b0f61203153fee4ad4e5b8adb995e1f84e6a6cbb12565607fdb1606372b744fd3d4519f2605f05eb83078c1fc14d789a3 SHA512 b8758e002ac6c4c4440707a27cd747c90e2b128f51bc80464be93bf8677aaa26bec28cc1f730cfba639fb022bb030fae5c06c41773c5692bf3a12167d04f0d57
DIST cbindgen-0.13.2.crate 160484 BLAKE2B 9c69f957305c3bd2c3056b45875dd2115309f01541bec4bce718f5d843dfb5b3bb6746474fe8149c42c194922ff618d9e3f6cfff13f7cf9069afb81d2da3e569 SHA512 2e894c6cf2b08321418ef78228fbebb5f504aea1576b8e159b4d8d66442cb65cee4f611f0ce13fa58539c08fe21932358fcfead52acbe5413adc9fdba05faf66
+DIST cbindgen-0.16.0.crate 178160 BLAKE2B 45e6d3054582069abeeb6ac9cd54bfc25392eff48b84ae6d5f05f1a7d416caaa0194889c6ff0aa3090fe6eb844087f5ddc3a7be292d341f86c221d86d646e662 SHA512 aca6a783f4347bb977d115b5a1ae8c532b0cad1509a6ec0ddccb4d5f043c59de1242b4f1f4ab081b7ec04f67b5f137b614ab71374377efeb7b119043b47e089d
DIST cc-1.0.50.crate 49792 BLAKE2B 25ec14fd42536c381babcf697cf96fe8be61417a61ba5875a2461bb40bf3ffd9c9d03e1d9df83e2dabfc9472de3db97b08fdffb710e89b868a5e115d0463a9cd SHA512 34a721d9352f8b59cffb8cc0b9c520b972b65d6c23e83d9c6f6e88d6a6845c53ec89350a4aacd0444a5d6b03b867b97aedaf418b483afead209a7ae6d3885f5d
+DIST cc-1.0.66.crate 53454 BLAKE2B fe34309ae50a3b022c36270a1dc819713f9d70e9ade2f421c33c542e865dc861e3b5191e8949de253515aef6878f786a6abe048391a819d09bf57f33054a90ce SHA512 b07a70f88fa0588fb0f6bc7376e985834672cc9914a0713afe01740af6bcf01821d15720d831e8b7ea8b42f5866dbd011a245997f35bf8febc3b13d66089723e
DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
+DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
+DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
DIST commoncrypto-0.2.0.crate 3009 BLAKE2B 174f3099955d595040005ef201361bacc3084f5218efb0f20df8082b9bb683909a10ade64af7062edfafadb9674b27a06836f2333fdaa7d2926b207355f7a40c SHA512 61f567468221cc46b30b31ce96dba26e3dd3a9245a8d37f9f8a615b346d992c261db059bdc678882415c608a806bd45c7b38a5bfb562ad96a111cee8e1082e85
DIST commoncrypto-sys-0.2.0.crate 4338 BLAKE2B 992a06d56adc97a9d02c547766c2be2f1973507fc0083e50c623dc4ac554681b802f3fb5ef61ef430e4a58bda000170636cf6e38430550e0c0506438901fae20 SHA512 06851fbe0b87224f6c8333964237badf57f32256acb7e647ac2da16561701b7572c12509e042d0d1032a54c94c1663bc2ff19ef5ba3a7daf84276f2544bfba8e
DIST core-foundation-0.7.0.crate 25384 BLAKE2B fde852b7673cc972da8d2f8663c2c8372fda36fd577d19c9536f9df929f649ccf94150e1e23a57013bee3cd8cbb6fb894c4fb3a5744171bc6be607cb27e2757e SHA512 919041f431e21783193c0661b82cbd15946a56e24e5100a6a9dc02476ddc714595fb0416ae182981ebf6a8b27181e3178135c27388b41ec848423d739a265da6
+DIST core-foundation-0.9.1.crate 25985 BLAKE2B 22e70b7b1cd1f39c4ac287f406dabc549e3ba750ecf17955f129ff83afe67bb4bdee7e7907287eac0c28597df971de27dae77619f44d0368864c08798def1ae2 SHA512 d6dae760082ef9dcfc37d18acfa9a6ad8ee491335d17ee17447c5bccad623564f1e8bdc54460fb260aebe9276ce5ea4d8a389a83b5c7d17193614906c3d2bea9
DIST core-foundation-sys-0.7.0.crate 17033 BLAKE2B 26d190931c7462ed8c13de82e86d4417e0d130f97295c8435ec666be08c7bdc37894ef25647043970fa40eae1c63503d2ad7660c2ac17ef35d7d35698652e18b SHA512 b77566aed2b572bdbce6f71ca9dcc942ef96b628a7ed9680c4d3e3ada4a9dce90c1b439a8c7c7f22d68e51becf1d22b3262e227cafdf8cfe5f42db0ffb9dadc7
+DIST core-foundation-sys-0.8.2.crate 17461 BLAKE2B bafa6f6af67f55b34c20e50093a5426bed35c159058a97c03d28c99b6f0075305596907291d26b170ee2ce1bf0c74bd51e2c54f11ef021399791129de6cabb57 SHA512 1c66f2012c11185603a0e4c09311d32bc4ffe639ef7626e49bb15006306fbed4c963f2c53d3b853a254b29cda73c393e0236436575d217992268463441ac7348
DIST crates-io-0.31.0.crate 8907 BLAKE2B f0d110103f639e348498a6df1ba796c78550c33ee3a089cf944f0cdc3541e20c05a85778d43bc1b58056010c980643f8ad9ff3fe118c1d46bc37e7f80dffa8fa SHA512 17e76ed6f34a94810e68c4a6473c689887b1d917ff76af5f0fa00697cdc455d4d82d3e6cde095a5ade81cde872f88a2cd7f754bb93f7ba75309dafe2ef34c450
+DIST crates-io-0.31.1.crate 8943 BLAKE2B ea8b4ea737ef07b27861555b8940722798306fc8c8adb908f81158f16309eca2a88db2ce6ce4a4d814d7a11f1625f2f9a13500ebe2dccb2cef1d435161baf5ad SHA512 2b04cf7ca5a79c31f25877c5d28d70d958a9bf31f5a057568272ffabdfc8131dd4fb5c76cc06700ff74fd8877b8a0096ec0a72b38a7db0054e75dcd6f2b45e74
DIST crc32fast-1.2.0.crate 39161 BLAKE2B f71c85801f945602d53f93ce251c978c91f63fcd92fecba5083fff0f06738697e99d92c17a824605d5d56b3224db224ff32e4b147b6f6af47ae714dcd511e7cd SHA512 2ee73e0642f83e28034c1baca65156e65d751214e83f2a4ce94b6add5ba11f74ffc80832a3348ece1c099367be2b11e820dfb349fae89fbced1b68bd6b0466f0
+DIST crc32fast-1.2.1.crate 38172 BLAKE2B 80801a345f4c5ed8a5fd335bbf672eac1733a1c2b333dc8a8e0254338148ce7b34402201a8d2d7434dd1b057f33d99d3a8f02610ea50b54115d80bb8da28b2b0 SHA512 4c04236bb15a5c63b712c62652777917e947823abb20a0d0b372c850ec1c8695faa414e8de73904f1f1a296d7b00a6206cde8da404cf4cdaa2e8408e64b62b5e
DIST crossbeam-channel-0.4.2.crate 87419 BLAKE2B 721013134069abc8f01ae5e98e1e6f10981d4892881339d3bf87f1bcb58b362348dad92e702a6b2367075dd41d860d62cca0ac8b3691954c454ca70bb5158000 SHA512 19b0ed2b5ed0fb1fe7c809e08483152fc36cf46f465c8571ca0fb9ebb1cb4b2b8f5860a303c932f336f434dafa9776ce6026ea2e64457147fb540766dc6da2ce
DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
+DIST crossbeam-utils-0.8.1.crate 35914 BLAKE2B 8d8e7e2df01f061d3596127dd62c1d5316540fbdb34e6b88badff8968a408b2bdbd0f86a32531f4e276b6d40a89c4834cd8e9991288a0bb8cc27d99ba2f7b978 SHA512 c9f3a513fd139dab3c8091366cd6d378ef8a4d00eb43a6c26d107361fea470a5ab180950a1204c1a8881c2ed1106500327d598ccb09c79d0eba2db11299aa286
DIST crypto-hash-0.3.4.crate 8102 BLAKE2B 8bcf39d195d40a2e6d899fa254c9f64e982d742fb304f4b271b75db305d5afa8ea5361c0b6adb23c0fbfd212f3c4601bc7476b4874eaac00a26c8a65b711b0ae SHA512 57d020650689c988859f51ec9252702a7e8510526364b00058b263f4decb249d7296811adf3b8c5e76f8aa744cd5e444aa198f3dfe134c98257b99cdeb824537
DIST curl-0.4.28.crate 75395 BLAKE2B 5c837538d411958c479e4b831114044f3a4b90b8d079f64f80a8e76b42bc79b1204db00d2f85fe65f88d01df675dac6c6c958bc11280c682cd46924e40c48dbb SHA512 67d10f183334da78457283ecb90a27825723d772bc2031871d789a7173e7f5266e05195c84522d5c64697659eb7c1a6dccecbc4d3f772a71e7fff6f687a6a5e1
+DIST curl-0.4.34.crate 84129 BLAKE2B 94397213cbbfcad521bddaeeaf0b8e394223b72871cc9e0435edd4e1ba078a18e64e830f835c436285163512801408f33c64cc497c059d08d1edac1527aae923 SHA512 50250a3d5bf5b3fa899089a5452e9cd1dbb6553647ee52c0df4fb5837878131c4bfe84cf912e6cf5ede945e94906952051f4a2c4ea140cfeb41a91efb36f61a2
DIST curl-sys-0.4.30+curl-7.69.1.crate 3006445 BLAKE2B 80c932b9e9d847258e2704a47af3edf028581a076df784b13e99af639bd9788c564bb8ed6b07900f5660a662817bb75fe3282c3ae2e2118fa26045871fed80eb SHA512 34d4e520d25215b35af150a217105cceb3934706c4170eb2e42324d352b6778e82bf23be3a3ea1cb73ff09d7c0bdd20548b6396d6b0ebe1cee4dfcb3c3c0abe0
+DIST curl-sys-0.4.39+curl-7.74.0.crate 2878786 BLAKE2B 4aa2fbafc3aaab6738c7c8433cdfbc3d1b7c0186ac630d0c097fbca7c1e5251c37b56a97eb78d0864fad281f3a53603bf11709f097ff092a90bb8ce1c9674a48 SHA512 ce13ffe129f62f9967f15d18cefbe9c9c38fb4ad2fea9dd8b736981199c89b7ef8ccef2d7411b0f007c44a81bc1a357014a363bd0e715aa9311a517b04e7382c
DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f
+DIST filetime-0.2.13.crate 14348 BLAKE2B cdb21f88ba00293c93f4831ec81b1c5468d6ca88fc58d3c3daa106c5476089df630ce6082280a77bf6da881dd95f3000f4abeb2469d8aad4d0efb6c3bdd80a2b SHA512 ba7d31b0946bc30782feee124dd904b4c3ba75d1bd81131e3bef06faeb019b51e7cc436a4fe86f3dc9615900fa27bce3f4965f13472ead173564054db8f6f786
DIST filetime-0.2.8.crate 13527 BLAKE2B 49b9f7a786e3920fd0d457e8ef09fb729dcf557483e17940091ea7079d3bf331e28b7d9029b3840608c8abd6ef1ecd559644826bf5f9bec66881022da9ff72e4 SHA512 c94d3c3926972f3105be52a48654afe3ebc7822d2ef77a2000113c3a85e7f0084b3598c6845a09e8e530d68f50637c3c0b9a058fdfb68052117af3ddcee89d2a
DIST flate2-1.0.14.crate 74183 BLAKE2B d3ef991f13e063deec70e782c07d064b033c50bebe2d92fe648cc21ff45e1716e7c50eff84f3805d3b11d7ea3510cd97d96b75b531c8f03b56e06889867dae08 SHA512 d70ee34d21b345529149b95000692e2dc590e14924d862cefdf926e77bb6e2572a99d0cea76fc0661d1149730cb3914598c1f500bd09661338713894b9a19152
+DIST flate2-1.0.19.crate 73768 BLAKE2B 1cdce9db71ace32d45b90774cc0804f4f663d1193687e9487ffcb8b8962006c680449dcdabd296e1b1046bb3dc2d910a11106f24debea5c63f757b471fc33fa1 SHA512 6e802f351085ce8804afad32d9502980269e2c03e2315349b9dcdbbb6895f61c89fbde822e31504eb00d94e665e1a8186ea3d128b5b612c61323494a8dd4332e
DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
+DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
+DIST form_urlencoded-1.0.0.crate 8412 BLAKE2B d65250a1d56cee26befb8733733ab67ffba9b9826755194158f336a22e792d38320292548ec73cedf18a56a806707334eb75833e54bb811c56a2ccfee05aa731 SHA512 193b8630b2790931c1ade898187637b2efdfed60b2c98a2dec6658380433fb7711fc2d8196834c19eecddd219ca7383e4a4946bef25c664bf4dc010388b60605
DIST fs2-0.4.3.crate 13138 BLAKE2B a8c53130014affc276544360425718c480fe6b6583675e15e8bf25dca0cd2752aeb0793135fce1bdc12bcfc0ef21fb7f6aa298981d61ac150300eb134c2014e0 SHA512 b83fefa9123f304e4813ec1dacbb1aee5dc0c94e1316cd7c8a434aa2a242c9c42523d2bd8232d78e6c84c4e172b5c46ef8605e93b54216a2d4496fdf885dcf50
DIST fwdansi-1.1.0.crate 8280 BLAKE2B 5c46e66a7fe25e02aaf42668853a0eea8ab3bbf9d160702770d94f8e6c4b3efcac9f840387516d1d14cf34271981ba095e3e0f7a5eb009b9d5837f94f8fdee3b SHA512 5f91a6fbc40b00a06abb6686cdc0389a837fea6513a9b9bde7cc4ce5cdb19c180ab21ecb5927c41a52c56675991ee10d127335c1f6d8c52dc7e6b30b32411370
DIST getrandom-0.1.14.crate 24698 BLAKE2B 8139227951eb65cc2bb7bba29291c0e8ff0b8d9a8e2d7eabb01682d1683c989c44b6195952ec7d087c338538c1d6858c45514822625266e0996829e8c50f3d17 SHA512 b5cb78ae81f31fffd7d720f9ea2b5917b4eac103711faf656a3a3fdd24ae5a2e671016d39309cdd11f902de919187311401dd8fe9e6ed68c29b83987de77c957
+DIST getrandom-0.1.15.crate 24786 BLAKE2B 868817d62ee44fa5bbf54f9af0bd71a29503f92bc93e190a834f4ebdb8eb73dd29e175c661f9964298987949c0b82a53e99080cbe4090fc9c5453daea4b05595 SHA512 b26d9558554058f8a54b03f56f488db5ebad2d5cc84f737e489f8f532f8464ef9038d104173eb30acca61caa1f99e1ce267bc493c01ba1611b829e0a090cc87f
DIST git2-0.11.0.crate 158388 BLAKE2B b58cb940b2341acb458e0047a0758de26593a36f7dce30ae8386919dc50ef43a3094ed9ea834e9f141e9551491c1a5b7cb7cf93122f41283235fc75624d01cc2 SHA512 4625eb25e5e88c0f608917a5a6a574372942bde8697f9e2ac1a8198c263a89edaf42cae6738dc87343b1b1359f56462886a3551e9f41ac6c19837996340ebfaa
+DIST git2-0.13.13.crate 178908 BLAKE2B 8d7a556ee3368254261bd4bea23c02b407ffcc30991196064dbf23167a4479f50e2fd099aba2ec02bfea4c8c7f012d5dcc544c42f94573af1b5f20296717719b SHA512 f98bf48c925d75fdf4d661cc36a7416236ca3155a5b4f6d0a29abba484b9a48a947d92197470cad25f2a16acbfd2aa6f0d7836cde73480a42a0e50be734e0c96
DIST git2-curl-0.12.0.crate 9340 BLAKE2B 231859e1358e7237e683c4d243f184170fbecb49f69eef611aa92c34afc7fa86801d1be7009e6e37435a6387339ae7f92acf5a717047ed37280e20133415c594 SHA512 ec047a4a11e49c4c4ba2f132b8e6f86e52cce85cb1eb5337ee069d39033bc85234f71a7990d3357de5cc190121c4ad4ab3562ad5aae13298d830e508e182e20d
+DIST git2-curl-0.14.1.crate 9336 BLAKE2B ac2338bcc95315dfbc1528e29fbe7e16a4442b2e2aa94350b0f7e8a5d643db60f901d99ac5689c1b242335eee78194449c64d3e7082a2f164b6b80fcf3100134 SHA512 bd1f074631f902c1affd167db0cbff329aa07b2a46758af97c71dfbb5308a82562efa2c42e21c5be63d7c93bc1052d688beb71cfe1588a4c2e9705679cec5a1c
DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
DIST globset-0.4.5.crate 22830 BLAKE2B e4e1c4924577cc8ad14f3c76e49821b2f6050395e7673cdf4d118e7025e59e6df1be807762a484ee80739121b14bee8833c10b52ba69a13537ff9919f1bd2e3f SHA512 8fca9a19953370aa5d13b876a254f71ad6ecf0df218d8f5598ff2328eec9676be56b3a44d898dd031c8d4328bda939ee198f9b8dc7e03b45a1609b6f693a9088
+DIST globset-0.4.6.crate 22893 BLAKE2B d47dce5ddb342b5c544f50c01160df66e81e80ca8a0abbf90a74ba67aa9c585843c051ea98ceb7249d4a56e5c1b985b00df734ec0fd19439274a8c1f998dbe75 SHA512 aac2b1b0f47103a0e8b404f4c97bcaa8561d51683fe741a85d745b3f30b56f0523c2fa21f21a680d9e883c697eb4232180f042dca290e954ac55429ae251fcbc
+DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
+DIST hermit-abi-0.1.17.crate 10065 BLAKE2B 79aeac5f72873a29b53368fb01ed4288224692cc7c55221633775641ade40693bf3fb44db22cbe4422a74d1d6330450110f21b586426b6fb8ef93f116476c644 SHA512 1ed4688f2cc1f1d5ba2f7637e2a9dc230712ce8907e1fa3d95ae374cd4b67a325138a98f2a524cb03f99625775057aa0370f480a73ab20485f0456e2f108baf2
DIST hermit-abi-0.1.8.crate 7581 BLAKE2B 90fef564dd39973c5ff8ee3d4a9b129f1ca00800ca459c644ee08df1542c5adbc06881a7a59d37fe6e03a72a2df21917e38544759a2833dd8f8c065261cc1512 SHA512 25f7806834ea007174001284200201895f4536d5a447dea6c165b43c30b30871f78da5f3ef0d79579e3195951e6fd7ee5e21ec80811c515fd096f2e7b3bf7b9b
DIST hex-0.3.2.crate 9053 BLAKE2B 3ac67d26ad367df7543967a8153a2ca7c082d5f56df16cf63a37f76157ce94c68f4cb11c14cc75621a9c45d19c38425acb92b552dd6f45b9052d90cde2ea6e5f SHA512 fbb5e86da5c7fd4b7ebc505d4c0da1258b06406d40a5c6c1626f559e1a91525fa747cbb6e35a687c63216158832ceb49dc61d68cd7d74f2df3630b36ac423852
DIST hex-0.4.2.crate 13385 BLAKE2B fb185e0888736515b8c1c4c00f831f1a4a7b2a04bc0262c80bb2425563b3ca8059fadeff8660ad738bcbb522d432dde98ed6b14aa1fb8c03cdcfec6ae282a55b SHA512 b37504fa6e41caa77c924b24893a7b505330aa8c39501b3ac283fbdffa9af2b89ccb9ae004ff415af1c813fb3da222dba62f17bb3b6210a259661e2312d099a5
DIST home-0.5.3.crate 7890 BLAKE2B ed1cfadae63d1fb0a66f38aa5440dd09a98343e3afadcf1495bf69f3ce813774c9a49776c6b3641001b6007c01e24ffa6d2600c1bab05c4ea3353c74ddae2fd6 SHA512 cb3b7b24db30a8b29f36f90a0d345b2e187f9e76f22203e142a77c8308dcc62e97b5714fb0ed890210b31375cf30d3362b8d740fe189079a6d3a095be50dcb0b
DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
DIST humantime-2.0.0.crate 17374 BLAKE2B 35f36b30d8fe3cb26f666dd57e31ab93924cf9d1c40d6c83cbf800f141c951634fcd641634a8f552baabf858303570bf8d1207e5455d5129f433d0c95b138c35 SHA512 5686246351af000cc38d10f65bd6cf3fe446dbedd75867f9bfc7a68c4b8183ccfc9e0cf14b7fa149d912acbfd9ff917d8ed5be3b5eab7832d23bf573a8e024e2
+DIST humantime-2.0.1.crate 17381 BLAKE2B 254f2bc0ea87123b49c22e95ff2218abb5f611918ae5419b960b472ce3402c5baf9d66c3a586b0ad9b10639473a0dcb660b8a8d79f86e5d6bd48768cc6aeb0f8 SHA512 c3cb464801fcbeea7c04e148cda2467386b7f008642d2641bdffab85784c16aa2708e847740772674d62b746c66d404e3b8307ebaa9c2df836fb58b3b0278e62
DIST idna-0.2.0.crate 257203 BLAKE2B d26117124891f90b5e36af291c9038e2f4d46402c41380a6a89758459fd73839137e6faa401502be12dd81292cd9e12ec82fc611c0ff7a150510d19010767558 SHA512 375d6d73537a5c9cebfc850a2b561d57e748d80059ca27fe5e35c058cc12a5938cfbb39a76cfe57fbe589f7e36f89ccd91ccdb8899458c322e277c299293bc7d
DIST ignore-0.4.12.crate 51983 BLAKE2B bc0e8c263b8f128ce53761bd225249f08cc81c4301eb496c8503e468832f5dd8d93f5e0ffaa5b5590cda3ba94c3b861cbe96afc4d3cd309d1aa3030224bfebd1 SHA512 5e0afb4094ba87051dc5c545aa673bfe86fbed4dc33462f444992177d114b18400936a2a018c44fc19503951645667f16504144548753a52df3a9ebb167c0c72
+DIST ignore-0.4.17.crate 53056 BLAKE2B 734e74210f13e5ad08864cc8b143fb780383cd36048e78da04a0475eaa760867dd4a385b37fdfaff0c5aca946d4aab19c4901df0833271a3ba05887ea5dec9c5 SHA512 52380126bb46478875093eb39972949625e1d9ada6fac7148faeccc22807d8e2a1e41c34549e7d9f884fd3cd6dc3d42b47a88b5b6de1089d7e3ee8014b3aea35
DIST im-rc-14.3.0.crate 180179 BLAKE2B 6d41f9ba59c722b2c830e48f47b1e58a65888796db50831e59fb4239fc7437fca3fb46f62c6009352eef075a745bc1342c531da1160e8a72e7eebc11bbfd4e82 SHA512 525e2be44012dc79a94f662ea6bb0ce6e517131df389b3ca147b6886284f6121db09bd90217d4615dabd42117b7714e95438af714cd90b336e18be6d2a794fc3
+DIST im-rc-15.0.0.crate 182171 BLAKE2B 94605a89b9f375cc2e0a60f107db600ca57b7f342d1d686ed73a24d9e4851d790b71293b0b0440262ee45ec94defa8780c7611969fbbe36532b328964ef12c22 SHA512 4be0ad2ef6272d39b3305dcf50c97836839c4917163c030ff2a950fb16deb4eed0d3026f09743479b344f9f688419449e8732923ee1146aa655ff5aae6279003
+DIST indexmap-1.6.1.crate 49644 BLAKE2B 605929e1b6b3473171fb2af7500d769783d7e3872244800c107664fdd7decb7603bd3657ba208d3022a931fc499bb2c2e6b8aed85f880d3ed1deb827dab70703 SHA512 a859cf4f2db46fe753aae0562ba6ea32dd529789a29784324e82b03f64f42a4f302789230ac298860513b1cd8cb238b7a150f6f865d342d606fcb7a2787f9a03
DIST itoa-0.4.5.crate 11194 BLAKE2B d8f0e2aaf62152c187e0987ab4b0cf842ac13255262a9ccbf8484d730ea5397572791c023d2363d0562c18c8efd2418680583e99a1f5d14450b3f0184dce69ca SHA512 79ff8774524130a4729d5e708a4a4a837b3e5052384a12c22db4ae3e208dc4391ee185365f685137a8ba55ea7dc3499f8cddddb2fd98b84177ab292c264034d3
+DIST itoa-0.4.6.crate 12167 BLAKE2B a0ab539cfdaca0a61fc55afdb74ef3231d300452fabbc747cac16a51ec74b4ad5c877e2b2a35f3087693c7eb55b5c389b5bc037b960733ab2afa36ff781591c2 SHA512 9085ad30313a2904fc60a85afed99c7388a345ed50c988f4e7307b23b5f38b14bc9ff64edf02b85fda6c363e035ac314241d5dba4a6e2dcfef3d2648cadb9692
DIST jobserver-0.1.21.crate 21228 BLAKE2B ab1a6496d609e19235f022e920495e708571116e90f8c036edb5f7ba270c2ac938f7571e89f3fb714043c87623d4cbf1d404067ccac6a8b41e4a6768039cf02b SHA512 944249819e1e3dd09495ead941330e9abe439647c1e66ab7e2140c0c9e100b63f4f792fe06aa3c86f509f057df297ee2d35df0ccdfd4bd6a115b6a44076237ad
DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
DIST lazycell-1.2.1.crate 11691 BLAKE2B 9b1d6e9ced918aa94dd5dddcd3ffba59116dae922d264180ac36c288d8a6dd9244324a7c3050c5991b216a241e482ee17b2e6d27527b88339b606586128df1f5 SHA512 de74ccd6a3c32c360a12a51ba1d51d6530130396b37d63350a960956ae0ba13e9ac31e2bb70b61ddf055fdfbe7e559b20a38415cac3906839684905a01256ff2
+DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
DIST libc-0.2.68.crate 468882 BLAKE2B c313ba0ed94de22abf2a764edaf1ca5dc4b86e98e004c3c23d53c7684996d68a4c5499fecd0afdabc4af3e1308e5e089a66cbac81d243f432ec1a9ca5b1856a2 SHA512 3f501182e814a2e4eef3a574bf5830a9ba633018164acdac115e7d8d809bc4308b08e657869206d4e5cc73d4ec4944ea98504b708201802b1b021f854a36159c
+DIST libc-0.2.81.crate 513105 BLAKE2B 789a79faf2d5079f5c4248446fa7c07b11af647bbcc32521e7989928788bea7dc2f65204f396b4fe0c7b3a6cf5248882d7775b97c028a3af1ba35e8ecdb489f8 SHA512 8e121e0dcbd8218e02c2c6536ef6398cd002a92406d433c39bf84576e9b881c5b8a66fee826da6a6189f44b825f3a9d959075eeb0501d7f604bf9cc1a8b8d437
DIST libgit2-sys-0.10.0.crate 1530695 BLAKE2B 1a46359e2a61aad9f3dbb6eca54325bbb8e39c99eff53b4877796b8007eab61801ef7ff9c7331352396c689b134bb42e2d50bde42bacf2eb7aebf97a75c8a272 SHA512 3e86cf98c01f33a242ff0117bebd1a2dfc33100ee00c46cf538d61eae56bda4b93d479baff186837d5b8dc1ba7fbaf1942287df0487a50ac23cc75efe3a1cf7d
+DIST libgit2-sys-0.12.15+1.1.0.crate 1610175 BLAKE2B 0e2810c18b39b2788839d59eabd602636413ff8a3501474e39ebac457067e811755c41a73e7dbb35ff90f5a402afcfb8fcfeb3a7f573a2d4901204b7272cd98c SHA512 0649a0a30e30afe08cccf356c08819ce0b0f57a6cea23e87d2e7deef88e4ef6513f07d04cbc5b76d125587ab3b7752d272c380d1a22b6a23cb965bf1f9698417
DIST libnghttp2-sys-0.1.3.crate 2307977 BLAKE2B 9f0ba44c0b9e51fed1b71b9b270c20633dfed6f066a150c8cf6e4be39f08e3f1bb3a606889b9286141a10cf02aeb0ae9610571e2a55ceb5eea718426dd824a35 SHA512 d8bf63f230ad394f39c3e66226bb9bf2ce9dd8931480d3bbbefc335ff9b54cc9517cfe29c69c0bdde9fdde2e81ab2e614c2650704ee34cca88998fcf52672d68
+DIST libnghttp2-sys-0.1.5+1.42.0.crate 4457076 BLAKE2B c36a7179602b00b88f98efe5b145209b7ec5f4c21b7012e781b9083b287bdf2983b9653532ba140b8afe179b3d4d730e7f156f4a2eac3c645c02a2245ab61462 SHA512 b6abb369f0f5ddbe31efbd21b22ecbbac5d5d8b9feb5c133949c9f532e80a4e57c13bc26cd4da406961190c47ca090e98e8f260c1cc86e01d955805740c13a51
DIST libssh2-sys-0.2.16.crate 471055 BLAKE2B 4ac133a98f466a87a441f72fc030799d38bdad71496aabcf7734f4eb0d46df53ca1a5258d899e07909aeaac37269d0d6a05ca6153635a2dbb41c2432ebb1a3c4 SHA512 ada58da5ba71d577010ecae04504c9542ca5ce13b7d1f56b3408e018d28f7a3b39ab4821e82e1b212fd52a9e80bdc57d944651b33e923602b26153caf81b2400
+DIST libssh2-sys-0.2.20.crate 482687 BLAKE2B 1c35f69b06917df083f656ffae04791b5f748360087a7f4e07629b5795af7aa357541730345a1b209ab22b82810c55164dc47b9c6d8276f62ddd0bff6f750c85 SHA512 1528436d63d13dfc48dc55972fe1c7fdc7bdebccd4c2d046a9ed7f020eec6660f4bcee9cb562f6caaf721afc2f590ce4bd4cd00249a62ddf45211b436767e93a
DIST libz-sys-1.0.25.crate 650151 BLAKE2B dc11dc65c95f6c1f409ffbd0c9b12a809eaca5899da1073d8f302a752f9bb538b419cdf2f540b34b6f72c7ac36719e8fe21a1480533829cee305019304523520 SHA512 3c1d0754230c327876fadbaf3770f52282fedc6b373c92fba386a80261c577f6bea2983db7d3a40a231fbcfee40e560d8f738d25b634d270e2132b3162497547
+DIST libz-sys-1.1.2.crate 1339299 BLAKE2B c055fdcdeaff5d44cc95f6cef190094317644e4881f356e46b0c0347221ffb867afcd29ecd4d995bf397f714b705ce84cf34ab87010770e00b3aed1956fa46a0 SHA512 2342c738230ac570c61b466920e2ceafc0194381643540f094f6541917639a4f5b11d46d575bb03c7623ce109d376bafc3076a9d172233313e38cb6f49ed16db
+DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec
DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
+DIST memchr-2.3.4.crate 23077 BLAKE2B 5ddcc5fba109030040dd0c394344860ac0cb96679948b364c3333eddd29992c335c2a46a6f496c2fe085981ecb6e5386f7d44c1d489cabba180c037f1a872013 SHA512 24cde03e6f7cbee1c1d12dcc691190c7e3dc72f468cf41e2397560961d62685976fe47de51119c04c473cccf75b38311bd887fd9db93e92563aebac8f9184df6
DIST miniz_oxide-0.3.6.crate 44717 BLAKE2B 49d69fee6911ada1effe8ed73072d7815ed94a2705276698a178fc77ebf8c9e92eb286d7d71727a894f46e605afacd620d48d6aecf8975d2366e46e2c8c8bfb8 SHA512 d041b41617ae0e614f85bcfeca31d0c9d031c24942f786f43166e34ebc37bd67e3b9a44779e74b119e3d95d288d0842736ba709dd2faa3cb418415e2c86ccc93
+DIST miniz_oxide-0.4.3.crate 50058 BLAKE2B bc7a152a984de061803c11255459ce3d8fa64dd5b38de9f2ed29213abc1922d68746ff523de3b99e0e95a8933ea75448a9fa1e14cbbe248549074cd5ce7b3c1d SHA512 8c0e2b3a585a0986a61977d4459adb1a7c396ab53f4f688dcbeb2a09c60878b0423f54fd1879c190f5c64690a2473ed2a07d4162a650f6c39f402f6b27e863b7
DIST miow-0.3.3.crate 22850 BLAKE2B edfbbda60206d0e25eaa2d8972290feffe989bc2b6d98099fe3042bd0480d63a0cdb54df1abd55827790996bdbdb61f241b7fad8d325cdd64891513876ae913d SHA512 f2b8c5f31bfa2d831f1a6c0aaa9e526dde3ef8a2ac363da5180592cdf7a30e9e0898de680692db00406a48f4ee068ec97e3d42787c807335f7d47faac9c563aa
+DIST miow-0.3.6.crate 24533 BLAKE2B 232aac1d3449f2542c8fc21c9796932f478a4317a93e505de2113c6d980bba2c03a06f74d00a3abac79b689cbfbb06b5a4fa0b6778c9866bb67053111ee16d8c SHA512 13ef93e0965a2c5e561e7252407a0db03dd0811d076f20a6174a5c2ee28c49f1c340688d0ccb913736a1cab1c764cc719b61fa670f9b707f619b70797cb81ebe
DIST num_cpus-1.12.0.crate 11867 BLAKE2B 49ba476ebd14f2894dcd3e017921a865ceafe62ebf990a27874d264588f5e45fc8d6c3a3e82717e661434daca8b134faafeaf55f44e6ac447b81f162a9cbc695 SHA512 502cb7c7abdaaa42e849847313e6e12b34d9d619b58dccf7f3e80458b5b7778657f352828481daa21d482c247cfbf6d167f9ada8bbf0c3186b82d30a93a6e381
+DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
DIST opener-0.4.1.crate 10634 BLAKE2B 74668ad804ee2d39b8b1c3ec3ff2e99b62a871bec8bf295a89db0cea421f3bf1127c2bb9d886ca527402a7d05dc7477f149929507bf19be069676d83f2d947f9 SHA512 7200f4d21a0ba5e0dca5d58368c3d172a73db36d1ceb3cc978c46140e1594343c638d291685b86f0c503c970c9ce95ec2800d6840fe745005eecd32bf326d46f
DIST openssl-0.10.28.crate 189106 BLAKE2B f08547bf5636fb83aca04d859b5ca9fa790943ed866f52d2858da0b9304f07d80540e61a5eabc4da45b242789d2e8ca43af0ba253cbfcb072ceabb7d5a54a2a4 SHA512 1b8ee9409b6e3426bca45530250c89ede93ef420058f79f7c9674ee6f33e826815045d9ad9ef78719c449f6f8a02b6216b90b6b048562fd8efbad7d2b151d09d
+DIST openssl-0.10.31.crate 195472 BLAKE2B 9dececcfd2725471095f72108e70adda4d69877110f85b2ef186400e5b9fa19656f6c9fbe0ff3134d961812b3167e7ec3e77284011393c4d990591eb8474acd8 SHA512 b8844e982e012a084079b77de3de6729994b724d95b05731c3e134ce41669b3b7777d468e948bdcfa57324c4e2866b8d700e42b1da02e3e5d3d14a3c3b3b18aa
DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a
+DIST openssl-src-111.13.0+1.1.1i.crate 5087843 BLAKE2B 89502daf1795de99e730a471acb58402c5cb1b6ff1b051870de7d220f585990291a80429c4a71b3ee8389b405b5ef12fbf8975dbf3fdea0d9810460cb50bfd12 SHA512 72d8bc3fc11197e6cbdf506e98bb512b89affa405795673e58e6005c0a4a177a8dfbafc2292ea788f8b2d3c1720a84a4223618f8958706d5738254ae5650e7f3
DIST openssl-sys-0.9.54.crate 45751 BLAKE2B 7d21482f56568cdd7f8d02063f1c9b51ff355d67d20d44397f31332dccfbad36af9d6dae3294eb28feaf607b5ffcd13437ccc28df2ff0e43589b5e51c5faa012 SHA512 3c3271ac3b3825c6b8182e3d699835a4d73d774b43e9f694f4d9f1b9644de9ea1b8d8bfc2b98c9fe7af4c652d0eb7878001cd688f797d3b81bf5c8a72fd0334e
+DIST openssl-sys-0.9.59.crate 51178 BLAKE2B c29fa2d5d18f0a3fed73d231ce663dbfcfa8bd71b4841dc7dec9ae0057de16d0b353582330f5bc290edf55c8dca57d7b43787d52c86f12fe4d79c9c311920304 SHA512 dfc51d3cd90978a3173f4242f5f1c1848092680a042fd0735d4ea4d5793eca435a733173110081ca50ccae5fd8f75109bd5337146b7930872edea0e84f655241
DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
DIST pkg-config-0.3.17.crate 14533 BLAKE2B 729b15209bbbee8a6d3854e30a89b3e6041ca3cf7b1460ff6008e37866e326d9ec8b4ac582c125676e31eefa048b143beda33432b95f00a8f51cc7fa33ee4986 SHA512 42be78556adc07dffa8933ab1436d5d6a776018898377d58dfdc9f961981f9f21397301b41536c55d8a3772bf74a38069899d1a5cddce5c24a032017137044bc
+DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
+DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1
DIST ppv-lite86-0.2.6.crate 20522 BLAKE2B 6e1e4f3d0daa02148df390be19d3575626e66f6a78dbf27c1275f097c4307b80d8182f7795a270aa2c34d8c31c8c3eecc88e9507a6c9def0e91af11233aba90b SHA512 b9764a841364eb89157c828a183fdf6aeeb63d1d35e4f5dcba79e5d8e20eee8f22c845636c5c7bc980da1d141d838528d5f190546b23aa5e4e51e626a0ddce3d
DIST proc-macro-error-0.4.11.crate 21395 BLAKE2B 86e5dfa563564c1afd63e9ad69bd294c138309d3b044b9832a60380a492bc072fc3fcd295f05bb97fcab15a352ec410d235f7f25270dc0ad89cc69212bfe0502 SHA512 8d6098bcb1b61bf6894feb10a447afb71f9862f83a0c00b2eee9b0443c77d9ad7e17f848d760c158f1070d3e6716e4490f1c31199800d72939749d71051681c6
+DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
DIST proc-macro-error-attr-0.4.11.crate 6924 BLAKE2B 155d14ce647f9f9fc30255132cdfbfb2417234a97dc12dab97195f88171b51cde7284b6117e48c2754e89a8d21f0ddaf7086d69b223748f00aa9f0cbb44438b1 SHA512 a1e23486c7f4af41b419b4c833789e0edd0506bc774e3504fff2bc5bc88c2f8799ae545b79138e6ce686f479ec703f90112589639bae861b99daef0f08496885
+DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
+DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be
DIST proc-macro2-1.0.9.crate 35576 BLAKE2B 16c687cfd21bc3b97113f32293c1e06ca5811df6c8f279e1c5661a501c230b430f1e8bc983a2ba30d097acd01df8701a5a90ed02a93feff83a1f6f33ffa1e8d6 SHA512 005d1d31ec62a25fcf3cb0e62063d5fb53a3b15fce8fa597ab09cac5ac404a7eb441ae44c2d3acc295e24e814a413d0664a3d142155495674c4713f489ec79dc
DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
DIST quote-1.0.3.crate 22939 BLAKE2B c50e47b647fe1ac1930544d20b2b78ad98e6398a32c98460701d93f93fa1437c6d12c632386ab9eb733cbe64cad57e02dd201686885d0a951cb013fc10a95a9c SHA512 b4867554b86d119251db67f9d0949bf8c3cd7c64f006c76531398ebb7478cb93805b9bcafe159d921ba1a32e92773853b56685cff0e1ebdc6aadaefd3b932ef3
+DIST quote-1.0.8.crate 24997 BLAKE2B 53f8d9e363e2697b580f4bfa39257a6ea1d1899f6cd73f96233cb476de1aecd0c4bca9a8856d128af81ae0f428be71c19b0d2e4816d856bff20030c4cc9258b5 SHA512 448d06465d93d384bf31b0249fd143a92edc4b9be8bb3a8c1a86366241be6469c3874dac98acb3810d5177b106d7307c7d9e879f91cce2e278a319ef1935577f
DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10 SHA512 1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84
DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
DIST rand_xoshiro-0.4.0.crate 17029 BLAKE2B efee418e99b15aba76385a4320da667554effdde4f5d19dd55d16c1069d7915851f64526d4b4c9ed1cb6e5827572c0c96484f13669ff233baca124377ccbd48b SHA512 e889eb75ef40ad52eaf32692b3a405e01eacfeb20e0dc171de8f1b2ce05723ba448e293a2ee91eb3bec3cb5a2667bd05c11433b50470eea9219586afa73f519e
DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
+DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
DIST regex-1.3.5.crate 235308 BLAKE2B 66548c392ff921815d3be3cc196c6b1ca1ddb3f1dc178935f8159335ea9b85ab7264bfca468a3c63c242c522095fc6faeb7da19b0968a40b30ad55b6536f8201 SHA512 c37c28141a9ed35250f830d1d4b84dc527cb880d6093f1e95b348aab7ecd2d2e949fe7cc23bafde217a4f704eb828bef1651854ef4ab9593e7b4ac006d2a5ef7
+DIST regex-1.4.2.crate 236931 BLAKE2B f316b777df1c97aef2994745e1fbd9ca676b0da6bf4ffad4e54aa11014d39aed343884ede3648b5fd676dcec5e4840e9d84f4a4faaeefaf5a2d772e2c5b9ebf6 SHA512 a9bc8061b7563b8494b21f35bf3c2af5f58dcc1b0df4e25ab8d3f99ba66527d5163e2c04b229b688fcb7934961f718fab72f22d66fef53562c5d96a2fb3887de
DIST regex-syntax-0.6.17.crate 294004 BLAKE2B 3d203b06b8b1a5bdb42d50d395ce117ad92e41a7d36e5cb5194014eb7af1b17f944ae493041b7e9a2a9ea929381b4c1cb513c895747beff97aafef524ea2ced5 SHA512 bd9a165bcac207ec3bb87a81ae644be98d9b5ea0053b3bcc69efb334e3ebfeb85021aa372bafc3575758200640cbaaa67d372950fbb3ab210d8ec62b336d147f
+DIST regex-syntax-0.6.21.crate 293572 BLAKE2B 49c499ba1c03447fe7c90f27147dc5d96daf815e330a4073fe293d3be594fab1d798d35a5e49f6af43c71befd47528927246c4ebb24b6a6a141135484bbecd31 SHA512 56507f4432804ea30820984f6cff03c3514988bc3e406b3ba3a89c36c9c5d75951e4acd000ba85b95bb83d253898ce7d7d282ed930e811e12bb644c4a5ec84fa
DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
+DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
DIST rustc-workspace-hack-1.0.0.crate 774 BLAKE2B 521f71467c95554c8a87ab3e10623ea3516932fe4bc9ca95c835c06b8e0bf526291dede3a5e08df8222f365f4d326c4054a99ef0d37aa6fb5210e2a35d7599be SHA512 48e4774a272e717ea571f4c22606ffca78245723ebc3f15ae5d0b28c5d767df9e772b7e2d6c5c3505bb09bf28097aa83a34b182856bb9d74b3a00b292da45315
DIST rustfix-0.5.0.crate 18370 BLAKE2B ec580a65720ec56031efd96f082625063e85671c4877fc96b9e73181ee15c565a83f4085a26d2a2d1bc57689bda34bff7233a3e4e3555d8d1b9fb8ddccf3b281 SHA512 3bc67adb7d1012c8e832d67491c619ee376df505227738a0d83bd129c360dcbcf6330cc9c5b18038428bd8b6baa7af79686420f25c428fa8a50c9e8403706cd9
+DIST rustfix-0.5.1.crate 17768 BLAKE2B 6c1e58267fc4b81ba025d33a9bd95ab1832ed651d22d52b8808f52870aec674bffc18ce2d53bce58c4bc36f98f1e049e4c9609eb7e99e407ef78eeb756186837 SHA512 61990f482a5d490154fc55d7c052464e50268c0f752068669afb3c387d27a1e980a052ba29fe0aa301cbe4b17c7374db071a8a38d3562c943e8292605c40b3a4
DIST ryu-1.0.3.crate 41983 BLAKE2B 32f2b9e8b7aacee3fb86acf405efc86b44c564b4da4310567a0e1b22d09fa51e5ed8278f6b2c38c220ba235de39c596b15db8958aa413ff822c0876ebed56515 SHA512 53ee61ef116594829849b417feb02d415305783b08d3e45656a467aaf272899e4ed46ac0415cefdf3102f61faa666f21f3237244b2711ad10b528a3773aa8414
+DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
DIST schannel-0.1.18.crate 42693 BLAKE2B 78aa68189d2b0620e139010b64a962d47096410c0dc6b839a173d4e8e7808da9f460c26180511412711448b4a30adb072580a5c485d8d2257afc5100f80589ac SHA512 eba32bc2a9722fca9b97388c13f9cb99db4f2ebfc54f28f09525ba531297303ee601cea1995334bcbcfaff207dc5c906596bfe951a948221f26f25df65517fe3
+DIST schannel-0.1.19.crate 42755 BLAKE2B 11503202bb6c8fdff3cc716558a5c00ca7497f7aaa4890d332084754e0d1e1013719d5bd744d8aa12b8b042401f4828fda8453c104d5feeb9b437d7cc51b5273 SHA512 319d9931cdeaa0f6b50c46e413fed2b6e97b28fe8c4825d4e5ed0fe22083e686e124117bfab7c89bcce815a31a3478f8c230cdedae6a852a31719a0df34645b0
+DIST semver-0.10.0.crate 20503 BLAKE2B b27e780828e383a0baa0edf99d36952a847b10ffe174c22d2680ecf5f723354e0ff5253974b07981a6266cd74d373d1993eeb145ce795201bd8e43dd0e15299b SHA512 75e39076a551cd1f4e7c011e79ac762258b7995bb021298cf2fbc7b3bc9e6715ca3c5165429834738f1cfb5ea9fa3daf173ebe1e9e0f04135845c89675c89ad4
DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
DIST serde-1.0.105.crate 73358 BLAKE2B ef75efaa654a5980648e8418553af18508f95b29fa1441f0804c78d9f8fe91764a3565ee1138c96c9245c28ed2ed8082d08c50f8ff36b9d40b12456a758ee289 SHA512 e8b471769b696b0c7f3b673879dfd056279fb49dad0228bc2ec459a2aa8bd26073d40ac1809a42c0b5ab3e9abfd32252f812c6493d17979c10796e7ab78a795f
+DIST serde-1.0.118.crate 74248 BLAKE2B 0d78d29a9d97da401dba93cd6e118dfa48c73351e32ee48bdc2a649ad60f1b198574b78a5261564d466e8097f8b635e810f4c8a52592e3f39550910e250971e8 SHA512 d3b316e721ce395fad656a598fed7e83b248a3dbd98a9eced98fdc337c8fd40f415356a0af6a0e5a104a592ad10e1265d47d94b10b343ce9475797b3a74306e4
DIST serde_derive-1.0.105.crate 49700 BLAKE2B bbbb3a54b7eb4ca87b667c75dab007745a1e163b90c793258aa9f78b9bacd067262e3443d27c4d941b6c4ae0ad217779a4fe5ff79aaa84bb30fbac06252c5289 SHA512 1a39820708a609b3941ce6ff669068f67d65d446e208c904ffc59808ff7bb1d82148357515056fd4856e10cfdb2cfffbd968dbfba870ed23fddf1076e3f6e543
+DIST serde_derive-1.0.118.crate 50589 BLAKE2B b1328a3c7fb0fd6321f0d020969f1b7e32150488410d574cf9e75ca06bebef3d753dacfac4e45cbc0eb9626246734a1dd5b766b96a1a98b53f3f17897dcfb349 SHA512 f0909822f73e900c8a0b791a30fc5cf5be0a79e6c455766a90d6cc314408b95f2b9d7e3ef99363860d615620968e217da304457d2d6e00f60da8ab8fd2db7115
DIST serde_ignored-0.1.1.crate 11083 BLAKE2B 990f549b8b4fbd6b67f5bfe06fa6278f357ccd1014ee3a95561a09edab7f7f2e209d80c59ee749c6bc7524a07f0b357601e327d2f96bac0cfa514b3ea73afeed SHA512 1ef241d6a22f47c22305da613554e7c62cab00584e06c81381eab9c1e3e12e7ea9a516f845a5818b33bcbe72ee7dc9be686598bfc0121b400b0a8e165c8941e8
+DIST serde_ignored-0.1.2.crate 12179 BLAKE2B 45b8cab135fac2d7b23443462fe630212ae170207061f968540dd2b86a1f8c1203a185dfaa158f87dc36ceb8f769ea6c57e67c1497f2374444424237b7275af2 SHA512 c6f76051a5397615eea4aa953535ffa227cbdd6747f8f2ed0bf57d0a0b7bfa71536d8372a6cb8eb046b9a761e36f273e019754f607e6c84ae71bce25e25132cd
DIST serde_json-1.0.48.crate 72113 BLAKE2B bc522d0924044b41548b5c0ca63ed3e1fe70b7632b9e04ca6b01a63245deeae0e7154b0d913b3edfeaecfc816c1edfebfb666734c2a5371b416aaab9c1880f3c SHA512 544dd844330a26fbdaeb5246825f143cf06110065089c8be3dc44f8437f797ac083d7dcc5181656ed3d78428fcddc44e6802544ae304466eebdcd625a5a5fef9
+DIST serde_json-1.0.60.crate 114828 BLAKE2B 8f8fcce30049b0f20ed4e11ce9323afb5edcb0f05a3a5e226b15770350147f27d6fc2cf242ced0f5b76c85c78694bf342ca084bcfeb18ea7d6c9e2bac5461f78 SHA512 c19262072cc2dee3f7e047e45ef3f02df121c9b1c9dc6f16a20f5fcbc0fb1bc25e87342358f9e9ac86bbd5f5d6091a9cb56256c04e22f3dac671ed23ff64d9f4
DIST shell-escape-0.1.4.crate 6764 BLAKE2B cbfaabec7c6b81b802ced02a33e463c39b2f27f004e0e97087adf5712f1ccf4f4405ea9d010afb49153292741aa1d51d985caea5a3c48a601dc4f25b66012135 SHA512 19cd5e79b2b610dbb26098182c1ed3a8a2cb93a88fc623c0a9e3ff719998d6bb1de632f79519905441a4e38275178dd5aebca8b9994efc24e19bac4ebe5d6329
+DIST shell-escape-0.1.5.crate 6847 BLAKE2B ccd71a73b217b375843d3f0a762b3f5317bc0fdc8e43380a17f25e1ffdc391de0af7b0e4472be23241a6654f5b6ab799a51bbed8da35295322002c54ad84e9a5 SHA512 848f8d47d802b82e83f113fb07f44fe962628379481d1bef9d15f2e5821a382c9928c32175652361aae9fe4c8fa5c1dc1c89350db6ef5e68691bae4a3742df93
DIST sized-chunks-0.5.3.crate 40643 BLAKE2B f08b893f2e32eee10372c75fd6bb41b667f004e044bf271d8a4a0bb6bc9f393662ed685aae3046ec05823f0e9c70b3b7e15c40b94bd22a5aa2079873d4b4c842 SHA512 9ffe2b6d0510d8cad010f4e3015f605ea0d0f4e27ded1fdfd7d7080e338bf239bec30fe85ef4576160297ad287ed006097ffc12151a2cdc578d7031d1501440b
+DIST sized-chunks-0.6.2.crate 40265 BLAKE2B eb02254a9feaf421460130345969ac244f8b46a536f6eae27e9fe55133ab6149f545864bacee70d839a492b81b790a9eb74a0f31f44c6f2d6ce7f470a6a2eb48 SHA512 524eb5ca27cbadc6b3a2ee32e4968308ab7fd01c961511b2c783338fbc0435303a607d92c2066a9dc1fe1772ccfdc0a97875da9a929e7cfcbbb8d0647768d26d
DIST smallvec-1.2.0.crate 23658 BLAKE2B 7e662c79fb35e6965b409a63128da6ae6d8183992ab12f09ca7b97f15b2c7c29b1844c35cf4ff72d02d934481bebe5b2353a9c70d17d9f44a11bdcd496f2c201 SHA512 ad89826c1e999c63feb6d481e7ca3110831a08491ff8fc66825e92ad003a06b40033b365ba628c4707df06a3ac2c0d3b71e327c1caa4dc86f48150515031e52f
DIST socket2-0.3.11.crate 27725 BLAKE2B 75c2b2ba7ac8981bb7111bb7780fcaae03c670abcc5dd464c2121fe8d3c592fb19faa2b759ff8f8d9a60f954c6059ae600cbad5a6b4592a23888b5264d7e1d25 SHA512 6b29b2e4e36fcc165f658da5a2e92980713134d3b68a43b993e4f1cd049530b7c0a119918c4a9528d8d2be27cf8642fd8b6d3ebc2469ca5525045da56022a91c
+DIST socket2-0.3.18.crate 33513 BLAKE2B 83d42f6a96b9c4ae023079204a5f4a1506abc7f133c78dc4d659c8b46a6a04e5e6ac51cb4e28188d7ccb4f51cb268dad1a42adc88acfc9844deac3b00efbe48b SHA512 5820d1f2de59dad6545c356e111f6c40248763a8f432d696288c7996acbc73dbb0f3800f421a2c2ebf1e712e3db7fddc1280f8a889ecace2cb0ca2956a073514
DIST strip-ansi-escapes-0.1.0.crate 7972 BLAKE2B 39f227ba45b044bced56e944fc0ef147be93338bbfd76be5feb90e73e1faa0e0b337b6ebc6d57fe14dce11ad13e48f6db87d24c28f06b09978520c71b0e3f047 SHA512 6a8da540a7f3f820d64202024e449da7b0dc45832c4c3637cf4c8d6136098579463a1b7108c03923d2582479193e52dbf23039c4b4d0f875384066a611514a45
DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
DIST structopt-0.3.12.crate 50273 BLAKE2B 9d7493700cfed14a8f20cae73c807fd103623ec6502a76ec677ff6bdd5385a88d5d20a395394fa28be580ac2fac34aeb19a8fb0ffb8dd23a50e9551ce973e7a5 SHA512 a71f4cb68ff3cfdacc4600350e35ab040e7fb5c929f3e9649fc0d93f9ca74c6a6efc46e1aecaadf3690106cd281118a1c7c03dd7b265d532e033d437f5ec2e7d
+DIST structopt-0.3.21.crate 50761 BLAKE2B e48bbec27a34ef80f28e21d42b5acc8b2cf012e1944a6b7f6395f4bd420281e18767dacabed0ca37d94ad26e73ed201c9df06d5cd781a4c107b5741eb0880e53 SHA512 df8592f10456a5b1a7bc7b290357c069ce4eba14d2558ecd6face231e49c748a8892c31ffad000b426e8180d3e4dd607329db91f4b5617e971b2edda5bab42f1
+DIST structopt-derive-0.4.14.crate 20116 BLAKE2B cfeb48f5e4906ca24b61afc085a5dc41edc6f69c6060a1cd7e01b844b076928111e4be2f24b3cb28e7704c09bdbbb3c3a1b2f9012ae9e23cc5f795af91fb1245 SHA512 bc20dd9d10c6dc1f5975b074a63eb84b49385ad272b62d8526962e88b28cada3998c3944dedaf8560d6577871747b875cd399dfe06851472c0a1c81fced429a0
DIST structopt-derive-0.4.5.crate 19402 BLAKE2B 921dd4dcd8d19556351afa37d6ed4b1f6f3d1e847a6a33d80ff32e8fb0674d595f467cdb0d2949ffdcb95d36d6ac12db7fa37ff6a4088b9622519619ee75af1d SHA512 34205ba32a30bda80a06ca8c0cad3b17dcfdccfefec027b95769c08682736fb1462c161bbecf047ccb5f8d1ec02dcee6313dfad4fb61ef910deb1b65665b419a
DIST syn-1.0.17.crate 198158 BLAKE2B 7093cc8aab4ae2f435aa70a54c8c2b8e4f6928ea76186059942bf5c74e2ad25d73608f469cb0f1d97071a5dc2e3d048a155084bbc28647ca39032f06bcd5a3a3 SHA512 5acf5bafb32f780e08495e1e0782c170eae54baabd72c45a1d350aa41aa4ff2e5fa84b23d088fbb8522f430526e938c459087f89e3372690bde7bd0cb8c4750f
+DIST syn-1.0.55.crate 229095 BLAKE2B e46833d7f6a252dd95bde77040787f937b19a8a96e9ca2041d667ef7b7d824976d0513b49f899bffbca32c87c51458701074507e55e9a4b47a83b328db915681 SHA512 9c3e5087db4819141994470c912e5f4d09d22a8e7ea9179b575f9601ce78ed501cf76f8303237e519c17e8628764d5f547141f97cea88ce7daf4c2982b7c1399
DIST syn-mid-0.5.0.crate 14149 BLAKE2B 87170d072ab6f5ffc6d7f4dc1a08869d4e5c0f505b9130d9b5778a55e206a488b048e47895a524e117ed58b3d45907c8877c897d1d88536a06c9319826b596e7 SHA512 759e29a2ca984eddae3c091be036ad630fb985408be31d838af3bb04fe1f26a3d2b7ef597c1ffb61a72c96383cbf39d8fe83cfe0d79ed4bc3250a585156e637b
DIST tar-0.4.26.crate 42689 BLAKE2B 174baa480caac4734282003b5277004d87ccf9d5519b0adc3a02ceb0831e053483eb4cb7d21170ba792e2a573748aaa9589a261ffa8050d8bf2bc36e86451e16 SHA512 83ee187b253347068121d04242a488ac44ca6da159c6f9029f3e063b04544b7fa3ed40fed7e251692ffd73553dd369edb413f52f3b3718396451ec916eba15ab
+DIST tar-0.4.30.crate 45211 BLAKE2B 9c1e3b2b7526c48854a4c4955f1d0cd79599a55fedd4a351249761007ab2c57da98a492f457558242a25dfea306160ed1dc2fabe66e4bfca42d5793f21ce5b68 SHA512 7cc921057a8b1a38e3eb03966313ea39812ad36b5694f383c9ea69ded9813ce3ff1c7bb0f3fc596d63630279722365a7ea0cdd034bc2cfeaa3056ff83d6201b0
DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5
DIST termcolor-1.1.0.crate 17193 BLAKE2B c3a1a80269195f6bc92d141fce0885413c031980a4ad2f0f6e5a9051acfac10bad8a484362bfcaf3a60851a97d930e9602df4c00aec39431ea5a8a20d40a55c2 SHA512 41b05b047cbfdd5e3990eb36f635dc8ccf26a42bd5403d6d14a9f3c341e92b61c3b8d4d5f4fcd29071a97b3d96280ed59b4557b63a769390e2729fc82ab39702
+DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06ea72d21a62d6e77642934cca0933e10340fa84f636631cc08c76ba83ef2284b2212759129d54248e5fccb4c49 SHA512 f37b034345382cd621b1344a3fb301ca3d4d9db8b5858ac1ea82372c983229fce3c0ea8213d6b7e91291b6034affe11e2c3e593dbd95256294ce5c584b33e14c
DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
+DIST tinyvec-1.1.0.crate 39037 BLAKE2B 8033a336c2c346df70d5c6161233043a7e196a2994b62c15aa022b7053f7aee686092fc7e2db551cd1a09ee5e4a038e777120c5c33c891bb47b71c78cac60e92 SHA512 29830cec393506651b20d045c584e3df5ce5f13fdf70e866d4d6b7e97fe4f6b07ccf2a2c64ced5b092d5d963af74f826930d96d817db90bc0e4ad112a399926e
+DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
DIST toml-0.5.6.crate 54341 BLAKE2B a367d22daf6169dbdc9cd58c97f824ab76567679e1032af7a0f924ca53720d2f0989c14545d1f5d82e7f46293e3d27849459157d0cd77dc78e9d76dd6d200648 SHA512 718f5d3fde823ae5d7fbea31e3cd0eaa66f6a2bcd854093d0179dfc4328930a984deff466bcabf3c81caa323aa743c609136b8d036b80087b88e888ba7577f54
+DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
DIST typenum-1.11.2.crate 31853 BLAKE2B 1781840c29726a8df614fdcd620924b4cb5a11ad8b5af7c633e70b459b4cdcb9d6a7ccb02b08b78a0cfb3f73382d3ce9d93c56296f93ad588546aeb81a74540c SHA512 c301bc123421e47d39b50e39c42c04e35c7f12a549283d51e1942d1a8d54aa3e49e6177ba4610659d8e68a1d30fb1b2aa5af57c7bb652ab3f70ab7a28ef8b59a
+DIST typenum-1.12.0.crate 36037 BLAKE2B b5aa97daf856e4c0ecf6f543ce75c1203ea2a27b493e4e62b1a0a22fbccf79217382061833e518a5de296a00a4a5f3c0c1cc736a7fa40a947712fcddf0735ea7 SHA512 b88dac076d4102f2b1d74501cc2bedd4eb923458e060ab77b826093e3146bc48005ad7d3471921c4f5e8765f3f93f8f7c48e0eb00e2623ad439bd60bcf64d6ea
DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
DIST unicode-normalization-0.1.12.crate 91057 BLAKE2B d5b8354990e1911e093d63d9b3b3adeacb38142ac68637fbfe59c0822f34c743e348cae9f535421c12cc6a56db2112dd5ec75f96c173b1f34a68db66c8ad8dd7 SHA512 0e095a59ff965499a5d2c79bfd4826b793103bebb4d2666c09e675110a50f79d985eb29565e4c40bd8fddc30237f874324d8a24786ead697ee0698ef8f79a1b6
+DIST unicode-normalization-0.1.16.crate 92805 BLAKE2B 556b0b95b6d21f95ad99181e999d2f2a1291951db14e95cdaa4596b159323e999a135380ca0f795c996f97ffaa0c25465bfe5884bebc8903130bfd7437d4b86a SHA512 c1f83a79b0fffd2f0e1b8a579ae4e5021c4cffd74c259d065919b937bdd78b9ef83650cfd777010e7008ceb51e072777b195dd2483e1a85798a98b72f8648ead
DIST unicode-segmentation-1.6.0.crate 90703 BLAKE2B b7d63bb8b62cabc604084957aaff021df24a1291f0ebdcddc424cceefe10ad399ed53152211c3e7557e39e21255166f922256f9f8e1fb488d3bae368b49a378e SHA512 80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e
+DIST unicode-segmentation-1.7.1.crate 93066 BLAKE2B 80058a79c64972dfff897b08a24e9f18ae0fa312a50f86fc321961eeab83c5546bdbc30534315870d891e648bde1d7d77f459ec9744455bdebb94bf6e326f2ef SHA512 183ca68d456a8d53e6f255129e8fd07b87d8da23b8f18187231d6fa70dac80e4069eb6c501d45155d9f0050b6bd713964e55f0e4b25a40546c4d245a17fc8dc6
DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
+DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
+DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
DIST url-2.1.1.crate 70383 BLAKE2B c4096cb1bd50e9ca97fcdae0ee8b58957e21507607eafa8d84ff71c3df1ba52c68299609776f7baa45c93b971f8b61162fd8afd4174a5c7b66f36dc673707fa0 SHA512 a16c3a625fa85be9305f8150d5711c3e3aaa1f33753e7ecb8368b176cf3ea96f51fde74598c8ea3a5db2effc338589fd2834b297a1fba4bed967fa39e670fabb
+DIST url-2.2.0.crate 42787 BLAKE2B 115380294b06c833fe183423b26f32b7a0cb3eb7bbb53380c41b32c031d6d34ed55f11153d5ed8f3e82effc13b9571f3b27d9889fe61cf63a68ea3767ef63cc8 SHA512 5474daa20242552fc76f8e21a28f8880c011627773fed74061fdf15afd5a33cc1b09baf6583112126a1b8287ad71a22055d2bbf78a73a0d82a115db1334d05ee
DIST utf8parse-0.1.1.crate 13995 BLAKE2B 6b1de4afdb2837a76637de72f6e6a81e73aa683d8da04ebc94cf7ee3c542845d2244e721840511ee2725320f2f882722e2bea67914435131d7af1ab29291d1eb SHA512 543d4daddce8248b181deb1c3952ca15303d78616480b23af163ca6253a059b5ce9494652839a051c48a47816c3dd719465bbe5bb7930db676a16bcdac47c517
+DIST vcpkg-0.2.11.crate 12600 BLAKE2B 1c44c8df531a75f686c0497e70a72aa0c1b554c02ed256e6b08407b17066ed949f03bda42645d56e1227b50dc4c0e3865f10856605c2eadab3b74f55f005789b SHA512 d67bc244c81827165bf976808f79fd02f9149a19006898e60ff8ef11df2d72657c56bc9fc14c8f91b091075ceb23c3f96a3df81be345bb01881679eb47a0e6e9
DIST vcpkg-0.2.8.crate 11209 BLAKE2B e393dfbaabf1e47bc74fd89dc05e09f2dd9fd8b965a84f638edafcb2f5cf062005224d0c1b229394b40a3ecdf0fb34bfb3bf2c62a5d5b1016663e02d08bbcc8c SHA512 a239e969a02c8d8670178cc2be654bd12d6e6bb18be9eb70ec547212289fd2ef98859e6b3592aa6fbaf3178e0f2c27e2c8598d82990077a74896e739ae1374b9
DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
+DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
DIST version_check-0.9.1.crate 11459 BLAKE2B 72f002c00504f635b7d2d7ee7137e07ba9c182d2e41d32a51851896f6bf6742c5524b7f66946437ba581ccf80b9c9a57280dd4b02df0918569ac710511940fc1 SHA512 b9cf363169df2022a961f5bed4fb7da07513e0283a85aa69752f6ac567e942611ed2216ac61799db1a199e2bdf0fd9b994e35d4a40c6cd80cd26b97cbfe977cf
+DIST version_check-0.9.2.crate 11979 BLAKE2B 6568f8d4652fb470162bb2251be2260a6bf83e107a4f957ed91117938d5da48c42bedfb5e6622bcd6c37950805666b78984577bd8dae687dbb39e452078bd97c SHA512 b88a9d545ef103fe6d0eebe7ddcf328fc21fcb02c60828b347cfc35afd957669e652a94d880ef992450c167df3505838bc649e0d83896542fa13a149875acf26
DIST vte-0.3.3.crate 2397439 BLAKE2B 213fccf5b1f09b2d23bca57be2abec0a3580ab01864c51dd364676f5c66decc5184ef15f0e484f9a94e892f118863655f4b2ed2a340a47276b3fe7b4db901dec SHA512 5e00e8409ef21edb5aa6fbe482785fd5969dd17a6695f82328c4ae12ea8622712dc3473f33832fdfe0cc2395411431fd47842e86e35022149d5e958c4e5f8fe9
DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
+DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
DIST winapi-util-0.1.3.crate 9913 BLAKE2B d310b3fbe45bf4a25971c4396f945119efbe8f5bd497f03ae04eaee7643d9d022af69c4d511ed6e89fd10bc56d4448b8b3a624491a67a87dcab4f156c31ab104 SHA512 55ed7996a8f63e2218e74e778e47450863b19170bf1f5375a36b094c5e34bb41b19f093157e40190e105a40cd1cd9bf90e95966fc3a7de71f6b74e272723a1b8
+DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
diff --git a/dev-util/cargo-c/cargo-c-0.7.0.ebuild b/dev-util/cargo-c/cargo-c-0.7.0.ebuild
new file mode 100644
index 000000000000..e9fb83044277
--- /dev/null
+++ b/dev-util/cargo-c/cargo-c-0.7.0.ebuild
@@ -0,0 +1,176 @@
+# Copyright 2017-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.3.0
+
+EAPI=7
+
+CRATES="
+cargo-c-0.7.0+cargo-0.49
+adler-0.2.3
+aho-corasick-0.7.15
+ansi_term-0.11.0
+anyhow-1.0.36
+atty-0.2.14
+autocfg-1.0.1
+bitflags-1.2.1
+bitmaps-2.1.0
+bstr-0.2.14
+bytesize-1.0.1
+cargo-0.49.0
+cargo-platform-0.1.1
+cbindgen-0.16.0
+cc-1.0.66
+cfg-if-0.1.10
+cfg-if-1.0.0
+clap-2.33.3
+commoncrypto-0.2.0
+commoncrypto-sys-0.2.0
+core-foundation-0.9.1
+core-foundation-sys-0.8.2
+crates-io-0.31.1
+crc32fast-1.2.1
+crossbeam-utils-0.7.2
+crossbeam-utils-0.8.1
+crypto-hash-0.3.4
+curl-0.4.34
+curl-sys-0.4.39+curl-7.74.0
+env_logger-0.7.1
+filetime-0.2.13
+flate2-1.0.19
+fnv-1.0.7
+foreign-types-0.3.2
+foreign-types-shared-0.1.1
+form_urlencoded-1.0.0
+fwdansi-1.1.0
+getrandom-0.1.15
+git2-0.13.13
+git2-curl-0.14.1
+glob-0.3.0
+globset-0.4.6
+hashbrown-0.9.1
+heck-0.3.1
+hermit-abi-0.1.17
+hex-0.3.2
+hex-0.4.2
+home-0.5.3
+humantime-1.3.0
+humantime-2.0.1
+idna-0.2.0
+ignore-0.4.17
+im-rc-15.0.0
+indexmap-1.6.1
+itoa-0.4.6
+jobserver-0.1.21
+lazy_static-1.4.0
+lazycell-1.3.0
+libc-0.2.81
+libgit2-sys-0.12.15+1.1.0
+libnghttp2-sys-0.1.5+1.42.0
+libssh2-sys-0.2.20
+libz-sys-1.1.2
+log-0.4.11
+matches-0.1.8
+memchr-2.3.4
+miniz_oxide-0.4.3
+miow-0.3.6
+num_cpus-1.13.0
+opener-0.4.1
+openssl-0.10.31
+openssl-probe-0.1.2
+openssl-sys-0.9.59
+openssl-src-111.13.0+1.1.1i
+percent-encoding-2.1.0
+pkg-config-0.3.19
+ppv-lite86-0.2.10
+proc-macro-error-1.0.4
+proc-macro-error-attr-1.0.4
+proc-macro2-1.0.24
+quick-error-1.2.3
+quote-1.0.8
+rand-0.7.3
+rand_chacha-0.2.2
+rand_core-0.5.1
+rand_hc-0.2.0
+rand_xoshiro-0.4.0
+redox_syscall-0.1.57
+regex-1.4.2
+regex-syntax-0.6.21
+remove_dir_all-0.5.3
+rustc-workspace-hack-1.0.0
+rustfix-0.5.1
+ryu-1.0.5
+same-file-1.0.6
+schannel-0.1.19
+semver-0.10.0
+semver-parser-0.7.0
+serde-1.0.118
+serde_derive-1.0.118
+serde_ignored-0.1.2
+serde_json-1.0.60
+shell-escape-0.1.5
+sized-chunks-0.6.2
+socket2-0.3.18
+strip-ansi-escapes-0.1.0
+strsim-0.8.0
+structopt-0.3.21
+structopt-derive-0.4.14
+syn-1.0.55
+tar-0.4.30
+tempfile-3.1.0
+termcolor-1.1.2
+textwrap-0.11.0
+thread_local-1.0.1
+tinyvec-1.1.0
+tinyvec_macros-0.1.0
+toml-0.5.8
+typenum-1.12.0
+unicode-bidi-0.3.4
+unicode-normalization-0.1.16
+unicode-segmentation-1.7.1
+unicode-width-0.1.8
+unicode-xid-0.2.1
+url-2.2.0
+utf8parse-0.1.1
+vcpkg-0.2.11
+vec_map-0.8.2
+version_check-0.9.2
+vte-0.3.3
+walkdir-2.3.1
+wasi-0.9.0+wasi-snapshot-preview1
+winapi-0.3.9
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+inherit cargo
+
+DESCRIPTION="Helper program to build and install c-like libraries"
+# Double check the homepage as the cargo_metadata crate
+# does not provide this value so instead repository is used
+HOMEPAGE="https://github.com/lu-zero/cargo-c"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+MY_P="${PN}-0.7.0+cargo-0.49"
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="mirror"
+# License set may be more restrictive as OR is not respected
+# use cargo-license for a more accurate license picture
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="libressl"
+
+DEPEND=""
+RDEPEND="sys-libs/zlib
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ net-libs/libssh2
+ net-misc/curl[ssl]
+"
+
+src_unpack() {
+ cargo_src_unpack
+
+ tar -xf "${DISTDIR}"/"${MY_P}.crate" -C "${WORKDIR}"
+}
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index f015253b6cf6..8964c9e53deb 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1 +1,2 @@
DIST catalyst-3.0.14.tar.bz2 621178 BLAKE2B 3fa87125f14661bb77432267f03c0966eff8f71f4ef334ce0a14218f7557dee270840afb79b6735a149851ed44b1ea2f6cf59d8274d74e049246d89874aa484b SHA512 938a63a83458fa5a26a4b4e62d18086ed813aec5638a9dd363ba553cb7aeb337c3b8ba0768f3b5a658aa54f2f375a7fe067279c739073d2420c3ad3a42830830
+DIST catalyst-3.0.15.tar.bz2 621366 BLAKE2B 890381a3ed53bd28eb110a95b98fbdac83d1ee72e935919a47a5bae29f672edb1943fdf5f259572ede578c0253e55a39f25fba88109e6d9bc5af0d3e344c2db2 SHA512 ed543b995664a5786790990cb4729e84a705820d1e72eefb432c3622bb2307646a0ee753eaaafac93bda04df130e83dd6db6b59052c4bae6347b77dabd67b2d5
diff --git a/dev-util/catalyst/catalyst-3.0.14.ebuild b/dev-util/catalyst/catalyst-3.0.14.ebuild
index 1cfd566d2eb8..60ff51f6538a 100644
--- a/dev-util/catalyst/catalyst-3.0.14.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.14.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999* ]]; then
EGIT_BRANCH="master"
else
SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
fi
PYTHON_COMPAT=( python3_{6,7,8,9,10} )
@@ -39,7 +39,7 @@ RDEPEND="
amd64? ( >=sys-boot/syslinux-3.72 )
x86? ( >=sys-boot/syslinux-3.72 )
ccache? ( dev-util/ccache )
- iso? ( virtual/cdrtools )
+ iso? ( app-cdr/cdrtools )
kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
"
PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
diff --git a/dev-util/catalyst/catalyst-3.0.15.ebuild b/dev-util/catalyst/catalyst-3.0.15.ebuild
new file mode 100644
index 000000000000..60ff51f6538a
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.15.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == *9999* ]]; then
+ SRC_ECLASS="git-r3"
+ EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git"
+ EGIT_BRANCH="master"
+else
+ SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+fi
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 ${SRC_ECLASS}
+
+DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="ccache doc +iso kernel_linux system-bootloader"
+
+DEPEND="
+ app-text/asciidoc
+ >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+"
+RDEPEND="
+ >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+ >=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
+ app-arch/lbzip2
+ app-crypt/shash
+ sys-fs/dosfstools
+ !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
+ kernel_FreeBSD? ( app-arch/libarchive[xattr] )
+ amd64? ( >=sys-boot/syslinux-3.72 )
+ x86? ( >=sys-boot/syslinux-3.72 )
+ ccache? ( dev-util/ccache )
+ iso? ( app-cdr/cdrtools )
+ kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
+"
+PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
+ sys-boot/grub:2
+ amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
+ x86? ( sys-boot/grub[grub_platforms_efi-32] )
+ sys-boot/syslinux
+ sys-boot/shim )"
+
+python_prepare_all() {
+ python_setup
+ echo VERSION="${PV}" "${PYTHON}" setup.py set_version
+ VERSION="${PV}" "${PYTHON}" setup.py set_version || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ # build the man pages and docs
+ emake
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ if use doc; then
+ dodoc files/HOWTO.html files/docbook-xsl.css
+ fi
+}
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 864a5c6f2e62..375fa44ab1dc 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -41,10 +41,10 @@ RDEPEND="
app-arch/tar[xattr]
dev-vcs/git
sys-fs/dosfstools
- sys-fs/squashfs-tools-ng
+ sys-fs/squashfs-tools-ng[tools]
iso? (
- virtual/cdrtools
+ app-cdr/cdrtools
amd64? (
sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64]
diff --git a/dev-util/catfish/Manifest b/dev-util/catfish/Manifest
index efdc9cb7b776..fd17c107b494 100644
--- a/dev-util/catfish/Manifest
+++ b/dev-util/catfish/Manifest
@@ -1 +1,3 @@
DIST catfish-1.4.13.tar.bz2 221999 BLAKE2B b487947954832c691a5a1b3bd2a49e7ae1aedecbe2084b86b9ae1c8bd7c95f6d3746f80723d351bed3abac0e2396fcce134072345a908f5ba9f0dfebdd95108f SHA512 a90c695e7c1a2172ea7a5f7f1a292e95aa290693a24f3988a68f2fb4597183ff7526c98925fb3ef8517fbca508a1c3853e0de87ec023be9424d994d63e29c886
+DIST catfish-4.15.0.tar.bz2 256897 BLAKE2B 98ac6c1f5af7a48276438c08e0259eaae7f9a7d4f043a8c89b945d1d0a18e10f2faf3a210363cf46a97b4becc7492a6c1ce6b8e499b168729ce18ff80d5da828 SHA512 d2415194e3d803a99b1a0d80763db6f4e95c810d2bc679057e54105bb906ec1a0de32b64d8c0b2a36aad11d689401111c3466b1e8ad41760f4d6b67f979a81a3
+DIST catfish-4.16.0.tar.bz2 261252 BLAKE2B b495814857cb551c00dff8b92d2b24df876b1ab269bcb0ba468c791b97f3e962b875c5a687010472c5d47719475c99131d5ee6df3ce642af147b199976eb3538 SHA512 926318d3b2387386a5141347cf23b7e1505f83c48dac3804dc9c51aeeede2ef71d6d70e61bd5f608145249ccb4d3d87662bdab0c0a88dc69608b2edee55ddc19
diff --git a/dev-util/catfish/catfish-1.4.13-r1.ebuild b/dev-util/catfish/catfish-1.4.13-r1.ebuild
deleted file mode 100644
index 141b408c4cac..000000000000
--- a/dev-util/catfish/catfish-1.4.13-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot"
-HOMEPAGE="https://docs.xfce.org/apps/catfish/start"
-SRC_URI="https://archive.xfce.org/src/apps/catfish/${PV%.*}/${P}.tar.bz2"
-
-# yep, GPL-2 only
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND="
- dev-libs/gobject-introspection
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pexpect[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- x11-libs/gdk-pixbuf[introspection]
- x11-libs/gtk+:3[introspection]
- x11-libs/pango[introspection]
- virtual/freedesktop-icon-theme
-"
-BDEPEND="
- dev-python/python-distutils-extra[${PYTHON_USEDEP}]
- sys-devel/gettext
-"
-
-catfish_python_install() {
- debug-print-function ${FUNCNAME} "${@}"
-
- local args=( "${@}" )
-
- # enable compilation for the install phase.
- local -x PYTHONDONTWRITEBYTECODE=
-
- # python likes to compile any module it sees, which triggers sandbox
- # failures if some packages haven't compiled their modules yet.
- addpredict "${EPREFIX}/usr/lib/${EPYTHON}"
- addpredict "${EPREFIX}/usr/$(get_libdir)/${EPYTHON}"
- addpredict /usr/lib/pypy2.7
- addpredict /usr/lib/pypy3.6
- addpredict /usr/lib/portage/pym
- addpredict /usr/local # bug 498232
-
- if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
- # user may override --install-scripts
- # note: this is poor but distutils argv parsing is dumb
- local mydistutilsargs=( "${mydistutilsargs[@]}" )
- local scriptdir=${EPREFIX}/usr/bin
-
- # construct a list of mydistutilsargs[0] args[0] args[1]...
- local arg arg_vars
- [[ ${mydistutilsargs[@]} ]] && eval arg_vars+=(
- 'mydistutilsargs['{0..$(( ${#mydistutilsargs[@]} - 1 ))}']'
- )
- [[ ${args[@]} ]] && eval arg_vars+=(
- 'args['{0..$(( ${#args[@]} - 1 ))}']'
- )
-
- set -- "${arg_vars[@]}"
- while [[ ${@} ]]; do
- local arg_var=${1}
- shift
- local a=${!arg_var}
-
- case "${a}" in
- --install-scripts=*)
- scriptdir=${a#--install-scripts=}
- unset "${arg_var}"
- ;;
- --install-scripts)
- scriptdir=${!1}
- unset "${arg_var}" "${1}"
- shift
- ;;
- esac
- done
- fi
-
- local root=${D%/}/_${EPYTHON}
- [[ ${DISTUTILS_SINGLE_IMPL} ]] && root=${D%/}
-
- esetup.py install --root="${root}" "${args[@]}"
-
- local forbidden_package_names=( examples test tests .pytest_cache )
- local p
- for p in "${forbidden_package_names[@]}"; do
- if [[ -d ${root}$(python_get_sitedir)/${p} ]]; then
- die "Package installs '${p}' package which is forbidden and likely a bug in the build system."
- fi
- done
-
- local shopt_save=$(shopt -p nullglob)
- shopt -s nullglob
- local pypy_dirs=(
- "${root}/usr/$(get_libdir)"/pypy*/share
- "${root}/usr/lib"/pypy*/share
- )
- ${shopt_save}
-
- if [[ -n ${pypy_dirs} ]]; then
- die "Package installs 'share' in PyPy prefix, see bug #465546."
- fi
-
- if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
- _distutils-r1_wrap_scripts "${root}" "${scriptdir}"
- multibuild_merge_root "${root}" "${D%/}"
- fi
-}
-
-python_install() {
- catfish_python_install
- python_optimize
- rm -r "${ED}"/usr/share/doc/catfish || die
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/dev-util/catfish/catfish-1.4.13.ebuild b/dev-util/catfish/catfish-1.4.13.ebuild
new file mode 100644
index 000000000000..e13674989ff3
--- /dev/null
+++ b/dev-util/catfish/catfish-1.4.13.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot"
+HOMEPAGE="https://docs.xfce.org/apps/catfish/start"
+SRC_URI="https://archive.xfce.org/src/apps/catfish/${PV%.*}/${P}.tar.bz2"
+
+# yep, GPL-2 only
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+
+RDEPEND="
+ dev-libs/gobject-introspection
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-python/pexpect[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ x11-libs/gdk-pixbuf[introspection]
+ x11-libs/gtk+:3[introspection]
+ x11-libs/pango[introspection]
+ virtual/freedesktop-icon-theme
+"
+BDEPEND="
+ dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+ sys-devel/gettext
+"
+
+python_install() {
+ distutils-r1_python_install
+ python_optimize
+ rm -r "${ED}"/usr/share/doc/catfish || die
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
diff --git a/dev-util/catfish/catfish-4.15.0.ebuild b/dev-util/catfish/catfish-4.15.0.ebuild
new file mode 100644
index 000000000000..76db5889077b
--- /dev/null
+++ b/dev-util/catfish/catfish-4.15.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot"
+HOMEPAGE="https://docs.xfce.org/apps/catfish/start"
+SRC_URI="https://archive.xfce.org/src/apps/catfish/${PV%.*}/${P}.tar.bz2"
+
+# yep, GPL-2 only
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+ >=dev-libs/glib-2.42
+ dev-libs/gobject-introspection
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-python/pexpect[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ x11-libs/gdk-pixbuf[introspection]
+ >=x11-libs/gtk+-3.22:3[introspection]
+ x11-libs/pango[introspection]
+ >=xfce-base/xfconf-4.14[introspection]
+ virtual/freedesktop-icon-theme
+"
+BDEPEND="
+ dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+ sys-devel/gettext
+"
+
+python_install() {
+ distutils-r1_python_install
+ python_optimize
+ rm -r "${ED}"/usr/share/doc/catfish || die
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
diff --git a/dev-util/catfish/catfish-4.16.0.ebuild b/dev-util/catfish/catfish-4.16.0.ebuild
new file mode 100644
index 000000000000..2753ce0adeaa
--- /dev/null
+++ b/dev-util/catfish/catfish-4.16.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot"
+HOMEPAGE="https://docs.xfce.org/apps/catfish/start"
+SRC_URI="https://archive.xfce.org/src/apps/catfish/${PV%.*}/${P}.tar.bz2"
+
+# yep, GPL-2 only
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+ >=dev-libs/glib-2.42
+ dev-libs/gobject-introspection
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-python/pexpect[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ x11-libs/gdk-pixbuf[introspection]
+ >=x11-libs/gtk+-3.22:3[introspection]
+ x11-libs/pango[introspection]
+ >=xfce-base/xfconf-4.14[introspection]
+ virtual/freedesktop-icon-theme
+"
+BDEPEND="
+ dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+ sys-devel/gettext
+"
+
+python_install() {
+ distutils-r1_python_install
+ python_optimize
+ rm -r "${ED}"/usr/share/doc/catfish || die
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
diff --git a/dev-util/catfish/metadata.xml b/dev-util/catfish/metadata.xml
index e699a03d7679..2411066c7917 100644
--- a/dev-util/catfish/metadata.xml
+++ b/dev-util/catfish/metadata.xml
@@ -4,5 +4,5 @@
<maintainer type="project">
<email>xfce@gentoo.org</email>
</maintainer>
- <origin>calculatelinux-overlay</origin>
+ <origin>gentoo-staging</origin>
</pkgmetadata>
diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest
index daf0db1703c4..cd13737b5834 100644
--- a/dev-util/catkin/Manifest
+++ b/dev-util/catkin/Manifest
@@ -1 +1 @@
-DIST catkin-0.8.8.tar.gz 217566 BLAKE2B c17ed55e4f72f6645a778b5669e9b54090ea0425526d7540a6c8cf3af88ba10dfd91b927f53a83d9d2fac56e000c4c52e93216a36694475a91fabe00dd2d0168 SHA512 a90c552bebb46ade23171c85ca1cb23b295d156e731c29cd7602e544aef6231edb179d0fce52d06008d762bafd309456e0ef8976a3f67ed9ea861b905b1bb979
+DIST catkin-0.8.9.tar.gz 217743 BLAKE2B e59df77a7df04492942917377f4f3dd9e302e20fd901bbc8878d1f51879a481e15b01482db4f1d3b8d1eee360779bedb5d999663fe58f10d33c5e4f1964a3be7 SHA512 a34784d349935f5917e7d4600c5ad3e728a86d8ed235fb3be86b4dec212693a1e4209901929d284e50c112f31ada62a04a9caf9845ee06c6db2e98e79602ecd9
diff --git a/dev-util/catkin/catkin-0.8.8-r1.ebuild b/dev-util/catkin/catkin-0.8.9.ebuild
index 1b252b84374f..16bf88813d83 100644
--- a/dev-util/catkin/catkin-0.8.8-r1.ebuild
+++ b/dev-util/catkin/catkin-0.8.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch b/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch
index 6ad761f8421a..52f183cc8551 100644
--- a/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch
+++ b/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch
@@ -1,24 +1,24 @@
Author: Eric Timmons
https://bugs.gentoo.org/show_bug.cgi?id=586104
-Index: catkin-0.7.17/cmake/templates/_setup_util.py.in
+Index: catkin-0.8.9/cmake/templates/_setup_util.py.in
===================================================================
---- catkin-0.7.17.orig/cmake/templates/_setup_util.py.in
-+++ catkin-0.7.17/cmake/templates/_setup_util.py.in
-@@ -264,7 +264,7 @@ if __name__ == '__main__':
+--- catkin-0.8.9.orig/cmake/templates/_setup_util.py.in
++++ catkin-0.8.9/cmake/templates/_setup_util.py.in
+@@ -268,7 +268,7 @@ if __name__ == '__main__':
if not args.local:
# environment at generation time
-- CMAKE_PREFIX_PATH = '@CMAKE_PREFIX_PATH_AS_IS@'.split(';')
-+ CMAKE_PREFIX_PATH = '@CATKIN_PREFIX_PATH@;@CMAKE_PREFIX_PATH_AS_IS@'.split(';')
+- CMAKE_PREFIX_PATH = r'@CMAKE_PREFIX_PATH_AS_IS@'.split(';')
++ CMAKE_PREFIX_PATH = r'@CATKIN_PREFIX_PATH@;@CMAKE_PREFIX_PATH_AS_IS@'.split(';')
else:
# don't consider any other prefix path than this one
CMAKE_PREFIX_PATH = []
-Index: catkin-0.7.17/python/catkin/builder.py
+Index: catkin-0.8.9/python/catkin/builder.py
===================================================================
---- catkin-0.7.17.orig/python/catkin/builder.py
-+++ catkin-0.7.17/python/catkin/builder.py
-@@ -1143,6 +1143,7 @@ _CATKIN_SETUP_DIR= . "{0}/setup.sh"
+--- catkin-0.8.9.orig/python/catkin/builder.py
++++ catkin-0.8.9/python/catkin/builder.py
+@@ -1164,6 +1164,7 @@ _CATKIN_SETUP_DIR= . "{0}/setup.sh"
'CATKIN_LIB_ENVIRONMENT_PATHS': "'lib'",
'CATKIN_PKGCONFIG_ENVIRONMENT_PATHS': "os.path.join('lib', 'pkgconfig')",
'CMAKE_PREFIX_PATH_AS_IS': ';'.join(os.environ['CMAKE_PREFIX_PATH'].split(os.pathsep)),
@@ -26,10 +26,10 @@ Index: catkin-0.7.17/python/catkin/builder.py
'PYTHON_EXECUTABLE': sys.executable,
'PYTHON_INSTALL_DIR': get_python_install_dir(),
}
-Index: catkin-0.7.17/test/unit_tests/test_setup_util.py
+Index: catkin-0.8.9/test/unit_tests/test_setup_util.py
===================================================================
---- catkin-0.7.17.orig/test/unit_tests/test_setup_util.py
-+++ catkin-0.7.17/test/unit_tests/test_setup_util.py
+--- catkin-0.8.9.orig/test/unit_tests/test_setup_util.py
++++ catkin-0.8.9/test/unit_tests/test_setup_util.py
@@ -14,6 +14,7 @@ data = configure_file(os.path.join(os.pa
'PYTHON_EXECUTABLE': sys.executable,
'PYTHON_INSTALL_DIR': 'pythonX.Y/packages',
diff --git a/dev-util/ccache/ccache-3.7.12.ebuild b/dev-util/ccache/ccache-3.7.12.ebuild
index 5dfae60d7ef7..5300a828d02a 100644
--- a/dev-util/ccache/ccache-3.7.12.ebuild
+++ b/dev-util/ccache/ccache-3.7.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
IUSE="test"
DEPEND="app-arch/xz-utils
diff --git a/dev-util/ccache/ccache-4.1.ebuild b/dev-util/ccache/ccache-4.1.ebuild
index 6e6b4021efcc..3bee41803c9c 100644
--- a/dev-util/ccache/ccache-4.1.ebuild
+++ b/dev-util/ccache/ccache-4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
LICENSE="GPL-3 LGPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="test"
DEPEND=""
@@ -46,6 +46,14 @@ src_prepare() {
-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
"${FILESDIR}"/ccache-config-3 > ccache-config || die
+ # Avoid non-ASCII double quotes as they fail on
+ # LANG=fr_FR.iso885915@euro: #762814.
+ sed \
+ -e 's/\xE2\x80\x99/'\''/g' \
+ -e 's/\xE2\x80\x9C/"/g' \
+ -e 's/\xE2\x80\x9D/"/g' \
+ -i doc/MANUAL.adoc || die
+
# mainly used in tests
tc-export CC OBJDUMP
}
diff --git a/dev-util/ccls/Manifest b/dev-util/ccls/Manifest
index c9a06d0cf736..883a7a2c3ab2 100644
--- a/dev-util/ccls/Manifest
+++ b/dev-util/ccls/Manifest
@@ -1,2 +1 @@
-DIST ccls-0.20190823.6.tar.gz 158158 BLAKE2B f2957b310f1bddc17a498191d315327adbeed72ecf3a60f2abde2fe1af8341246670d779807dcfaf98217f648d4fbe5914e4f64108cfe7a3f68e62b00e96dcaa SHA512 c6df96e304f5b7381c67eda4c1bd05873a85fb0d0983b3abcc507987a402860aa6660079a0e7b125f5cda22047da936239480aa0b604cd2598f84a4b9e9c3bdd
-DIST ccls-0.20201025.tar.gz 160524 BLAKE2B e4819b465a862195921ac33bdfd844b1921887a4f7211b7d826b8e8e49394dcb598681ba57b5f8c2eb35d5910e3689619ecaaa1fe080d8088937b0eecc2487c9 SHA512 485a42671265a0f76e87f456c6c96137a2f17c60e0c1f45a1979342c9b9fd373303a017126c8bc4649b75225cec7bb3c759a78fecc42f7403e913c6121d1e948
+DIST ccls-0.20201219.tar.gz 160445 BLAKE2B 8d3f536ec13673e7251f09de992f24d88066787442940e3e0913ee201111e97c0d145d8a57b4fcdfeaa886fd5bf5e5be621ef54e307cd08cca8e516103a9c573 SHA512 fba8cc1ec50e55939b2deb167d9d32e946ccab4b322766191a787719b47a39e887afad26b7364dfb40c4a4f2522964af76fc7f51a5d84c10d2b0125f07a19c5e
diff --git a/dev-util/ccls/ccls-0.20190823.6.ebuild b/dev-util/ccls/ccls-0.20190823.6.ebuild
deleted file mode 100644
index 791e2522eef7..000000000000
--- a/dev-util/ccls/ccls-0.20190823.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://github.com/MaskRay/${PN}"
-
-if [[ ${PV} = 9999* ]]; then
- GIT_ECLASS="git-r3"
-fi
-
-inherit cmake ${GIT_ECLASS}
-
-DESCRIPTION="C/C++/ObjC language server"
-HOMEPAGE="https://github.com/MaskRay/ccls"
-
-if [[ ${PV} == *9999 ]] ; then
- SRC_URI=""
-else
- SRC_URI="https://github.com/MaskRay/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="
- dev-libs/rapidjson
- sys-devel/clang:=
- sys-devel/llvm:=
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-cmake-support-CLANG_LINK_CLANG_DYLIB.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DUSE_SYSTEM_RAPIDJSON=ON
- -DCLANG_LINK_CLANG_DYLIB=1
- )
- cmake_src_configure
-}
diff --git a/dev-util/ccls/ccls-0.20201025.ebuild b/dev-util/ccls/ccls-0.20201219.ebuild
index ac5830184a31..377cc36c8068 100644
--- a/dev-util/ccls/ccls-0.20201025.ebuild
+++ b/dev-util/ccls/ccls-0.20201219.ebuild
@@ -34,6 +34,7 @@ RDEPEND="${DEPEND}"
src_configure() {
local mycmakeargs=(
+ -DCCLS_VERSION=${PV}
-DUSE_SYSTEM_RAPIDJSON=ON
-DCLANG_LINK_CLANG_DYLIB=1
)
diff --git a/dev-util/ccls/ccls-9999.ebuild b/dev-util/ccls/ccls-9999.ebuild
index ac5830184a31..377cc36c8068 100644
--- a/dev-util/ccls/ccls-9999.ebuild
+++ b/dev-util/ccls/ccls-9999.ebuild
@@ -34,6 +34,7 @@ RDEPEND="${DEPEND}"
src_configure() {
local mycmakeargs=(
+ -DCCLS_VERSION=${PV}
-DUSE_SYSTEM_RAPIDJSON=ON
-DCLANG_LINK_CLANG_DYLIB=1
)
diff --git a/dev-util/cgvg/cgvg-1.6.3.ebuild b/dev-util/cgvg/cgvg-1.6.3.ebuild
index 5c0f5bfbeacc..b5d3fa188d9f 100644
--- a/dev-util/cgvg/cgvg-1.6.3.ebuild
+++ b/dev-util/cgvg/cgvg-1.6.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://uzix.org/cgvg/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
RDEPEND="dev-lang/perl"
DEPEND="${RDEPEND}"
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index cfbcc2c6a81b..dd2b0aa0d453 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -3,3 +3,4 @@ DIST devscripts_2.20.1.tar.xz 854932 BLAKE2B b9523b2882625b66c7972db7c10f7d3f605
DIST devscripts_2.20.2.tar.xz 854948 BLAKE2B ca36f2d8d4f3d975479134d02ee4c035f7f32e087be523560c2c06d7625047fcf78d0428d1e4addcfa38a299befdd23b88ab3fbbef2028f67f8b7c9f8851c29f SHA512 d9147604a718582a19c036a040c62612427163146048dbf9e3665545072e8132d08f51dccfd3f0a01453c0405a0326dad8f83afd10270eec5c69fa0612cb8510
DIST devscripts_2.20.3.tar.xz 859612 BLAKE2B 074905e621234c60e26a014831a021b51f5f8fbdac4d6fa3a17aa98f994b4c171404a2326f5b00565f365469b41f1c7e5f03b6efa29f809b51bbabde209cafc2 SHA512 6d86deeecff82fc16df7d978678f5b88293164688078bf0732a7e6b844cf8845868be31c107518cf43b8dbcbadcd12a9691585f5725abd397f63ff9456fbdd8f
DIST devscripts_2.20.4.tar.xz 860604 BLAKE2B 05c486ed024964ec03f9e5396e739389010a2c51a4d01be14b4959aa86bd09ca426bbfbfa7657c87e54aec8497fbfc90064073310fb1af916b32142ff63d3137 SHA512 49e9ae38ca3682f399a17f2108a7ee15198dc955d8c7c4c1b043456c19cb35b47b6116de9a2cfaccbdd7560e79426ca0953674e5a89ac226d21af2c1cf847e5c
+DIST devscripts_2.20.5.tar.xz 881976 BLAKE2B 3d4079d3268b3b9bfacdd0a4afcfee5390bdbf4660038306611d9c24e7b5c6453eff5f24d938c9764a17336475cd60615919adaa11dcf47495d930cd4b3b4e09 SHA512 fbd372a62758e3d2872f37bfd93d9b169d0cc745719057078378949c4d01b4fb27830ae501fe45b06b30a869e8afc853d8477419bb2f46d7fd62749f54981ec0
diff --git a/dev-util/checkbashisms/checkbashisms-2.20.4.ebuild b/dev-util/checkbashisms/checkbashisms-2.20.4.ebuild
index 1d567b48dc59..a2183decd385 100644
--- a/dev-util/checkbashisms/checkbashisms-2.20.4.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.20.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
# Requires python packages to check tools we don't need anyway
diff --git a/dev-util/checkbashisms/checkbashisms-2.20.5.ebuild b/dev-util/checkbashisms/checkbashisms-2.20.5.ebuild
new file mode 100644
index 000000000000..1d567b48dc59
--- /dev/null
+++ b/dev-util/checkbashisms/checkbashisms-2.20.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="devscripts"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
+HOMEPAGE="https://packages.debian.org/devscripts https://salsa.debian.org/debian/devscripts"
+SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Requires python packages to check tools we don't need anyway
+RESTRICT="test"
+
+RDEPEND="dev-lang/perl
+ virtual/perl-Getopt-Long"
+
+S="${WORKDIR}/${MY_P}/scripts"
+
+src_prepare() {
+ default
+
+ sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
+}
+
+src_compile() { :; }
+
+src_install() {
+ newbin ${PN}.pl ${PN}
+ doman ${PN}.1
+}
diff --git a/dev-util/checkstyle/checkstyle-7.2.ebuild b/dev-util/checkstyle/checkstyle-7.2.ebuild
index 0036872cb55c..9d19d64351b2 100644
--- a/dev-util/checkstyle/checkstyle-7.2.ebuild
+++ b/dev-util/checkstyle/checkstyle-7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/checkstyle/checkstyle"
SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
CP_DEPEND="
dev-java/ant-core:0
diff --git a/dev-util/clazy/Manifest b/dev-util/clazy/Manifest
index fe8cc3259b01..25cb2b700b9f 100644
--- a/dev-util/clazy/Manifest
+++ b/dev-util/clazy/Manifest
@@ -1,2 +1,2 @@
-DIST clazy-1.7.tar.xz 371788 BLAKE2B 281acd0164cf76510e46883fff7269aa77e4b815d6d0ca5a54307165ff8f4355e095b82e0c41cdb0af391f4a15048a8d64b2a2a7b9dabc042b36ba1a380405cc SHA512 3dba993140f3d69aac8d9cf3fa49db990185928647193220b689773bbca70f9fd9ee7fc52022e6029b3c0c81800301a593bd79edee7e1fa6c5884782d390ced6
DIST clazy-1.8.tar.xz 392328 BLAKE2B 9ece9d279b2bd7e4c15ad35d9943636a107abd47cf0ed0b20db305b1684610fb84c6f9c7f606f159f0b5a48b881506796f0addf12246f2e9929a08225fcc5c74 SHA512 c43a393721a5235ddcd653f9c322e0a215f86add3b1ce42f849677c108cd21209693c6e8f225171db88032c75596722109ee01bc53db4af90fe7652f27c1eba5
+DIST clazy-1.9.tar.xz 394856 BLAKE2B 641ca46a31475cf7bd03ba921e390cb2712362dc97b960a519e05c47049927f805d3ef6f1c756b96d3483e8f4b75e2dc41a2419a462ed2e45cbd08c88c07f933 SHA512 2e8bec44a027366263de23c50d14192e310fd38fa2b369afb21413da9cb78da9882b2153daf1784c4c9076cc62e2867b5211c75ff9a1eabcb583e405f20f5912
diff --git a/dev-util/clazy/clazy-1.8.ebuild b/dev-util/clazy/clazy-1.8.ebuild
index fdc21c991d41..9cba0ac13609 100644
--- a/dev-util/clazy/clazy-1.8.ebuild
+++ b/dev-util/clazy/clazy-1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ S="${WORKDIR}"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE=""
RDEPEND="
diff --git a/dev-util/clazy/clazy-1.7-r1.ebuild b/dev-util/clazy/clazy-1.9.ebuild
index ffa163aa4fac..e9b6e64599a7 100644
--- a/dev-util/clazy/clazy-1.7-r1.ebuild
+++ b/dev-util/clazy/clazy-1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE=""
RDEPEND="
@@ -20,11 +20,6 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
-PATCHES=(
- "${FILESDIR}"/${P}-gnuinstalldirs.patch
- "${FILESDIR}"/${P}-llvm11-{1,2}.patch
-)
-
src_prepare() {
cmake_src_prepare
diff --git a/dev-util/clazy/files/clazy-1.7-gnuinstalldirs.patch b/dev-util/clazy/files/clazy-1.7-gnuinstalldirs.patch
deleted file mode 100644
index c58093a2db25..000000000000
--- a/dev-util/clazy/files/clazy-1.7-gnuinstalldirs.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 111c6971cd791f336eaaa8ef142c8212a7e65a3a Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 30 Jun 2020 12:56:56 +0200
-Subject: [PATCH] Use more GNUInstallDirs (doc, man)
-
----
- CMakeLists.txt | 21 ++++++++-------------
- docs/man/CMakeLists.txt | 2 +-
- 2 files changed, 9 insertions(+), 14 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c55103b..2532a8d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -15,7 +15,7 @@ endif()
-
- include(FeatureSummary)
- include(GenerateExportHeader)
--include("GNUInstallDirs")
-+include(GNUInstallDirs)
-
- # Version setup
- set(CLAZY_VERSION_MAJOR "1")
-@@ -184,8 +184,6 @@ if (NOT CLAZY_BUILD_WITH_CLANG)
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
- )
-
-- set(SHARE_INSTALL_DIR ${CMAKE_INSTALL_DATAROOTDIR} CACHE STRING "Share directory name")
--
- if(NOT WIN32)
- if(APPLE)
- find_program(READLINK_CMD greadlink)
-@@ -200,27 +198,24 @@ if (NOT CLAZY_BUILD_WITH_CLANG)
- configure_file(${CMAKE_CURRENT_LIST_DIR}/clazy.cmake ${CMAKE_BINARY_DIR}/clazy @ONLY)
- install(PROGRAMS ${CMAKE_BINARY_DIR}/clazy DESTINATION bin)
- else()
-- install(PROGRAMS ${CMAKE_CURRENT_LIST_DIR}/clazy.bat DESTINATION bin)
-+ install(PROGRAMS ${CMAKE_CURRENT_LIST_DIR}/clazy.bat DESTINATION ${CMAKE_INSTALL_BINDIR})
- if(MSVC)
-- install(PROGRAMS ${CMAKE_CURRENT_LIST_DIR}/clazy-cl.bat DESTINATION bin)
-+ install(PROGRAMS ${CMAKE_CURRENT_LIST_DIR}/clazy-cl.bat DESTINATION ${CMAKE_INSTALL_BINDIR})
- endif()
- endif()
-
- # Install the explanation README's
-- set(DOC_INSTALL_DIR ${SHARE_INSTALL_DIR}/doc/clazy)
--
- include(${CMAKE_CURRENT_LIST_DIR}/readmes.cmake)
-
-- install(FILES ${README_LEVEL0_FILES} DESTINATION ${DOC_INSTALL_DIR}/level0)
-- install(FILES ${README_LEVEL1_FILES} DESTINATION ${DOC_INSTALL_DIR}/level1)
-- install(FILES ${README_LEVEL2_FILES} DESTINATION ${DOC_INSTALL_DIR}/level2)
-- install(FILES ${README_manuallevel_FILES} DESTINATION ${DOC_INSTALL_DIR}/manuallevel)
-+ install(FILES ${README_LEVEL0_FILES} DESTINATION ${CMAKE_INSTALL_DOCDIR}/level0)
-+ install(FILES ${README_LEVEL1_FILES} DESTINATION ${CMAKE_INSTALL_DOCDIR}/level1)
-+ install(FILES ${README_LEVEL2_FILES} DESTINATION ${CMAKE_INSTALL_DOCDIR}/level2)
-+ install(FILES ${README_manuallevel_FILES} DESTINATION ${CMAKE_INSTALL_DOCDIR}/manuallevel)
-
- # Install more doc files
-- install(FILES README.md COPYING-LGPL2.txt checks.json DESTINATION ${DOC_INSTALL_DIR})
-+ install(FILES README.md COPYING-LGPL2.txt checks.json DESTINATION ${CMAKE_INSTALL_DOCDIR})
-
- # Build docs
-- set(MAN_INSTALL_DIR "${SHARE_INSTALL_DIR}/man/man1")
- add_subdirectory(docs)
-
- # rpath
-diff --git a/docs/man/CMakeLists.txt b/docs/man/CMakeLists.txt
-index 5d86813..d9b3937 100644
---- a/docs/man/CMakeLists.txt
-+++ b/docs/man/CMakeLists.txt
-@@ -14,6 +14,6 @@ if(UNIX)
- )
- add_custom_target(man ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/clazy.1)
-
-- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/clazy.1 DESTINATION ${MAN_INSTALL_DIR})
-+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/clazy.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
- endif()
- endif()
---
-2.27.0
-
diff --git a/dev-util/clazy/files/clazy-1.7-llvm11-1.patch b/dev-util/clazy/files/clazy-1.7-llvm11-1.patch
deleted file mode 100644
index 7b25b340a5c2..000000000000
--- a/dev-util/clazy/files/clazy-1.7-llvm11-1.patch
+++ /dev/null
@@ -1,343 +0,0 @@
-From 30d6a2b64f5a05722fdc5d8e3754dbf13425cd62 Mon Sep 17 00:00:00 2001
-From: Egor Gabov <egor.gabov@waveaccess.ru>
-Date: Thu, 4 Jun 2020 17:10:21 +0300
-Subject: [PATCH] updated for compatibility with LLVM 10
-
-In LLVM 10 llvm::StringRef operator std::string() is marked as explicit.
-In this commit all implicit conversion from llvm::StringRef to
-std::string are changed by explicit.
-Also included header file clang/Basic/FileManager.h in src/MiniDumper
-because without this header, class clang::FileEntry in incomplete class
----
- src/FixItExporter.cpp | 5 +++--
- src/MiniAstDumper.cpp | 1 +
- src/Utils.cpp | 2 +-
- src/checkbase.cpp | 2 +-
- src/checks/detachingbase.cpp | 2 +-
- src/checks/level0/qenums.cpp | 2 +-
- src/checks/level0/qt-macros.cpp | 4 ++--
- src/checks/level0/unused-non-trivial-variable.cpp | 2 +-
- src/checks/level1/detaching-temporary.cpp | 2 +-
- src/checks/level1/non-pod-global-static.cpp | 2 +-
- src/checks/level1/qproperty-without-notify.cpp | 2 +-
- src/checks/level2/missing-typeinfo.cpp | 2 +-
- src/checks/level2/old-style-connect.cpp | 6 +++---
- src/checks/level2/rule-of-three.cpp | 2 +-
- src/checks/manuallevel/ifndef-define-typo.cpp | 6 +++---
- src/checks/manuallevel/qproperty-type-mismatch.cpp | 2 +-
- src/checks/manuallevel/qrequiredresult-candidates.cpp | 2 +-
- src/checks/manuallevel/qt-keywords.cpp | 4 ++--
- src/checks/manuallevel/reserve-candidates.cpp | 3 ++-
- 19 files changed, 28 insertions(+), 25 deletions(-)
-
-diff --git a/src/FixItExporter.cpp b/src/FixItExporter.cpp
-index f3af2e5..44240cf 100644
---- a/src/FixItExporter.cpp
-+++ b/src/FixItExporter.cpp
-@@ -68,7 +68,7 @@ void FixItExporter::BeginSourceFile(const LangOptions &LangOpts, const Preproces
-
- const auto id = SourceMgr.getMainFileID();
- const auto entry = SourceMgr.getFileEntryForID(id);
-- getTuDiag().MainSourceFile = entry->getName();
-+ getTuDiag().MainSourceFile = static_cast<std::string>(entry->getName());
- }
-
- bool FixItExporter::IncludeInDiagnosticCounts() const
-@@ -89,7 +89,8 @@ tooling::Diagnostic FixItExporter::ConvertDiagnostic(const Diagnostic &Info)
- // TODO: This returns an empty string: DiagEngine->getDiagnosticIDs()->getWarningOptionForDiag(Info.getID());
- // HACK: capture it at the end of the message: Message text [check-name]
-
-- std::string checkName = DiagEngine.getDiagnosticIDs()->getWarningOptionForDiag(Info.getID());
-+ std::string checkName =
-+ static_cast<std::string>(DiagEngine.getDiagnosticIDs()->getWarningOptionForDiag(Info.getID()));
- std::string messageText;
-
- if (checkName.empty()) {
-diff --git a/src/MiniAstDumper.cpp b/src/MiniAstDumper.cpp
-index 4766174..6124e6e 100644
---- a/src/MiniAstDumper.cpp
-+++ b/src/MiniAstDumper.cpp
-@@ -24,6 +24,7 @@
-
- #include <clang/Frontend/CompilerInstance.h>
- #include <clang/Frontend/FrontendPluginRegistry.h>
-+#include <clang/Basic/FileManager.h>
-
- using namespace clang;
- using namespace std;
-diff --git a/src/Utils.cpp b/src/Utils.cpp
-index 001ced9..b0812fe 100644
---- a/src/Utils.cpp
-+++ b/src/Utils.cpp
-@@ -878,7 +878,7 @@ string Utils::filenameForLoc(SourceLocation loc, const clang::SourceManager &sm)
- if (loc.isMacroID())
- loc = sm.getExpansionLoc(loc);
-
-- const string filename = sm.getFilename(loc);
-+ const string filename = static_cast<std::string>(sm.getFilename(loc));
- auto splitted = clazy::splitString(filename, '/');
- if (splitted.empty())
- return {};
-diff --git a/src/checkbase.cpp b/src/checkbase.cpp
-index 8b40e19..22a426c 100644
---- a/src/checkbase.cpp
-+++ b/src/checkbase.cpp
-@@ -188,7 +188,7 @@ bool CheckBase::shouldIgnoreFile(SourceLocation loc) const
- if (!loc.isValid())
- return true;
-
-- string filename = sm().getFilename(loc);
-+ string filename = static_cast<std::string>(sm().getFilename(loc));
-
- return clazy::any_of(m_filesToIgnore, [filename](const std::string &ignored) {
- return clazy::contains(filename, ignored);
-diff --git a/src/checks/detachingbase.cpp b/src/checks/detachingbase.cpp
-index 70311f4..1b094ee 100644
---- a/src/checks/detachingbase.cpp
-+++ b/src/checks/detachingbase.cpp
-@@ -57,7 +57,7 @@ bool DetachingBase::isDetachingMethod(CXXMethodDecl *method, DetachingMethodType
-
- const std::unordered_map<string, std::vector<StringRef>> &methodsByType = detachingMethodType == DetachingMethod ? clazy::detachingMethods()
- : clazy::detachingMethodsWithConstCounterParts();
-- auto it = methodsByType.find(className);
-+ auto it = methodsByType.find(static_cast<std::string>(className));
- if (it != methodsByType.cend()) {
- const auto &methods = it->second;
- if (clazy::contains(methods, clazy::name(method)))
-diff --git a/src/checks/level0/qenums.cpp b/src/checks/level0/qenums.cpp
-index 00075b5..db8910f 100644
---- a/src/checks/level0/qenums.cpp
-+++ b/src/checks/level0/qenums.cpp
-@@ -59,7 +59,7 @@ void QEnums::VisitMacroExpands(const Token &MacroNameTok, const SourceRange &ran
- // We simply check if :: is present because it's very cumbersome to to check for different classes when dealing with the pre-processor
-
- CharSourceRange crange = Lexer::getAsCharRange(range, sm(), lo());
-- string text = Lexer::getSourceText(crange, sm(), lo());
-+ string text = static_cast<std::string>(Lexer::getSourceText(crange, sm(), lo()));
- if (clazy::contains(text, "::"))
- return;
- }
-diff --git a/src/checks/level0/qt-macros.cpp b/src/checks/level0/qt-macros.cpp
-index d3a587c..ab8e9f5 100644
---- a/src/checks/level0/qt-macros.cpp
-+++ b/src/checks/level0/qt-macros.cpp
-@@ -44,7 +44,7 @@ void QtMacros::VisitMacroDefined(const Token &MacroNameTok)
- return;
-
- IdentifierInfo *ii = MacroNameTok.getIdentifierInfo();
-- if (ii && clazy::startsWith(ii->getName(), "Q_OS_"))
-+ if (ii && clazy::startsWith(static_cast<std::string>(ii->getName()), "Q_OS_"))
- m_OSMacroExists = true;
- }
-
-@@ -58,7 +58,7 @@ void QtMacros::checkIfDef(const Token &macroNameTok, SourceLocation Loc)
- if (preProcessorVisitor && preProcessorVisitor->qtVersion() < 51204 && ii->getName() == "Q_OS_WINDOWS") {
- // Q_OS_WINDOWS was introduced in 5.12.4
- emitWarning(Loc, "Q_OS_WINDOWS was only introduced in Qt 5.12.4, use Q_OS_WIN instead");
-- } else if (!m_OSMacroExists && clazy::startsWith(ii->getName(), "Q_OS_")) {
-+ } else if (!m_OSMacroExists && clazy::startsWith(static_cast<std::string>(ii->getName()), "Q_OS_")) {
- emitWarning(Loc, "Include qglobal.h before testing Q_OS_ macros");
- }
- }
-diff --git a/src/checks/level0/unused-non-trivial-variable.cpp b/src/checks/level0/unused-non-trivial-variable.cpp
-index 4e4b830..93815f2 100644
---- a/src/checks/level0/unused-non-trivial-variable.cpp
-+++ b/src/checks/level0/unused-non-trivial-variable.cpp
-@@ -91,7 +91,7 @@ bool UnusedNonTrivialVariable::isUninterestingType(const CXXRecordDecl *record)
- static const vector<StringRef> blacklistedTemplates = { "QScopedPointer", "QSetValueOnDestroy", "QScopedValueRollback" };
- StringRef className = clazy::name(record);
- for (StringRef templateName : blacklistedTemplates) {
-- if (clazy::startsWith(className, templateName))
-+ if (clazy::startsWith(static_cast<std::string>(className), static_cast<std::string>(templateName)))
- return true;
- }
-
-diff --git a/src/checks/level1/detaching-temporary.cpp b/src/checks/level1/detaching-temporary.cpp
-index fedfc81..60c7553 100644
---- a/src/checks/level1/detaching-temporary.cpp
-+++ b/src/checks/level1/detaching-temporary.cpp
-@@ -140,7 +140,7 @@ void DetachingTemporary::VisitStmt(clang::Stmt *stm)
- StringRef className = clazy::name(classDecl);
-
- const std::unordered_map<string, std::vector<StringRef>> &methodsByType = clazy::detachingMethods();
-- auto it = methodsByType.find(className);
-+ auto it = methodsByType.find(static_cast<std::string>(className));
- auto it2 = m_writeMethodsByType.find(className);
-
- std::vector<StringRef> allowedFunctions;
-diff --git a/src/checks/level1/non-pod-global-static.cpp b/src/checks/level1/non-pod-global-static.cpp
-index 5879bff..433b5c5 100644
---- a/src/checks/level1/non-pod-global-static.cpp
-+++ b/src/checks/level1/non-pod-global-static.cpp
-@@ -74,7 +74,7 @@ void NonPodGlobalStatic::VisitStmt(clang::Stmt *stm)
- const SourceLocation declStart = clazy::getLocStart(varDecl);
-
- if (declStart.isMacroID()) {
-- auto macroName = Lexer::getImmediateMacroName(declStart, sm(), lo());
-+ auto macroName = static_cast<std::string>(Lexer::getImmediateMacroName(declStart, sm(), lo()));
- if (clazy::startsWithAny(macroName, { "Q_IMPORT_PLUGIN", "Q_CONSTRUCTOR_FUNCTION", "Q_DESTRUCTOR_FUNCTION"})) // Don't warn on these
- return;
- }
-diff --git a/src/checks/level1/qproperty-without-notify.cpp b/src/checks/level1/qproperty-without-notify.cpp
-index e1d6db4..3af9fee 100644
---- a/src/checks/level1/qproperty-without-notify.cpp
-+++ b/src/checks/level1/qproperty-without-notify.cpp
-@@ -69,7 +69,7 @@ void QPropertyWithoutNotify::VisitMacroExpands(const clang::Token &MacroNameTok,
- return;
- CharSourceRange crange = Lexer::getAsCharRange(range, sm(), lo());
-
-- string text = Lexer::getSourceText(crange, sm(), lo());
-+ string text = static_cast<std::string>(Lexer::getSourceText(crange, sm(), lo()));
- if (text.back() == ')')
- text.pop_back();
-
-diff --git a/src/checks/level2/missing-typeinfo.cpp b/src/checks/level2/missing-typeinfo.cpp
-index 98df2cd..03b44e0 100644
---- a/src/checks/level2/missing-typeinfo.cpp
-+++ b/src/checks/level2/missing-typeinfo.cpp
-@@ -74,7 +74,7 @@ void MissingTypeInfo::VisitDecl(clang::Decl *decl)
- if (sm().isInSystemHeader(clazy::getLocStart(record)))
- return;
-
-- std::string typeName = clazy::name(record);
-+ std::string typeName = static_cast<std::string>(clazy::name(record));
- if (typeName == "QPair") // QPair doesn't use Q_DECLARE_TYPEINFO, but rather a explicit QTypeInfo.
- return;
-
-diff --git a/src/checks/level2/old-style-connect.cpp b/src/checks/level2/old-style-connect.cpp
-index 0fe68c1..396cb70 100644
---- a/src/checks/level2/old-style-connect.cpp
-+++ b/src/checks/level2/old-style-connect.cpp
-@@ -274,7 +274,7 @@ void OldStyleConnect::VisitMacroExpands(const Token &macroNameTok, const SourceR
- return;
-
- auto charRange = Lexer::getAsCharRange(range, sm(), lo());
-- const string text = Lexer::getSourceText(charRange, sm(), lo());
-+ const string text = static_cast<std::string>(Lexer::getSourceText(charRange, sm(), lo()));
-
- static regex rx(R"(Q_PRIVATE_SLOT\s*\((.*)\s*,\s*.*\s+(.*)\(.*)");
- smatch match;
-@@ -293,7 +293,7 @@ string OldStyleConnect::signalOrSlotNameFromMacro(SourceLocation macroLoc)
- CharSourceRange expansionRange = clazy::getImmediateExpansionRange(macroLoc, sm());
- SourceRange range = SourceRange(expansionRange.getBegin(), expansionRange.getEnd());
- auto charRange = Lexer::getAsCharRange(range, sm(), lo());
-- const string text = Lexer::getSourceText(charRange, sm(), lo());
-+ const string text = static_cast<std::string>(Lexer::getSourceText(charRange, sm(), lo()));
-
- static regex rx(R"(\s*(SIGNAL|SLOT)\s*\(\s*(.+)\s*\(.*)");
-
-@@ -315,7 +315,7 @@ bool OldStyleConnect::isSignalOrSlot(SourceLocation loc, string &macroName) cons
- if (!loc.isMacroID() || loc.isInvalid())
- return false;
-
-- macroName = Lexer::getImmediateMacroName(loc, sm(), lo());
-+ macroName = static_cast<std::string>(Lexer::getImmediateMacroName(loc, sm(), lo()));
- return macroName == "SIGNAL" || macroName == "SLOT";
- }
-
-diff --git a/src/checks/level2/rule-of-three.cpp b/src/checks/level2/rule-of-three.cpp
-index 8db55d5..7583fcc 100644
---- a/src/checks/level2/rule-of-three.cpp
-+++ b/src/checks/level2/rule-of-three.cpp
-@@ -140,7 +140,7 @@ void RuleOfThree::VisitDecl(clang::Decl *decl)
-
- const string className = record->getNameAsString();
- const string classQualifiedName = record->getQualifiedNameAsString();
-- const string filename = sm().getFilename(recordStart);
-+ const string filename = static_cast<std::string>(sm().getFilename(recordStart));
- if (clazy::endsWith(className, "Private") && clazy::endsWithAny(filename, { ".cpp", ".cxx", "_p.h" }))
- return; // Lots of RAII classes fall into this category. And even Private (d-pointer) classes, warning in that case would just be noise
-
-diff --git a/src/checks/manuallevel/ifndef-define-typo.cpp b/src/checks/manuallevel/ifndef-define-typo.cpp
-index edb6cdf..e9c50a4 100644
---- a/src/checks/manuallevel/ifndef-define-typo.cpp
-+++ b/src/checks/manuallevel/ifndef-define-typo.cpp
-@@ -44,7 +44,7 @@ void IfndefDefineTypo::VisitMacroDefined(const Token &macroNameTok)
- {
- if (!m_lastIfndef.empty()) {
- if (IdentifierInfo *ii = macroNameTok.getIdentifierInfo()) {
-- maybeWarn(ii->getName(), macroNameTok.getLocation());
-+ maybeWarn(static_cast<std::string>(ii->getName()), macroNameTok.getLocation());
- }
- }
- }
-@@ -53,7 +53,7 @@ void IfndefDefineTypo::VisitDefined(const Token &macroNameTok, const SourceRange
- {
- if (!m_lastIfndef.empty()) {
- if (IdentifierInfo *ii = macroNameTok.getIdentifierInfo()) {
-- maybeWarn(ii->getName(), macroNameTok.getLocation());
-+ maybeWarn(static_cast<std::string>(ii->getName()), macroNameTok.getLocation());
- }
- }
- }
-@@ -66,7 +66,7 @@ void IfndefDefineTypo::VisitIfdef(SourceLocation, const Token &)
- void IfndefDefineTypo::VisitIfndef(SourceLocation, const Token &macroNameTok)
- {
- if (IdentifierInfo *ii = macroNameTok.getIdentifierInfo())
-- m_lastIfndef = ii->getName();
-+ m_lastIfndef = static_cast<std::string>(ii->getName());
- }
-
- void IfndefDefineTypo::VisitIf(SourceLocation, SourceRange, PPCallbacks::ConditionValueKind)
-diff --git a/src/checks/manuallevel/qproperty-type-mismatch.cpp b/src/checks/manuallevel/qproperty-type-mismatch.cpp
-index f91159c..952d9f1 100644
---- a/src/checks/manuallevel/qproperty-type-mismatch.cpp
-+++ b/src/checks/manuallevel/qproperty-type-mismatch.cpp
-@@ -237,7 +237,7 @@ void QPropertyTypeMismatch::VisitMacroExpands(const clang::Token &MacroNameTok,
-
- CharSourceRange crange = Lexer::getAsCharRange(range, sm(), lo());
-
-- string text = Lexer::getSourceText(crange, sm(), lo());
-+ string text = static_cast<std::string>(Lexer::getSourceText(crange, sm(), lo()));
- if (!text.empty() && text.back() == ')')
- text.pop_back();
-
-diff --git a/src/checks/manuallevel/qrequiredresult-candidates.cpp b/src/checks/manuallevel/qrequiredresult-candidates.cpp
-index 912dbaa..6375bd7 100644
---- a/src/checks/manuallevel/qrequiredresult-candidates.cpp
-+++ b/src/checks/manuallevel/qrequiredresult-candidates.cpp
-@@ -65,7 +65,7 @@ void QRequiredResultCandidates::VisitDecl(clang::Decl *decl)
-
-
- if (returnClass == classDecl) {
-- const std::string methodName = clazy::name(method);
-+ const std::string methodName = static_cast<std::string>(clazy::name(method));
- if (methodName.empty()) // fixes assert
- return;
-
-diff --git a/src/checks/manuallevel/qt-keywords.cpp b/src/checks/manuallevel/qt-keywords.cpp
-index e792e95..b60752c 100644
---- a/src/checks/manuallevel/qt-keywords.cpp
-+++ b/src/checks/manuallevel/qt-keywords.cpp
-@@ -59,12 +59,12 @@ void QtKeywords::VisitMacroExpands(const Token &macroNameTok, const SourceRange
- }
-
- static const vector<StringRef> keywords = { "foreach", "signals", "slots", "emit" };
-- std::string name = ii->getName();
-+ std::string name = static_cast<std::string>(ii->getName());
- if (!clazy::contains(keywords, name))
- return;
-
- // Make sure the macro is Qt's. It must be defined in Qt's headers, not 3rdparty
-- std::string qtheader = sm().getFilename(sm().getSpellingLoc(minfo->getDefinitionLoc()));
-+ std::string qtheader = static_cast<std::string>(sm().getFilename(sm().getSpellingLoc(minfo->getDefinitionLoc())));
- if (!clazy::endsWith(qtheader, "qglobal.h") && !clazy::endsWith(qtheader, "qobjectdefs.h"))
- return;
-
-diff --git a/src/checks/manuallevel/reserve-candidates.cpp b/src/checks/manuallevel/reserve-candidates.cpp
-index 389cac5..92e4491 100644
---- a/src/checks/manuallevel/reserve-candidates.cpp
-+++ b/src/checks/manuallevel/reserve-candidates.cpp
-@@ -78,7 +78,8 @@ static bool isCandidateMethod(CXXMethodDecl *methodDecl)
- if (!classDecl)
- return false;
-
-- if (!clazy::equalsAny(clazy::name(methodDecl), { "append", "push_back", "push", "operator<<", "operator+=" }))
-+ if (!clazy::equalsAny(static_cast<std::string>(clazy::name(methodDecl)),
-+ { "append", "push_back", "push", "operator<<", "operator+=" }))
- return false;
-
- if (!clazy::isAReserveClass(classDecl))
---
-GitLab
-
diff --git a/dev-util/clazy/files/clazy-1.7-llvm11-2.patch b/dev-util/clazy/files/clazy-1.7-llvm11-2.patch
deleted file mode 100644
index 4556f257bf3b..000000000000
--- a/dev-util/clazy/files/clazy-1.7-llvm11-2.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 25aa102cc49def9573ffbed88155589cd60a2e8f Mon Sep 17 00:00:00 2001
-From: Egor Gabov <egor.gabov@waveaccess.ru>
-Date: Fri, 5 Jun 2020 16:52:53 +0300
-Subject: [PATCH] updated for compatibility with LLVM 10 (clazy-standalone)
-
-In LLVM 10 llvm::StringRef operator std::string() is marked as explicit.
-In this commit all implicit conversion from llvm::StringRef to
-std::string are changed by explicit.
----
- src/checks/manuallevel/jnisignatures.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/checks/manuallevel/jnisignatures.cpp b/src/checks/manuallevel/jnisignatures.cpp
-index 81e61d4..5d4fe20 100644
---- a/src/checks/manuallevel/jnisignatures.cpp
-+++ b/src/checks/manuallevel/jnisignatures.cpp
-@@ -103,7 +103,7 @@ void JniSignatures::checkFunctionCall(Stmt *stm)
- return;
- }
-
-- const std::string name = clazy::name(funDecl);
-+ const std::string name = static_cast<std::string>(clazy::name(funDecl));
-
- if (name == "callObjectMethod" || name == "callMethod") {
- checkArgAt(callExpr, 0, methodNameRegex, "Invalid method name");
---
-GitLab
-
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index ac676f22ee5a..c033fe239344 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,3 +1,2 @@
-DIST CLion-2020.3.tar.gz 631168831 BLAKE2B 4a0a00776a91d93ab7a70a639aef25b9fe604be22d594ca451118f0057679dc29f7329e2516da0ac362312b20b18b819c3f3a494c28c443e4af478be547747bd SHA512 27d533f5b5097590a346ec28e11820a2dd82412ba5a6a4ae7dbb274572ad90b2c853cd47f0bdeb3fb38c0411469a5f5d439105535b92916b75488532be2c3c77
-EBUILD clion-2020.3.ebuild 1414 BLAKE2B 7d9cb4ff64f062668e0c6bd2a58c1afe97e97aa86dc160382bc76c09c32e0d3e67a66a9a4ff93980aff8ced35f527d3e0df4a8b44cdd9f69003a9aa325b5c087 SHA512 a1c54fcd2bc36f50088261c9c0269af78c3a00066c2706e75bbe4cc4a04d11015e2168044345f96759d4a91b900fbe7ba79ac073f22a22268a3fbccac941bf5a
-EBUILD clion-9999.ebuild 1414 BLAKE2B 7d9cb4ff64f062668e0c6bd2a58c1afe97e97aa86dc160382bc76c09c32e0d3e67a66a9a4ff93980aff8ced35f527d3e0df4a8b44cdd9f69003a9aa325b5c087 SHA512 a1c54fcd2bc36f50088261c9c0269af78c3a00066c2706e75bbe4cc4a04d11015e2168044345f96759d4a91b900fbe7ba79ac073f22a22268a3fbccac941bf5a
+DIST CLion-2020.3.1.tar.gz 624087156 BLAKE2B 5e67194ee08d837da4b5f62707d89befb40b89f577502b8f7575da7765cdf5d8bcebca4276fe75c6d4f154c2de10dc76a1507e944e3155382aa3507a3203a36a SHA512 e0338da95d909af00ad6c1901584971062f0e2aa2a0b6de7b75ac6cb6cd4a90ac09831d1e6a3770f61e2da81a969c3428693c2e192cadd623e7c4b0b094319a0
+DIST clion-2020.2.4.tar.gz 554105965 BLAKE2B f2854abed5773647152d1631e6b3a5493683336b63b6435af7461f41e1e001e834cdf9a4113a6a0ba4e1fd956d5b8a7706ac7b1f28db59ce6a9e05718cbd07b2 SHA512 f0fc517588bf1d61227bd65aa71da3276a643b67ca5dfe4dfc7d6460db5498fe5f2a86a9d5a98d5d3dbef1624baf926093e2a07fab84431d0c9b8daaaffc8a4f
diff --git a/dev-util/clion/clion-2020.2.4.ebuild b/dev-util/clion/clion-2020.2.4.ebuild
new file mode 100644
index 000000000000..1fd308530f3a
--- /dev/null
+++ b/dev-util/clion/clion-2020.2.4.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop wrapper
+
+DESCRIPTION="A complete toolset for C and C++ development"
+HOMEPAGE="https://www.jetbrains.com/clion"
+SRC_URI="https://download.jetbrains.com/cpp/CLion-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( IDEA IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
+ Apache-1.1 Apache-2.0 BSD BSD-2 CC0-1.0 CDDL-1.1 CPL-0.5 CPL-1.0
+ EPL-1.0 EPL-2.0 GPL-2 GPL-2-with-classpath-exception GPL-3 ISC JDOM
+ LGPL-2.1+ LGPL-3 MIT MPL-1.0 MPL-1.1 OFL public-domain PSF-2 UoI-NCSA ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="bindist mirror splitdebug"
+IUSE="custom-jdk"
+
+# RDEPENDS may cause false positives in repoman.
+# clion requires cmake and gdb at runtime to build and debug C/C++ projects
+RDEPEND="
+ dev-libs/libdbusmenu
+ dev-util/cmake
+ sys-devel/gdb
+ !custom-jdk? ( virtual/jdk )"
+
+QA_PREBUILT="opt/${P}/*"
+
+src_prepare() {
+ default
+
+ local remove_me=(
+ bin/gdb/linux
+ bin/lldb/linux
+ bin/cmake
+ license/CMake*
+ lib/pty4j-native/linux/ppc64le
+ )
+
+ use amd64 || remove_me+=( bin/fsnotifier64 lib/pty4j-native/linux/x86_64)
+ use x86 || remove_me+=( bin/fsnotifier lib/pty4j-native/linux/x86)
+
+ use custom-jdk || remove_me+=( jbr )
+
+ rm -rv "${remove_me[@]}" || die
+}
+
+src_install() {
+ local dir="/opt/${P}"
+
+ insinto "${dir}"
+ doins -r *
+ fperms 755 "${dir}"/bin/{clion.sh,clang/linux/clang{d,-tidy}}
+
+ if use amd64; then
+ fperms 755 "${dir}"/bin/fsnotifier64
+ fi
+ if use arm; then
+ fperms 755 "${dir}"/bin/fsnotifier-arm
+ fi
+ if use x86; then
+ fperms 755 "${dir}"/bin/fsnotifier
+ fi
+
+ if use custom-jdk; then
+ if [[ -d jbr ]]; then
+ fperms 755 "${dir}"/jbr/bin/{jaotc,java,javac,jdb,jjs,jrunscript,keytool,pack200,rmid,rmiregistry,serialver,unpack200}
+ fi
+ fi
+
+ make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
+ newicon "bin/${PN}.svg" "${PN}.svg"
+ make_desktop_entry "${PN}" "clion" "${PN}" "Development;IDE;"
+
+ # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+ dodir /usr/lib/sysctl.d/
+ echo "fs.inotify.max_user_watches = 524288" > "${D}/usr/lib/sysctl.d/30-clion-inotify-watches.conf" || die
+}
diff --git a/dev-util/clion/clion-2020.3.1-r1.ebuild b/dev-util/clion/clion-2020.3.1-r1.ebuild
new file mode 100644
index 000000000000..a78766675052
--- /dev/null
+++ b/dev-util/clion/clion-2020.3.1-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop wrapper
+
+DESCRIPTION="A complete toolset for C and C++ development"
+HOMEPAGE="https://www.jetbrains.com/clion"
+SRC_URI="https://download.jetbrains.com/cpp/CLion-${PV}.tar.gz"
+
+LICENSE="|| ( IDEA IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
+ Apache-1.1 Apache-2.0 BSD BSD-2 CC0-1.0 CDDL-1.1 CPL-0.5 CPL-1.0
+ EPL-1.0 EPL-2.0 GPL-2 GPL-2-with-classpath-exception GPL-3 ISC JDOM
+ LGPL-2.1+ LGPL-3 MIT MPL-1.0 MPL-1.1 OFL public-domain PSF-2 UoI-NCSA ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="bindist mirror splitdebug"
+
+BDEPEND="dev-util/patchelf"
+
+# RDEPENDS may cause false positives in repoman.
+# clion requires cmake and gdb at runtime to build and debug C/C++ projects
+RDEPEND="
+ app-accessibility/at-spi2-atk
+ app-accessibility/at-spi2-core
+ dev-libs/atk
+ dev-libs/libdbusmenu
+ dev-libs/nss
+ dev-util/cmake
+ media-libs/alsa-lib
+ media-libs/freetype
+ media-libs/mesa
+ net-print/cups
+ sys-devel/gdb
+ x11-libs/libdrm
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXi
+ x11-libs/libXScrnSaver
+ x11-libs/libXrandr
+ x11-libs/libXtst
+ x11-libs/libXxf86vm
+ x11-libs/pango"
+
+QA_PREBUILT="opt/${P}/*"
+
+src_prepare() {
+ default
+
+ local remove_me=(
+ bin/gdb/linux
+ bin/lldb/linux
+ bin/cmake
+ license/CMake*
+ lib/pty4j-native/linux/aarch64
+ lib/pty4j-native/linux/mips64el
+ lib/pty4j-native/linux/ppc64le
+ )
+
+ use amd64 || remove_me+=( bin/fsnotifier64 lib/pty4j-native/linux/x86_64)
+ use x86 || remove_me+=( bin/fsnotifier lib/pty4j-native/linux/x86)
+
+ rm -rv "${remove_me[@]}" || die
+
+ for file in "jbr/lib/"/{libjcef.so,jcef_helper}
+ do
+ if [[ -f "${file}" ]]; then
+ patchelf --set-rpath '$ORIGIN' ${file} || die
+ fi
+ done
+}
+
+src_install() {
+ local dir="/opt/${P}"
+
+ insinto "${dir}"
+ doins -r *
+ fperms 755 "${dir}"/bin/{clion.sh,clang/linux/clang{d,-tidy}}
+
+ if use amd64; then
+ fperms 755 "${dir}"/bin/fsnotifier64
+ fi
+ if use arm; then
+ fperms 755 "${dir}"/bin/fsnotifier-arm
+ fi
+ if use x86; then
+ fperms 755 "${dir}"/bin/fsnotifier
+ fi
+
+ if [[ -d jbr ]]; then
+ fperms 755 "${dir}"/jbr/bin/{jaotc,java,javac,jdb,jjs,jrunscript,keytool,pack200,rmid,rmiregistry,serialver,unpack200}
+ # Fix #763582
+ fperms 755 "${dir}"/jbr/lib/{chrome-sandbox,jcef_helper,jexec,jspawnhelper}
+ fi
+
+ make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
+ newicon "bin/${PN}.svg" "${PN}.svg"
+ make_desktop_entry "${PN}" "clion" "${PN}" "Development;IDE;"
+
+ # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+ dodir /usr/lib/sysctl.d/
+ echo "fs.inotify.max_user_watches = 524288" > "${D}/usr/lib/sysctl.d/30-clion-inotify-watches.conf" || die
+}
diff --git a/dev-util/clion/clion-2020.3.ebuild b/dev-util/clion/clion-2020.3.ebuild
deleted file mode 100644
index ea0bc3f5f047..000000000000
--- a/dev-util/clion/clion-2020.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg
-
-DESCRIPTION="A complete toolset for C and C++ development."
-HOMEPAGE="https://www.jetbrains.com/clion"
-LICENSE="JetBrains"
-
-SLOT="0"
-
-IUSE="gdb lldb"
-
-BDEPEND="
- app-arch/tar
-"
-
-RDEPEND="
- dev-util/cmake
- gdb? ( sys-devel/gdb )
- lldb? ( dev-util/lldb )
- virtual/jdk
-"
-
-RESTRICT="bindist mirror strip"
-
-S="${WORKDIR}/${PN}-${PV}"
-
-if [[ ${PV} != 9999 ]]; then
- SRC_URI="https://download.jetbrains.com/cpp/CLion-${PV}.tar.gz"
- KEYWORDS="*"
-fi
-
-src_unpack() {
- default
-}
-
-src_prepare() {
- default
-
- # Remove any bundled Java
- rm -rf {jbr,jre{64}} || die "Failed to remove bundled Java"
-}
-
-src_install() {
-
- insinto "/opt/${PN}"
- doins -r *
-
- fperms 755 /opt/${PN}/bin/{clion.sh,clang/linux/clang{d,-tidy},fsnotifier{,64}}
-
- dosym ../../opt/${PN}/bin/clion.sh /usr/bin/${PN}
-
- newicon "bin/${PN}.png" "${PN}.png"
- make_desktop_entry "${PN}" "CLion" "${PN}" "Development;Programming;IDE;"
-
- # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
- mkdir -p "${D}/etc/sysctl.d/" || die
- echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_icon_cache_update
-}
diff --git a/dev-util/clion/clion-9999.ebuild b/dev-util/clion/clion-9999.ebuild
deleted file mode 100644
index ea0bc3f5f047..000000000000
--- a/dev-util/clion/clion-9999.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg
-
-DESCRIPTION="A complete toolset for C and C++ development."
-HOMEPAGE="https://www.jetbrains.com/clion"
-LICENSE="JetBrains"
-
-SLOT="0"
-
-IUSE="gdb lldb"
-
-BDEPEND="
- app-arch/tar
-"
-
-RDEPEND="
- dev-util/cmake
- gdb? ( sys-devel/gdb )
- lldb? ( dev-util/lldb )
- virtual/jdk
-"
-
-RESTRICT="bindist mirror strip"
-
-S="${WORKDIR}/${PN}-${PV}"
-
-if [[ ${PV} != 9999 ]]; then
- SRC_URI="https://download.jetbrains.com/cpp/CLion-${PV}.tar.gz"
- KEYWORDS="*"
-fi
-
-src_unpack() {
- default
-}
-
-src_prepare() {
- default
-
- # Remove any bundled Java
- rm -rf {jbr,jre{64}} || die "Failed to remove bundled Java"
-}
-
-src_install() {
-
- insinto "/opt/${PN}"
- doins -r *
-
- fperms 755 /opt/${PN}/bin/{clion.sh,clang/linux/clang{d,-tidy},fsnotifier{,64}}
-
- dosym ../../opt/${PN}/bin/clion.sh /usr/bin/${PN}
-
- newicon "bin/${PN}.png" "${PN}.png"
- make_desktop_entry "${PN}" "CLion" "${PN}" "Development;Programming;IDE;"
-
- # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
- mkdir -p "${D}/etc/sysctl.d/" || die
- echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_icon_cache_update
-}
diff --git a/dev-util/clion/metadata.xml b/dev-util/clion/metadata.xml
new file mode 100644
index 000000000000..03ec9f1183cd
--- /dev/null
+++ b/dev-util/clion/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>c.a.strahl@gmail.com</email>
+ <name>Christian Strahl</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <use>
+ <flag name="custom-jdk">Install and use IntelliJ's custom JRE.</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-util/cloc/cloc-1.86.ebuild b/dev-util/cloc/cloc-1.86.ebuild
index 61220333dbd9..d2013f01d311 100644
--- a/dev-util/cloc/cloc-1.86.ebuild
+++ b/dev-util/cloc/cloc-1.86.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/AlDanial/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
DEPEND="dev-lang/perl"
RDEPEND="${DEPEND}
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index b0e5181cbd21..7a303af742e7 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,5 +1,5 @@
DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226 SHA512 99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26
-DIST cmake-3.16.5.tar.gz 9111262 BLAKE2B 5f996113a4979563d7b9f298b4b1a32d6f91eebaa79af42e1cbf247884e443de47e30030fd0f16c7755c4086e2bff0c0741911753ea7c889b68c393c0b98c876 SHA512 204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671
DIST cmake-3.17.4.tar.gz 9473549 BLAKE2B 2ce29415525b5292ae9e06d73570ed0af2173d8d15612f4d645f22d4f55cb99018663c374c4282731e09f8c6e4ffd59316d65f38aef9db5c34d874ca8992382b SHA512 6af879502e52388f3be02a4edfb006274840ad1afa8f28ffd6ec69b0310c7f718812b2272e5f77ffa422717f61407a6d482deb95941555c21c73fc5f62356a4e
DIST cmake-3.18.5.tar.gz 8975784 BLAKE2B 62ea68b602e7e352c22ba6122aa010fb78fb5c4e484aa51bc336e750280d5fc03ffa439bd8005d2c43176f5a5db4ebfd419beca65cc59c5b8cd5666e38394fb8 SHA512 c15e0937a9c0ce0b6164c3d02a147e679ea57e1119cff4189a15de71429a7facb3c04eb8db467471876b5da5dbd4a25acb228efa7101fe78efd205f0d2c96343
-DIST cmake-3.19.1.tar.gz 9256956 BLAKE2B 00874fa3099fe55e7a8c16f5225d30c56e05aaaa69930e0f10d1829bb373f83c17cb11ba538918089bd94162dbb4cc736b2024bd0e1e7102f3d8c462bfe71c1b SHA512 1a1c9a8546c80f8602babffc7fd398cea5d9163512ef74333f87e26a97ca35358bd0e90423768cfc971ebfed185e19d775737e557e0e982403b77a2ccbcd063a
+DIST cmake-3.19.2.tar.gz 9264414 BLAKE2B f45727fd6b6e0e324f618577abbc7fb1830f05f01a9afea4f8713f5f62ede3a612a020ef97385cdd6ede4b575a3b6f63deb57123a222b71e2906a42cba3b3d7f SHA512 d811122af89d46174b8fdb2a26e8553200d9dc7eb6385ece4e4b3e7584880f73a799813d5a81e64e956fd2574b63264fa8944d862c74a076e9d61f5e6521e91a
+DIST cmake-3.19.3.tar.gz 9265831 BLAKE2B 133ca8b12c0ccff0f9d833543c66cac597d72898d6e8602c74ef2875c90059b0a19d059b8801e407a7d5931b8aa50b253aef970330454789e13e2e63a7bb6d97 SHA512 54c91fa76882152d3933b696d7e547bc4edf6f97f3810e8dd57ca28c98e9fcaf757eac7c77e1e7fab88aced10937ed354917aeac3997edef406313dcf76ba0c5
diff --git a/dev-util/cmake/cmake-3.13.5.ebuild b/dev-util/cmake/cmake-3.13.5.ebuild
index 1c5774d1e717..2b496b439633 100644
--- a/dev-util/cmake/cmake-3.13.5.ebuild
+++ b/dev-util/cmake/cmake-3.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
LICENSE="CMake"
SLOT="0"
[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc emacs system-jsoncpp ncurses qt5"
RDEPEND="
diff --git a/dev-util/cmake/cmake-3.17.4-r1.ebuild b/dev-util/cmake/cmake-3.17.4-r1.ebuild
index 27718c8a18dd..45b0de57b6ce 100644
--- a/dev-util/cmake/cmake-3.17.4-r1.ebuild
+++ b/dev-util/cmake/cmake-3.17.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
LICENSE="CMake"
SLOT="0"
[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc emacs ncurses qt5 test"
RESTRICT="!test? ( test )"
diff --git a/dev-util/cmake/cmake-3.18.5.ebuild b/dev-util/cmake/cmake-3.18.5.ebuild
index 7334e72c320d..4c0006310904 100644
--- a/dev-util/cmake/cmake-3.18.5.ebuild
+++ b/dev-util/cmake/cmake-3.18.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
LICENSE="CMake"
SLOT="0"
[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc emacs ncurses qt5 test"
RESTRICT="!test? ( test )"
diff --git a/dev-util/cmake/cmake-3.19.1-r1.ebuild b/dev-util/cmake/cmake-3.19.2.ebuild
index 2726694149e4..3dbd001d5376 100644
--- a/dev-util/cmake/cmake-3.19.1-r1.ebuild
+++ b/dev-util/cmake/cmake-3.19.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
LICENSE="CMake"
SLOT="0"
[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc emacs ncurses qt5 test"
RESTRICT="!test? ( test )"
@@ -69,8 +69,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
# upstream fixes (can usually be removed with a version bump)
- "${FILESDIR}"/${P}-fix-spurious-include-target.patch # bug 759271
- "${FILESDIR}"/${P}-use-FPHSA-outside-find_package.patch # bug 755743
)
cmake_src_bootstrap() {
@@ -139,6 +137,9 @@ src_prepare() {
# where things are via GCC configuration and ldwrapper
sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
Modules/Platform/Apple-GNU-*.cmake || die
+ # disable isysroot usage with clang as well
+ sed -i -e '/_SYSROOT_FLAG/d' \
+ Modules/Platform/Apple-Clang.cmake || die
# don't set a POSIX standard, system headers don't like that, #757426
sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
Source/cmLoadCommandCommand.cxx \
diff --git a/dev-util/cmake/cmake-3.16.5.ebuild b/dev-util/cmake/cmake-3.19.3.ebuild
index f53ac8c1d184..930417171292 100644
--- a/dev-util/cmake/cmake-3.16.5.ebuild
+++ b/dev-util/cmake/cmake-3.19.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_MAKEFILE_GENERATOR="emake" # TODO: Re-check with 3.19, see commit 491dddfb; bug #596460
CMAKE_REMOVE_MODULES_LIST=( none )
inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
toolchain-funcs virtualx xdg-utils
@@ -17,13 +17,13 @@ SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
LICENSE="CMake"
SLOT="0"
[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc emacs ncurses qt5 test"
RESTRICT="!test? ( test )"
RDEPEND="
- app-crypt/rhash
>=app-arch/libarchive-3.3.3:=
+ app-crypt/rhash
>=dev-libs/expat-2.0.1
>=dev-libs/jsoncpp-1.9.2-r2:0=
>=dev-libs/libuv-1.10.0:=
@@ -54,23 +54,25 @@ PATCHES=(
# prefix
"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
- # Next patch requires new work from prefix people
- #"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
+ "${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
# handle gentoo packaging in find modules
- "${FILESDIR}"/${PN}-3.15.0_rc2-FindBLAS.patch
- "${FILESDIR}"/${PN}-3.14.0_rc1-FindLAPACK.patch
+ "${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
+ # Next patch needs to be reworked
+ #"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
# respect python eclasses
"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
+ "${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
+
# upstream fixes (can usually be removed with a version bump)
)
cmake_src_bootstrap() {
- # disable running of cmake in boostrap command
+ # disable running of cmake in bootstrap command
sed -i \
-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
bootstrap || die "sed failed"
@@ -81,10 +83,8 @@ cmake_src_bootstrap() {
Source/kwsys/CMakeLists.txt || die
fi
- tc-export CC CXX LD
-
# bootstrap script isn't exactly /bin/sh compatible
- ${CONFIG_SHELL:-sh} ./bootstrap \
+ tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
--prefix="${T}/cmakestrap/" \
--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
|| die "Bootstrap failed"
@@ -103,22 +103,24 @@ cmake_src_test() {
[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
# Excluded tests:
- # BootstrapTest: we actualy bootstrap it every time so why test it.
+ # BootstrapTest: we actually bootstrap it every time so why test it.
# BundleUtilities: bundle creation broken
# CMakeOnly.AllFindModules: pthread issues
- # CTest.updatecvs: which fails to commit as root
+ # CTest.updatecvs: fails to commit as root
# Fortran: requires fortran
+ # RunCMake.CommandLineTar: whatever...
# RunCMake.CompilerLauncher: also requires fortran
# RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
# debugedit binary is not in the expected location
# RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
# it can't find a deb package that owns libc
- # TestUpload, which requires network access
+ # RunCMake.{IncompatibleQt,ObsoleteQtMacros}: Require Qt4
+ # TestUpload: requires network access
"${BUILD_DIR}"/bin/ctest \
-j "$(makeopts_jobs)" \
--test-load "$(makeopts_loadavg)" \
${ctestargs} \
- -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
+ -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|DependencyGraph|Fortran|RunCMake.CommandLineTar|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
|| die "Tests failed"
popd > /dev/null
@@ -127,10 +129,26 @@ cmake_src_test() {
src_prepare() {
cmake_src_prepare
- # disable Xcode hooks, bug #652134
if [[ ${CHOST} == *-darwin* ]] ; then
- sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
- Source/cmGlobalXCodeGenerator.cxx || die
+ # disable Xcode hooks, bug #652134
+ sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
+ Source/CMakeLists.txt || die
+ sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
+ -e '/cmGlobalXCodeGenerator.h/d' \
+ Source/cmake.cxx || die
+ # disable isysroot usage with GCC, we've properly instructed
+ # where things are via GCC configuration and ldwrapper
+ sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
+ Modules/Platform/Apple-GNU-*.cmake || die
+ # disable isysroot usage with clang as well
+ sed -i -e '/_SYSROOT_FLAG/d' \
+ Modules/Platform/Apple-Clang.cmake || die
+ # don't set a POSIX standard, system headers don't like that, #757426
+ sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+ Source/cmLoadCommandCommand.cxx \
+ Source/cmStandardLexer.h \
+ Source/cmSystemTools.cxx \
+ Source/cmTimestamp.cxx
fi
# Add gcc libs to the default link paths
@@ -139,7 +157,7 @@ src_prepare() {
-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
- if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
+ if ! has_version -b \>=${CATEGORY}/${PN}-3.4.0_rc1 || ! cmake --version &>/dev/null ; then
CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
cmake_src_bootstrap
fi
@@ -159,13 +177,7 @@ src_configure() {
-DBUILD_CursesDialog="$(usex ncurses)"
-DBUILD_TESTING=$(usex test)
)
-
- if use qt5 ; then
- mycmakeargs+=(
- -DBUILD_QtDialog=ON
- $(cmake_use_find_package qt5 Qt5Widgets)
- )
- fi
+ use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
cmake_src_configure
}
@@ -197,8 +209,6 @@ src_install() {
doins "${FILESDIR}/${PN}.vim"
dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
- rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
}
pkg_postinst() {
diff --git a/dev-util/cmake/files/cmake-3.14.0_rc1-FindLAPACK.patch b/dev-util/cmake/files/cmake-3.14.0_rc1-FindLAPACK.patch
deleted file mode 100644
index ebd83f38d187..000000000000
--- a/dev-util/cmake/files/cmake-3.14.0_rc1-FindLAPACK.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 6d4d97b328f48862923bb55c1c0976b1d532dcc3 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Sun, 10 Feb 2019 23:01:53 +0100
-Subject: [PATCH] Prefer pkgconfig in FindLAPACK
-
----
- Modules/FindLAPACK.cmake | 21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
-
-diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake
-index d6646eaacf..ef5f324670 100644
---- a/Modules/FindLAPACK.cmake
-+++ b/Modules/FindLAPACK.cmake
-@@ -7,6 +7,10 @@ FindLAPACK
-
- Find LAPACK library
-
-+Version modified for Gentoo Linux.
-+If a valid PkgConfig configuration is found, this overrides and cancels
-+all further checks.
-+
- This module finds an installed fortran library that implements the
- LAPACK linear-algebra interface (see http://www.netlib.org/lapack/).
-
-@@ -181,6 +185,21 @@ endif()
-
- endmacro()
-
-+# first, try PkgConfig
-+find_package(PkgConfig REQUIRED)
-+pkg_check_modules(PC_LAPACK lapack)
-+if(PC_LAPACK_FOUND)
-+ foreach(PC_LIB ${PC_LAPACK_LIBRARIES})
-+ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_LAPACK_LIBRARY_DIRS} )
-+ if (NOT ${PC_LIB}_LIBRARY)
-+ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_LAPACK_LIBRARY_DIRS}")
-+ endif (NOT ${PC_LIB}_LIBRARY)
-+ list(APPEND LAPACK_LIBRARIES ${${PC_LIB}_LIBRARY})
-+ endforeach(PC_LIB)
-+ find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARIES)
-+ mark_as_advanced(LAPACK_LIBRARIES)
-+else(PC_LAPACK_FOUND)
-+message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.")
-
- set(LAPACK_LINKER_FLAGS)
- set(LAPACK_LIBRARIES)
-@@ -428,3 +447,5 @@ endif()
-
- cmake_pop_check_state()
- set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
-+
-+endif(PC_LAPACK_FOUND)
---
-2.20.1
-
diff --git a/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch b/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch
index d03b17551f0b..9a6054e9557f 100644
--- a/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch
+++ b/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch
@@ -17,7 +17,8 @@ Updated by Lars Wendler (cmake-3.9.0_rc2)
Updated by Benda Xu (cmake-3.13.4)
Updated by Lars Wendler (cmake-3.14.0_rc1)
Updated by Lars Wendler (cmake-3.14.0_rc2)
-Updated by Lars Wendler (cmake-3.14.0_rc3
+Updated by Lars Wendler (cmake-3.14.0_rc3)
+Updated by Jacob Floyd (cmake-3.19.2)
---
Modules/Platform/Darwin.cmake | 12 +++++++----
Modules/Platform/UnixPaths.cmake | 35 ++++++++++++++++++++++++--------
@@ -39,16 +40,17 @@ index 5590433a3b..b04383e51d 100644
endif()
# Older OS X linkers do not report their framework search path
-@@ -140,6 +140,8 @@ endif()
+@@ -140,6 +140,9 @@ endif()
# set up the default search directories for frameworks
set(CMAKE_SYSTEM_FRAMEWORK_PATH
++ @GENTOO_PORTAGE_EPREFIX@MacOSX.sdk/System/Library/Frameworks
+ @GENTOO_PORTAGE_EPREFIX@Frameworks
+ @GENTOO_PORTAGE_EPREFIX@usr/lib
~/Library/Frameworks
)
if(_CMAKE_OSX_SYSROOT_PATH)
-@@ -186,13 +188,15 @@ if(CMAKE_OSX_SYSROOT)
+@@ -186,13 +189,15 @@ if(CMAKE_OSX_SYSROOT)
endif()
endif()
diff --git a/dev-util/cmake/files/cmake-3.15.0_rc2-FindBLAS.patch b/dev-util/cmake/files/cmake-3.15.0_rc2-FindBLAS.patch
deleted file mode 100644
index 64ab5612b868..000000000000
--- a/dev-util/cmake/files/cmake-3.15.0_rc2-FindBLAS.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 4de8287ce3b098ea579a28155d442eb589db8617 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Sat, 22 Jun 2019 16:09:05 +0200
-Subject: [PATCH] Prefer pkgconfig in FindBLAS
-
----
- Modules/FindBLAS.cmake | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake
-index 77f9d0e40c..bbe155caa9 100644
---- a/Modules/FindBLAS.cmake
-+++ b/Modules/FindBLAS.cmake
-@@ -7,6 +7,10 @@ FindBLAS
-
- Find Basic Linear Algebra Subprograms (BLAS) library
-
-+Version modified for Gentoo Linux.
-+If a valid PkgConfig configuration is found, this overrides and cancels
-+all further checks.
-+
- This module finds an installed Fortran library that implements the
- BLAS linear-algebra interface (see http://www.netlib.org/blas/). The
- list of libraries searched for is taken from the ``autoconf`` macro file,
-@@ -92,6 +96,9 @@ installation.
-
- #]=======================================================================]
-
-+# first, try PkgConfig
-+set(BLA_PREFER_PKGCONFIG On)
-+
- include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake)
- include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake)
- include(${CMAKE_CURRENT_LIST_DIR}/CMakePushCheckState.cmake)
---
-2.22.0
-
diff --git a/dev-util/cmake/files/cmake-3.19.1-fix-spurious-include-target.patch b/dev-util/cmake/files/cmake-3.19.1-fix-spurious-include-target.patch
deleted file mode 100644
index 1b51cf013fe5..000000000000
--- a/dev-util/cmake/files/cmake-3.19.1-fix-spurious-include-target.patch
+++ /dev/null
@@ -1,198 +0,0 @@
-From 38bcb5c0a3accd2dd29fb7632c6b3bf31b990d82 Mon Sep 17 00:00:00 2001
-From: Deniz Bahadir <dbahadir@benocs.com>
-Date: Tue, 1 Dec 2020 00:25:39 +0100
-Subject: [PATCH] export: Do not fail generation for separate namelink only
- case
-
-Update the change from commit 64690f6df0 (export: Do not fail generation
-for namelink-only case, 2020-10-09, v3.19.0-rc1~7^2) to also handle
-separate namelink-only and namelink-skip calls.
-
-Fixes: #21529
----
- Source/cmExportBuildFileGenerator.cxx | 3 +++
- Source/cmExportInstallFileGenerator.cxx | 3 +++
- Source/cmInstallCommand.cxx | 19 +++++++++++--------
- Source/cmTargetExport.h | 2 ++
- Tests/RunCMake/export/RunCMakeTest.cmake | 1 +
- .../export/SeparateNamelinkExport.cmake | 16 ++++++++++++++++
- .../install/EXPORT-SeparateNamelink.cmake | 19 +++++++++++++++++++
- Tests/RunCMake/install/RunCMakeTest.cmake | 1 +
- 8 files changed, 56 insertions(+), 8 deletions(-)
- create mode 100644 Tests/RunCMake/export/SeparateNamelinkExport.cmake
- create mode 100644 Tests/RunCMake/install/EXPORT-SeparateNamelink.cmake
-
-diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
-index dd700c5edf..1a31ae4afd 100644
---- a/Source/cmExportBuildFileGenerator.cxx
-+++ b/Source/cmExportBuildFileGenerator.cxx
-@@ -288,6 +288,9 @@ void cmExportBuildFileGenerator::GetTargets(
- if (this->ExportSet) {
- for (std::unique_ptr<cmTargetExport> const& te :
- this->ExportSet->GetTargetExports()) {
-+ if (te->NamelinkOnly) {
-+ continue;
-+ }
- targets.push_back(te->TargetName);
- }
- return;
-diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
-index 987ec9ea7b..0b9b183d54 100644
---- a/Source/cmExportInstallFileGenerator.cxx
-+++ b/Source/cmExportInstallFileGenerator.cxx
-@@ -42,6 +42,9 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
- std::string sep;
- for (std::unique_ptr<cmTargetExport> const& te :
- this->IEGen->GetExportSet()->GetTargetExports()) {
-+ if (te->NamelinkOnly) {
-+ continue;
-+ }
- expectedTargets += sep + this->Namespace + te->Target->GetExportName();
- sep = " ";
- if (this->ExportedTargets.insert(te->Target).second) {
-diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx
-index b99e6a3c6c..ff08ee41ef 100644
---- a/Source/cmInstallCommand.cxx
-+++ b/Source/cmInstallCommand.cxx
-@@ -461,6 +461,13 @@ bool HandleTargetsMode(std::vector<std::string> const& args,
- std::unique_ptr<cmInstallFilesGenerator> publicHeaderGenerator;
- std::unique_ptr<cmInstallFilesGenerator> resourceGenerator;
-
-+ // Avoid selecting default destinations for PUBLIC_HEADER and
-+ // PRIVATE_HEADER if any artifacts are specified.
-+ bool artifactsSpecified = false;
-+
-+ // Track whether this is a namelink-only rule.
-+ bool namelinkOnly = false;
-+
- auto addTargetExport = [&]() {
- // Add this install rule to an export if one was specified.
- if (!exports.empty()) {
-@@ -475,20 +482,13 @@ bool HandleTargetsMode(std::vector<std::string> const& args,
- te->ObjectsGenerator = objectGenerator.get();
- te->InterfaceIncludeDirectories =
- cmJoin(includesArgs.GetIncludeDirs(), ";");
--
-+ te->NamelinkOnly = namelinkOnly;
- helper.Makefile->GetGlobalGenerator()
- ->GetExportSets()[exports]
- .AddTargetExport(std::move(te));
- }
- };
-
-- // Avoid selecting default destinations for PUBLIC_HEADER and
-- // PRIVATE_HEADER if any artifacts are specified.
-- bool artifactsSpecified = false;
--
-- // Track whether this is a namelink-only rule.
-- bool namelinkOnly = false;
--
- switch (target.GetType()) {
- case cmStateEnums::SHARED_LIBRARY: {
- // Shared libraries are handled differently on DLL and non-DLL
-@@ -497,6 +497,7 @@ bool HandleTargetsMode(std::vector<std::string> const& args,
- if (target.IsDLLPlatform()) {
- // When in namelink only mode skip all libraries on Windows.
- if (namelinkMode == cmInstallTargetGenerator::NamelinkModeOnly) {
-+ namelinkOnly = true;
- addTargetExport();
- continue;
- }
-@@ -529,6 +530,7 @@ bool HandleTargetsMode(std::vector<std::string> const& args,
- if (target.IsFrameworkOnApple()) {
- // When in namelink only mode skip frameworks.
- if (namelinkMode == cmInstallTargetGenerator::NamelinkModeOnly) {
-+ namelinkOnly = true;
- addTargetExport();
- continue;
- }
-@@ -574,6 +576,7 @@ bool HandleTargetsMode(std::vector<std::string> const& args,
- if (target.IsFrameworkOnApple()) {
- // When in namelink only mode skip frameworks.
- if (namelinkMode == cmInstallTargetGenerator::NamelinkModeOnly) {
-+ namelinkOnly = true;
- addTargetExport();
- continue;
- }
-diff --git a/Source/cmTargetExport.h b/Source/cmTargetExport.h
-index cb4d8dae44..1e38d84923 100644
---- a/Source/cmTargetExport.h
-+++ b/Source/cmTargetExport.h
-@@ -31,4 +31,6 @@ public:
- cmInstallFilesGenerator* HeaderGenerator;
- std::string InterfaceIncludeDirectories;
- ///@}
-+
-+ bool NamelinkOnly = false;
- };
-diff --git a/Tests/RunCMake/export/RunCMakeTest.cmake b/Tests/RunCMake/export/RunCMakeTest.cmake
-index 95c8d5cf45..0e6020f0f4 100644
---- a/Tests/RunCMake/export/RunCMakeTest.cmake
-+++ b/Tests/RunCMake/export/RunCMakeTest.cmake
-@@ -17,3 +17,4 @@ run_cmake(DependOnNotExport)
- run_cmake(DependOnDoubleExport)
- run_cmake(UnknownExport)
- run_cmake(NamelinkOnlyExport)
-+run_cmake(SeparateNamelinkExport)
-diff --git a/Tests/RunCMake/export/SeparateNamelinkExport.cmake b/Tests/RunCMake/export/SeparateNamelinkExport.cmake
-new file mode 100644
-index 0000000000..b006aea128
---- /dev/null
-+++ b/Tests/RunCMake/export/SeparateNamelinkExport.cmake
-@@ -0,0 +1,16 @@
-+enable_language(CXX)
-+add_library(foo SHARED empty.cpp)
-+install(TARGETS foo EXPORT fooExport
-+ RUNTIME DESTINATION bin
-+ LIBRARY
-+ DESTINATION lib
-+ COMPONENT runtime
-+ NAMELINK_SKIP
-+)
-+install(TARGETS foo EXPORT fooExport
-+ LIBRARY
-+ DESTINATION lib
-+ COMPONENT development
-+ NAMELINK_ONLY
-+)
-+export(EXPORT fooExport FILE "${CMAKE_CURRENT_BINARY_DIR}/foo.cmake")
-diff --git a/Tests/RunCMake/install/EXPORT-SeparateNamelink.cmake b/Tests/RunCMake/install/EXPORT-SeparateNamelink.cmake
-new file mode 100644
-index 0000000000..5c6fa10d18
---- /dev/null
-+++ b/Tests/RunCMake/install/EXPORT-SeparateNamelink.cmake
-@@ -0,0 +1,19 @@
-+enable_language(C)
-+add_library(foo SHARED empty.c)
-+install(TARGETS foo EXPORT fooExport
-+ RUNTIME DESTINATION bin
-+ LIBRARY
-+ DESTINATION lib
-+ COMPONENT runtime
-+ NAMELINK_SKIP
-+)
-+install(TARGETS foo EXPORT fooExport
-+ LIBRARY
-+ DESTINATION lib
-+ COMPONENT development
-+ NAMELINK_ONLY
-+)
-+install(EXPORT fooExport
-+ DESTINATION "lib/cmake/"
-+ FILE "foo.cmake"
-+)
-diff --git a/Tests/RunCMake/install/RunCMakeTest.cmake b/Tests/RunCMake/install/RunCMakeTest.cmake
-index 5aab88ca80..d64d88b770 100644
---- a/Tests/RunCMake/install/RunCMakeTest.cmake
-+++ b/Tests/RunCMake/install/RunCMakeTest.cmake
-@@ -78,6 +78,7 @@ run_cmake(TARGETS-DESTINATION-bad)
- run_cmake(EXPORT-OldIFace)
- run_cmake(EXPORT-UnknownExport)
- run_cmake(EXPORT-NamelinkOnly)
-+run_cmake(EXPORT-SeparateNamelink)
- run_cmake(CMP0062-OLD)
- run_cmake(CMP0062-NEW)
- run_cmake(CMP0062-WARN)
---
-GitLab
-
diff --git a/dev-util/cmake/files/cmake-3.19.1-use-FPHSA-outside-find_package.patch b/dev-util/cmake/files/cmake-3.19.1-use-FPHSA-outside-find_package.patch
deleted file mode 100644
index 8cde769ce8f8..000000000000
--- a/dev-util/cmake/files/cmake-3.19.1-use-FPHSA-outside-find_package.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 14ecf9c2f6edfae4033d9311f79d79d0d07fc1cf Mon Sep 17 00:00:00 2001
-From: Marc Chevrier <marc.chevrier@gmail.com>
-Date: Wed, 25 Nov 2020 16:36:12 +0100
-Subject: [PATCH] FPHSA: ensure it can be used outside 'find_package'
-
-Fixes: #21505
----
- Modules/FindPackageHandleStandardArgs.cmake | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/Modules/FindPackageHandleStandardArgs.cmake b/Modules/FindPackageHandleStandardArgs.cmake
-index 7af017136d..7e172779e4 100644
---- a/Modules/FindPackageHandleStandardArgs.cmake
-+++ b/Modules/FindPackageHandleStandardArgs.cmake
-@@ -275,8 +275,10 @@ function(FIND_PACKAGE_CHECK_VERSION version result)
- unset (${FPCV_RESULT_MESSAGE_VARIABLE} PARENT_SCOPE)
- endif()
-
-- if (CMAKE_FIND_PACKAGE_NAME)
-- set (package ${CMAKE_FIND_PACKAGE_NAME})
-+ if (_CMAKE_FPHSA_PACKAGE_NAME)
-+ set (package "${_CMAKE_FPHSA_PACKAGE_NAME}")
-+ elseif (CMAKE_FIND_PACKAGE_NAME)
-+ set (package "${CMAKE_FIND_PACKAGE_NAME}")
- else()
- message (FATAL_ERROR "find_package_check_version(): Cannot be used outside a 'Find Module'")
- endif()
-@@ -436,6 +438,9 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
- "will be used.")
- endif()
-
-+ # to propagate package name to FIND_PACKAGE_CHECK_VERSION
-+ set(_CMAKE_FPHSA_PACKAGE_NAME "${_NAME}")
-+
- # now that we collected all arguments, process them
-
- if("x${FPHSA_FAIL_MESSAGE}" STREQUAL "xDEFAULT_MSG")
---
-GitLab
-
diff --git a/dev-util/colm/Manifest b/dev-util/colm/Manifest
index c45e1fb25190..824b062eede2 100644
--- a/dev-util/colm/Manifest
+++ b/dev-util/colm/Manifest
@@ -1,2 +1,2 @@
-DIST colm-0.13.0.6.tar.gz 739981 BLAKE2B e5b00bc276fa3414cc9ec557a6e4ca93194f86cd6b3b1ad11611352962da1ef68aa1acd4aa62d47495ba04313dcc52e2a17588fefabf51572d19826c7bb70fe8 SHA512 5bcf2d7ff78e523385294f338a8c057807b416b2922e002311fcd8027132504f1aa99bc4dde2c4ea7ddbbc8806fddefda57f8a16f6d5c91a9c47566f86339c81
-DIST colm-0.13.0.7.tar.gz 746841 BLAKE2B 7f816bafc0d1a7ea826b6cc2f5bd5fa2bffcd0eca88d5eaab757201481804dc5fa6c80fa19a550ebd9ee50a00a621690c4eed1788e0d0d3dd600db95ed8240d3 SHA512 d15cc6afeeacc4f34171261e75a7daa285529b98940272566ca6d6661d0778b18930ca72e0bce8d0a56c36c3482adfe4375c32ec66d6e77ee32544bddf35024d
+DIST colm-0.14.4.tar.gz 3095846 BLAKE2B 0f31a9cc57ca692b6f16843cd0f71ec119a05fc6917d274a0b36e1c04585d2d6a0182d35672d66ecf543c0605928a145b57a892e43cd8ad8be282e384de2f022 SHA512 82eb86ee37792fafab5089f15bd35c2daab6e43bedd2d4396035ef1f3cb503b3cecb0d3043a9171a5978b2ac18b75ccbfdd17afb383a6db9b45d7f8442431877
+DIST colm-0.14.5.tar.gz 3110329 BLAKE2B 75b13e70e01d19cd69f77ead3a6d02f55b355b98aae640e5630becb7995a7f373c26dfbd66eeb3be0dc04cddefc7b70905263118cee0518cb38a0c69623400dc SHA512 83d194d45238f3cc6393c3c5762b94618360f946652aef942be47740c5abeef92d513febe88ad33341f9a83e7093e56df86c77df64fcd3b504e22fb3bec17e07
diff --git a/dev-util/colm/colm-0.13.0.6-r1.ebuild b/dev-util/colm/colm-0.14.4.ebuild
index bffae550e235..6fbdb889f3d0 100644
--- a/dev-util/colm/colm-0.13.0.6-r1.ebuild
+++ b/dev-util/colm/colm-0.14.4.ebuild
@@ -13,10 +13,9 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86 ~amd64-linux ~x86-linux"
BDEPEND="app-text/asciidoc"
src_configure() {
- econf --disable-static
+ econf
}
src_install() {
default
- find "${D}" -name '*.la' -delete || die
}
diff --git a/dev-util/colm/colm-0.13.0.7.ebuild b/dev-util/colm/colm-0.14.5.ebuild
index bffae550e235..f91429367690 100644
--- a/dev-util/colm/colm-0.13.0.7.ebuild
+++ b/dev-util/colm/colm-0.14.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Liguros Authors
+# Copyright 2020-2021 Liguros Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,10 +13,9 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86 ~amd64-linux ~x86-linux"
BDEPEND="app-text/asciidoc"
src_configure() {
- econf --disable-static
+ econf
}
src_install() {
default
- find "${D}" -name '*.la' -delete || die
}
diff --git a/dev-util/colorgcc/colorgcc-1.3.2-r7.ebuild b/dev-util/colorgcc/colorgcc-1.3.2-r7.ebuild
index 84bd6aaa7650..280c2cb69b89 100644
--- a/dev-util/colorgcc/colorgcc-1.3.2-r7.ebuild
+++ b/dev-util/colorgcc/colorgcc-1.3.2-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~mips ppc sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
DEPEND="dev-lang/perl"
RDEPEND="${DEPEND}"
diff --git a/dev-util/conf2struct/conf2struct-1.0.ebuild b/dev-util/conf2struct/conf2struct-1.0-r1.ebuild
index 6891ffd1b8b0..c39a24cd4004 100644
--- a/dev-util/conf2struct/conf2struct-1.0.ebuild
+++ b/dev-util/conf2struct/conf2struct-1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -19,7 +19,7 @@ LICENSE="BSD-2"
SLOT="0"
IUSE=""
-RDEPEND="dev-libs/libconfig
+RDEPEND="dev-libs/libconfig:=
dev-perl/Conf-Libconfig"
DEPEND="${RDEPEND}"
diff --git a/dev-util/conf2struct/conf2struct-1.3.ebuild b/dev-util/conf2struct/conf2struct-1.3-r1.ebuild
index 6891ffd1b8b0..c39a24cd4004 100644
--- a/dev-util/conf2struct/conf2struct-1.3.ebuild
+++ b/dev-util/conf2struct/conf2struct-1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -19,7 +19,7 @@ LICENSE="BSD-2"
SLOT="0"
IUSE=""
-RDEPEND="dev-libs/libconfig
+RDEPEND="dev-libs/libconfig:=
dev-perl/Conf-Libconfig"
DEPEND="${RDEPEND}"
diff --git a/dev-util/conf2struct/conf2struct-9999.ebuild b/dev-util/conf2struct/conf2struct-9999.ebuild
index 6891ffd1b8b0..c39a24cd4004 100644
--- a/dev-util/conf2struct/conf2struct-9999.ebuild
+++ b/dev-util/conf2struct/conf2struct-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -19,7 +19,7 @@ LICENSE="BSD-2"
SLOT="0"
IUSE=""
-RDEPEND="dev-libs/libconfig
+RDEPEND="dev-libs/libconfig:=
dev-perl/Conf-Libconfig"
DEPEND="${RDEPEND}"
diff --git a/dev-util/confix-wrapper/confix-wrapper-1.ebuild b/dev-util/confix-wrapper/confix-wrapper-1.ebuild
index e7c72e75ad11..7806db077fad 100644
--- a/dev-util/confix-wrapper/confix-wrapper-1.ebuild
+++ b/dev-util/confix-wrapper/confix-wrapper-1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ HOMEPAGE="https://sourceforge.net/projects/confix/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE=""
S=${WORKDIR}
diff --git a/dev-util/cppcheck/cppcheck-1.88.ebuild b/dev-util/cppcheck/cppcheck-1.88.ebuild
index 574450e0e95e..19cd49deb922 100644
--- a/dev-util/cppcheck/cppcheck-1.88.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.88.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/danmar/cppcheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 hppa ~ppc64 sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 sparc x86"
IUSE="htmlreport pcre qt5"
RDEPEND="
diff --git a/dev-util/cppunit/Manifest b/dev-util/cppunit/Manifest
index 624a7099190e..b3d6502bfd91 100644
--- a/dev-util/cppunit/Manifest
+++ b/dev-util/cppunit/Manifest
@@ -1 +1,2 @@
DIST cppunit-1.14.0.tar.gz 959716 BLAKE2B 581e3b73d6d152c249005ddf267100443e6c9cba12c52c43e9d6f81096b9cd13c3686fa2f73ebaf28c31193e41dbfd5d919dfb0143b190881345da65a5b7f86d SHA512 4ea1da423c6f7ab37e4144689f593396829ce74d43872d6b10709c1ad5fbda4ee945842f7e9803592520ef81ac713e95a3fe130295bf048cd32a605d1959882e
+DIST cppunit-1.15.1.tar.gz 814363 BLAKE2B a1d1d1ee9b6ef408843a6e989a37653944ad85069b4896f18d0f01410acebf7342f70e8c031e58f7ad0e686a85869d521906816e0f0b1762d238efb606cb7310 SHA512 0feb47faec451357bb4c4e287efa17bb60fd3ad966d5350e9f25b414aaab79e94921024b0c0497672f8d3eeb22a599213d2d71d9e1d28b243b3e37f3a9a43691
diff --git a/dev-util/cppunit/cppunit-1.14.0.ebuild b/dev-util/cppunit/cppunit-1.14.0.ebuild
index 9b642afa8c03..73e0b0e8e661 100644
--- a/dev-util/cppunit/cppunit-1.14.0.ebuild
+++ b/dev-util/cppunit/cppunit-1.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -15,7 +15,7 @@ LICENSE="LGPL-2.1"
SLOT="0"
# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
[[ ${PV} = 9999 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="doc examples static-libs"
RDEPEND=""
diff --git a/dev-util/cppunit/cppunit-1.15.1.ebuild b/dev-util/cppunit/cppunit-1.15.1.ebuild
new file mode 100644
index 000000000000..a03be99e2df6
--- /dev/null
+++ b/dev-util/cppunit/cppunit-1.15.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal
+
+DESCRIPTION="C++ port of the famous JUnit framework for unit testing"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/cppunit"
+if [[ "${PV}" == *9999 ]] ; then
+ inherit autotools git-r3
+ EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/cppunit.git"
+else
+ SRC_URI="https://dev-www.libreoffice.org/src/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="doc examples static-libs"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+BDEPEND="
+ doc? (
+ app-doc/doxygen[dot]
+ media-gfx/graphviz
+ )
+"
+
+DOCS=( AUTHORS BUGS NEWS README THANKS TODO doc/FAQ )
+[[ "${PV}" == 9999 ]] || DOCS+=( ChangeLog )
+
+src_prepare() {
+ default
+ [[ "${PV}" == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+ # Anything else than -O0 breaks on alpha
+ use alpha && replace-flags "-O?" -O0
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --disable-werror
+ $(multilib_native_use_enable doc dot)
+ $(multilib_native_use_enable doc doxygen)
+ $(use_enable static-libs static)
+ )
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+ if use doc ; then
+ mv "${ED}"/usr/share/${PN}/html "${ED}"/usr/share/doc/${PF} \
+ || die
+ rm -r "${ED}"/usr/share/${PN} || die
+ fi
+ einstalldocs
+
+ find "${ED}" -name '*.la' -delete || die
+
+ if use examples ; then
+ find examples -iname "*.o" -delete
+ insinto /usr/share/${PN}
+ doins -r examples
+ fi
+}
diff --git a/dev-util/cppunit/cppunit-9999.ebuild b/dev-util/cppunit/cppunit-9999.ebuild
index 67412215d5fa..a03be99e2df6 100644
--- a/dev-util/cppunit/cppunit-9999.ebuild
+++ b/dev-util/cppunit/cppunit-9999.ebuild
@@ -1,25 +1,26 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/cppunit.git"
-[[ ${PV} = 9999 ]] && inherit git-r3 autotools
inherit flag-o-matic multilib-minimal
DESCRIPTION="C++ port of the famous JUnit framework for unit testing"
HOMEPAGE="https://www.freedesktop.org/wiki/Software/cppunit"
-[[ ${PV} = 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/${P}.tar.gz"
-
+if [[ "${PV}" == *9999 ]] ; then
+ inherit autotools git-r3
+ EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/cppunit.git"
+else
+ SRC_URI="https://dev-www.libreoffice.org/src/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
LICENSE="LGPL-2.1"
SLOT="0"
-# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} = 9999 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc examples static-libs"
RDEPEND=""
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
doc? (
app-doc/doxygen[dot]
media-gfx/graphviz
@@ -27,11 +28,11 @@ DEPEND="${RDEPEND}
"
DOCS=( AUTHORS BUGS NEWS README THANKS TODO doc/FAQ )
-[[ ${PV} = 9999 ]] || DOCS+=( ChangeLog )
+[[ "${PV}" == 9999 ]] || DOCS+=( ChangeLog )
src_prepare() {
default
- [[ ${PV} = 9999 ]] && eautoreconf
+ [[ "${PV}" == 9999 ]] && eautoreconf
}
src_configure() {
@@ -42,22 +43,24 @@ src_configure() {
}
multilib_src_configure() {
- ECONF_SOURCE=${S} \
- econf \
- $(use_enable static-libs static) \
- $(multilib_native_use_enable doc doxygen) \
- $(multilib_native_use_enable doc dot) \
+ local myeconfargs=(
--disable-werror
+ $(multilib_native_use_enable doc dot)
+ $(multilib_native_use_enable doc doxygen)
+ $(use_enable static-libs static)
+ )
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
}
multilib_src_install_all() {
- if use doc; then
- mv "${ED%/}"/usr/share/${PN}/html "${ED%/}"/usr/share/doc/${PF} || die
- rm -r "${ED%/}"/usr/share/${PN} || die
+ if use doc ; then
+ mv "${ED}"/usr/share/${PN}/html "${ED}"/usr/share/doc/${PF} \
+ || die
+ rm -r "${ED}"/usr/share/${PN} || die
fi
einstalldocs
- find "${D}" -name '*.la' -delete || die
+ find "${ED}" -name '*.la' -delete || die
if use examples ; then
find examples -iname "*.o" -delete
diff --git a/dev-util/cproto/Manifest b/dev-util/cproto/Manifest
index c90dbd7a1681..a75b4c37f507 100644
--- a/dev-util/cproto/Manifest
+++ b/dev-util/cproto/Manifest
@@ -1,2 +1,2 @@
-DIST cproto-4.7o.tgz 168915 BLAKE2B a79d22014140531c263d0b389c50c263b13bf2e9bd2142da54ec712ec13f122539d92fbc3e40a52d52802e17e5b96a39c73e0ea3dd3c189e0e4563cf7b3feea3 SHA512 9a731be8bfa3f0da9c8a7c04a1c9bcf5ca52897325fa868306c35d818fc54348f83d93e2b2d792a2f682f935fb42d928d2828b1ff7fe3287a1806852e180a9f3
DIST cproto-4.7q.tgz 175005 BLAKE2B 4138aeb87bff6cd59182939ca93c174cc23a67fd5830bbbb4f0e148edb7856acd7ec98390b46cc1c268c694347d6624a48d94e126751ddeec29fa8a305ed5d89 SHA512 014b51dfcc4b00cf0f71355901ce6ea5d5627846f4bce370559c4a7d9935abe8abc2f994a70793d4886ab93a24843152aa6c873515aa7d9a72d9c4a18fa1171e
+DIST cproto-4.7r.tgz 178234 BLAKE2B 83198fda34413253c7396e0171e3675642c664044b5a409d3a652b0b4ec6a83c9eb64bd35e86a9593ba02af60e9947e04f0251224d1766ef6d0d4639ea56b905 SHA512 934b9241f8e3ddabb6f0065117f500e716f552bc3593879e03890a22332da8baf6cf0b9c0b13c077e13c4bb692bef0efd3c39e96092154863d318219b7845e57
diff --git a/dev-util/cproto/cproto-4.7q.ebuild b/dev-util/cproto/cproto-4.7q.ebuild
index 366331b7cb4d..981859029532 100644
--- a/dev-util/cproto/cproto-4.7q.ebuild
+++ b/dev-util/cproto/cproto-4.7q.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.invisible-island.net/cproto/${P}.tgz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
DEPEND="sys-devel/flex
virtual/yacc"
diff --git a/dev-util/cproto/cproto-4.7o.ebuild b/dev-util/cproto/cproto-4.7r.ebuild
index 4820a05be91c..75a444986957 100644
--- a/dev-util/cproto/cproto-4.7o.ebuild
+++ b/dev-util/cproto/cproto-4.7r.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DESCRIPTION="Generate C function prototypes from C source code"
HOMEPAGE="https://invisible-island.net/cproto/"
-SRC_URI="ftp://ftp.invisible-island.net/cproto//${P}.tgz"
+SRC_URI="ftp://ftp.invisible-island.net/cproto/${P}.tgz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
DEPEND="sys-devel/flex
virtual/yacc"
diff --git a/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild b/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild
index a65920deec9d..73a4a8cf01d1 100644
--- a/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild
+++ b/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${MY_P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/dev-util/cram/cram-0.7-r1.ebuild b/dev-util/cram/cram-0.7-r1.ebuild
index 664b4433885b..29bf98a97d2e 100644
--- a/dev-util/cram/cram-0.7-r1.ebuild
+++ b/dev-util/cram/cram-0.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86"
python_test() {
distutils_install_for_testing
diff --git a/dev-util/cram/metadata.xml b/dev-util/cram/metadata.xml
index dc18226657fb..63812b80c76b 100644
--- a/dev-util/cram/metadata.xml
+++ b/dev-util/cram/metadata.xml
@@ -1,10 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>rafaelmartins@gentoo.org</email>
- <name>Rafael G. Martins</name>
- </maintainer>
+ <!-- maintainer-needed -->
+ <stabilize-allarches/>
<longdescription lang="en">
Cram is a functional testing framework for command line applications.
Cram tests look like snippets of interactive shell sessions. Cram
@@ -13,6 +11,7 @@
</longdescription>
<upstream>
<remote-id type="pypi">cram</remote-id>
+ <remote-id type="github">brodie/cram</remote-id>
</upstream>
<origin>gentoo-staging</origin>
</pkgmetadata>
diff --git a/dev-util/crash/Manifest b/dev-util/crash/Manifest
index df790de86041..3faa5d4ea04f 100644
--- a/dev-util/crash/Manifest
+++ b/dev-util/crash/Manifest
@@ -1 +1,3 @@
DIST crash-7.2.8.tar.gz 32253097 BLAKE2B 26a8a07749cb62947053992ba761b541ba5d06f0f3bf67312d8228c9d851f51edf1201e732574f7f2f2768d6087324b8dd1f843ea47916bd9f95e514df967589 SHA512 3269760a50b49f25af0e1c43d60432e603036793aa542f8ccfb0b8019376da45afa7c053d3860ae2130b6471f3ac72cff78f1096e9ffa8c6f1d34afb52208e70
+DIST crash-7.2.9.tar.gz 1324947 BLAKE2B dac5485742119fce1cdcab37a87a2a417e408108a73bffdd6fa215587e4c5dec29508d5f11285dbe2a21cd8365cee437296168b85f2f43dc743461061fd0a26e SHA512 57b7b7780ad71bad09d962bfb2d5ad729dd167d9aaffd86f7b5467c98f52e8cb2c6ebb317bf1ad285dcb78ffa300b5dd733c63efd7aaa4ef03ddfe076c269984
+DIST gdb-7.6.tar.gz 31437633 BLAKE2B fb8cb9f0c33f360c864c5776c3dd0233ad534d376a9df8157c7bc9f1c4ccfc8698933409561700f134705c0107038d8bfa23844e512cd3a08e24925d37a1ce58 SHA512 02d9c62fa73bcb79138d14c7fc182443f0ca82d4545b4d260b67d3f0074ed75f899a657814a56727e601032a668b0ddd7b48aabd49215fc012eeea6077bca368
diff --git a/dev-util/crash/crash-7.2.9.ebuild b/dev-util/crash/crash-7.2.9.ebuild
new file mode 100644
index 000000000000..e807f3d302e0
--- /dev/null
+++ b/dev-util/crash/crash-7.2.9.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/crash-utility/crash.git"
+ SRC_URI="http://ftp.gnu.org/gnu/gdb/gdb-7.6.tar.gz"
+ EGIT_BRANCH="master"
+ KEYWORDS=""
+ inherit git-r3
+else
+ SRC_URI="https://github.com/crash-utility/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+ mirror://gnu/gdb/gdb-7.6.tar.gz"
+ KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86"
+fi
+
+DESCRIPTION="Red Hat crash utility; used for analyzing kernel core dumps"
+HOMEPAGE="https://github.com/crash-utility/crash"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+# there is no "make test" target, but there is a test.c so the automatic
+# make rules catch it and tests fail
+RESTRICT="test"
+
+src_prepare() {
+ sed -i -e "s|ar -rs|\${AR} -rs|g" Makefile || die
+ ln -s "${DISTDIR}"/gdb-7.6.tar.gz . || die
+ default
+}
+
+src_compile() {
+ emake \
+ CC="$(tc-getCC)" \
+ AR="$(tc-getAR)" \
+ CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
diff --git a/dev-util/crash/crash-9999.ebuild b/dev-util/crash/crash-9999.ebuild
new file mode 100644
index 000000000000..e807f3d302e0
--- /dev/null
+++ b/dev-util/crash/crash-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/crash-utility/crash.git"
+ SRC_URI="http://ftp.gnu.org/gnu/gdb/gdb-7.6.tar.gz"
+ EGIT_BRANCH="master"
+ KEYWORDS=""
+ inherit git-r3
+else
+ SRC_URI="https://github.com/crash-utility/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+ mirror://gnu/gdb/gdb-7.6.tar.gz"
+ KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~ppc64 ~s390 ~x86"
+fi
+
+DESCRIPTION="Red Hat crash utility; used for analyzing kernel core dumps"
+HOMEPAGE="https://github.com/crash-utility/crash"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+# there is no "make test" target, but there is a test.c so the automatic
+# make rules catch it and tests fail
+RESTRICT="test"
+
+src_prepare() {
+ sed -i -e "s|ar -rs|\${AR} -rs|g" Makefile || die
+ ln -s "${DISTDIR}"/gdb-7.6.tar.gz . || die
+ default
+}
+
+src_compile() {
+ emake \
+ CC="$(tc-getCC)" \
+ AR="$(tc-getAR)" \
+ CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
diff --git a/dev-util/cscope/cscope-15.8a-r1.ebuild b/dev-util/cscope/cscope-15.8a-r1.ebuild
index 4066a627c273..27c8ef995bd4 100644
--- a/dev-util/cscope/cscope-15.8a-r1.ebuild
+++ b/dev-util/cscope/cscope-15.8a-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz"
LICENSE="BSD GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="emacs"
RDEPEND=">=sys-libs/ncurses-5.2:0=
diff --git a/dev-util/cscope/cscope-15.8a-r2.ebuild b/dev-util/cscope/cscope-15.8a-r2.ebuild
index b323a7adbf52..d9aea3bf8096 100644
--- a/dev-util/cscope/cscope-15.8a-r2.ebuild
+++ b/dev-util/cscope/cscope-15.8a-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz"
LICENSE="BSD GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
IUSE="emacs"
RDEPEND=">=sys-libs/ncurses-5.2:0=
diff --git a/dev-util/cscope/cscope-15.9.ebuild b/dev-util/cscope/cscope-15.9.ebuild
index 3988c7f37dd8..676b01e572b4 100644
--- a/dev-util/cscope/cscope-15.9.ebuild
+++ b/dev-util/cscope/cscope-15.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz"
LICENSE="BSD GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
IUSE="emacs"
RDEPEND=">=sys-libs/ncurses-5.2:0=
diff --git a/dev-util/ctags/ctags-20190331.ebuild b/dev-util/ctags/ctags-20190331.ebuild
index 0416d1961e3d..667aae24cf15 100644
--- a/dev-util/ctags/ctags-20190331.ebuild
+++ b/dev-util/ctags/ctags-20190331.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/universal-ctags/ctags/archive/${COMMITHASH}.tar.gz -
LICENSE="GPL-2+"
SLOT="0"
-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 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="json xml yaml"
CDEPEND="
diff --git a/dev-util/cvise/Manifest b/dev-util/cvise/Manifest
index e1778a01a2aa..262ee4b4ea2f 100644
--- a/dev-util/cvise/Manifest
+++ b/dev-util/cvise/Manifest
@@ -1,4 +1,3 @@
-DIST cvise-1.6.0.tar.gz 243050 BLAKE2B 64c305426dbeaf2e3f3a92a902209b35fcc76b5f5a6d2e48fcc8e24d1325badc0839e70afa1381c6d1412c22a7e9dd41ca03d6ca714fa5082958378cc8863000 SHA512 9d4ee043c34748b600b49ac4f00463b853faff2809f8b581e9b07433a8f3bef4436d0e5d5a9dbff1b2d7c3a8ab1d6d4823e78787eb3e911a683808703b2e24b6
-DIST cvise-1.7.0.tar.gz 248515 BLAKE2B b1a2ca8abc7a09c240a7ae39400e3e60ca641dd0dff4edb34f43d755619ec47bb7a0d25fd6b4461bf80a3be14a63c6e56d0e3e758827ca7c2ef90370aba5d539 SHA512 2e0115355c0ca3cdf593ad4a8d0079ea0ea193234ff4fcae8bdc7c0244cc7b8672025682821279b826fda97f80dc71455390d709836acb671c19772f13156de5
-DIST cvise-1.8.0.tar.gz 248744 BLAKE2B 5196a2bb68c0f9ca1a8219ee0dccae80aa7adac64df5bc4c7601a8ef81048875bfa3d8fb2e8c407cfa8f238739733ad4fbdf08bb14a72ec208d562bd7e69ba84 SHA512 eaef3506f0fcd54953271494ebdbd043c028cd98c4a976bc2d978112c28d27d5d307527db52c2a3f8f153b52430ba9c61ad072dcae5a6e0b9bfb8be844a50bab
DIST cvise-1.9.0.tar.gz 249042 BLAKE2B 357d429afc43691e616dba31621d1de89fb1f85fcbc177847b3367aac993ccd2c3bec20226e910a319d5d6194b32d0be9704e4fa7b8fce49f23788d10a378012 SHA512 518c48b7b9d9af9b856bfc46d4fb8064bca3730735bdabf2b3aa981a3f743fa6988594b7cbe39da71ac01fbadb4a45e5212d7c79b510fa36d86055978829495b
+DIST cvise-2.0.0.tar.gz 249307 BLAKE2B ba1a70da71706969a35b1223ad0c0fa1a1d4caf7f70eef184adc4dbc69586be6a33bdf11d7c1b606ea4b20d4cd2bf68170aabc1764364c235fe5f67182419080 SHA512 e49ca9919ced9db67b16af4b8a7cd3c18c7d96dea5724c9ee6d60736c8f34074d68ade151be702794c93b24943d167278e1c1a6e6f67a9a1422f695f3a177e46
+DIST cvise-2.1.0.tar.gz 249215 BLAKE2B e36def48de68dfb91990fd1daced56ae5fc9a32070bae3a696e7c21980757e30ccc8ef2d4940c391a72417296968f0dad680ffe6ca3c88104f09839d86174e27 SHA512 bc239ddb207bc6bb70d1a131df7ca0c13c4a3921382613aebb319f1cb1d5f19be273e82945e4f1c9479eaeac07bbb8a9c4c7f515e0474fe6bede84afd20b560c
diff --git a/dev-util/cvise/cvise-1.6.0.ebuild b/dev-util/cvise/cvise-1.6.0.ebuild
deleted file mode 100644
index 488fb98c07d0..000000000000
--- a/dev-util/cvise/cvise-1.6.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-: ${CMAKE_MAKEFILE_GENERATOR=ninja}
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit cmake llvm python-single-r1
-
-DESCRIPTION="Super-parallel Python port of the C-Reduce"
-HOMEPAGE="https://github.com/marxin/cvise/"
-SRC_URI="
- https://github.com/marxin/cvise/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-LLVM_MAX_SLOT=12
-DEPEND="
- || (
- sys-devel/clang:12
- sys-devel/clang:11
- sys-devel/clang:10
- )
- <=sys-devel/clang-$(( LLVM_MAX_SLOT + 1 )):="
-RDEPEND="${DEPEND}
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/pebble[${PYTHON_USEDEP}]
- ')
- dev-util/unifdef
- sys-devel/flex"
-BDEPEND="
- ${PYTHON_DEPS}
- sys-devel/flex
- test? (
- $(python_gen_cond_dep '
- dev-python/pebble[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- ')
- )"
-
-llvm_check_deps() {
- has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
- python-single-r1_pkg_setup
- llvm_pkg_setup
-}
-
-src_test() {
- cd "${BUILD_DIR}" || die
- pytest -vv || die
-}
diff --git a/dev-util/cvise/cvise-1.9.0.ebuild b/dev-util/cvise/cvise-1.9.0.ebuild
index fae93cacc4d0..0f2adf3e1c5d 100644
--- a/dev-util/cvise/cvise-1.9.0.ebuild
+++ b/dev-util/cvise/cvise-1.9.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
LICENSE="UoI-NCSA"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
REQUIRED_USE=${PYTHON_REQUIRED_USE}
diff --git a/dev-util/cvise/cvise-1.8.0.ebuild b/dev-util/cvise/cvise-2.0.0.ebuild
index 869886641444..216b717afe59 100644
--- a/dev-util/cvise/cvise-1.8.0.ebuild
+++ b/dev-util/cvise/cvise-2.0.0.ebuild
@@ -45,6 +45,10 @@ BDEPEND="
')
)"
+PATCHES=(
+ "${FILESDIR}"/${P}-shebang.patch
+)
+
llvm_check_deps() {
has_version "sys-devel/clang:${LLVM_SLOT}"
}
@@ -54,6 +58,11 @@ pkg_setup() {
llvm_pkg_setup
}
+src_prepare() {
+ sed -i -e 's:-n auto::' -e 's:--flake8::' setup.cfg || die
+ cmake_src_prepare
+}
+
src_test() {
cd "${BUILD_DIR}" || die
pytest -vv || die
diff --git a/dev-util/cvise/cvise-1.7.0-r1.ebuild b/dev-util/cvise/cvise-2.1.0.ebuild
index 869886641444..97388cfe8f58 100644
--- a/dev-util/cvise/cvise-1.7.0-r1.ebuild
+++ b/dev-util/cvise/cvise-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -54,6 +54,11 @@ pkg_setup() {
llvm_pkg_setup
}
+src_prepare() {
+ sed -i -e 's:-n auto::' -e 's:--flake8::' setup.cfg || die
+ cmake_src_prepare
+}
+
src_test() {
cd "${BUILD_DIR}" || die
pytest -vv || die
diff --git a/dev-util/cvise/files/cvise-2.0.0-shebang.patch b/dev-util/cvise/files/cvise-2.0.0-shebang.patch
new file mode 100644
index 000000000000..26bfe9678ebb
--- /dev/null
+++ b/dev-util/cvise/files/cvise-2.0.0-shebang.patch
@@ -0,0 +1,34 @@
+From 492d2d759d35bec39aca137906046b76151b56d1 Mon Sep 17 00:00:00 2001
+From: Martin Liska <mliska@suse.cz>
+Date: Sun, 15 Nov 2020 12:12:04 +0100
+Subject: [PATCH] Add Leap 15 and fix shebang.
+
+---
+ build_and_test.sh | 2 +-
+ cvise.py | 2 +-
+ 4 files changed, 22 insertions(+), 2 deletions(-)
+ create mode 100644 Docker/Dockerfile-opensuselp15-llvm9
+
+diff --git a/build_and_test.sh b/build_and_test.sh
+index 95c1539..b726dd4 100755
+--- a/build_and_test.sh
++++ b/build_and_test.sh
+@@ -1,4 +1,4 @@
+-#!/usr/bin/bash
++#!/bin/bash
+
+ BUILD_TYPE=$1
+
+diff --git a/cvise.py b/cvise.py
+index 15efaf6..7f318f2 100755
+--- a/cvise.py
++++ b/cvise.py
+@@ -260,7 +260,7 @@ def get_available_pass_groups():
+ script = None
+ if args.commands:
+ with tempfile.NamedTemporaryFile(mode='w', delete=False, suffix='.sh') as script:
+- script.write('#!/usr/bin/bash\n\n')
++ script.write('#!/bin/bash\n\n')
+ script.write(args.commands + '\n')
+ os.chmod(script.name, 0o744)
+ logging.info('Using temporary interestingness test: %s' % script.name)
diff --git a/dev-util/cwdiff/cwdiff-0.4.0.ebuild b/dev-util/cwdiff/cwdiff-0.4.0.ebuild
index 77fac3a57420..c6d9a4320020 100644
--- a/dev-util/cwdiff/cwdiff-0.4.0.ebuild
+++ b/dev-util/cwdiff/cwdiff-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -9,7 +9,7 @@ if [ "${PV}" = "9999" ]; then
KEYWORDS=""
else
SRC_URI="https://github.com/junghans/cwdiff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x64-macos ~x86-macos"
+ KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x64-macos"
fi
DESCRIPTION="A script that wraps wdiff to support directories and colorize the output"
diff --git a/dev-util/cwdiff/cwdiff-9999.ebuild b/dev-util/cwdiff/cwdiff-9999.ebuild
index 59f7eb49bc90..bf86708882c7 100644
--- a/dev-util/cwdiff/cwdiff-9999.ebuild
+++ b/dev-util/cwdiff/cwdiff-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ if [ "${PV}" = "9999" ]; then
KEYWORDS=""
else
SRC_URI="https://github.com/junghans/cwdiff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x64-macos ~x86-macos"
+ KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x64-macos"
fi
DESCRIPTION="A script that wraps wdiff to support directories and colorize the output"
diff --git a/dev-util/datagrip/Manifest b/dev-util/datagrip/Manifest
deleted file mode 100644
index db16c1611c36..000000000000
--- a/dev-util/datagrip/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST datagrip-2020.3.tar.gz 443012748 BLAKE2B 40e93699b8c47a086cda507489c5002c7992e35d4fba53c08713d3e0ae36efd07b2360e1f41df2b3ac44ea0958c45284273ba52c29e81732589023e9c3a6e6d9 SHA512 603fe51c3301f42fc12c5b41d9e66ab212cb3d103c631b8121850a4bf8ff646ad30b2075cfecfc37354bc004cdf8594bc15b7fbb0d8c7a4335223bfa917b5b80
-EBUILD datagrip-2020.3.ebuild 1449 BLAKE2B f3dbe5fb3372f06bbe024e76adf29df54857d4cf2f0720322863df6b1c27045f87dd98a1bc0e507e6f4f86066364261e4f7933550dc1a80f62f32f77ea697a1f SHA512 ea8f9e0c111c352455c3533127530b60f71209e3990dc24302c6920fdfccb452421bbe9fed14553350e8f90e529f333544c31b6ff5c38f7f32f4e68edde136ea
-EBUILD datagrip-9999.ebuild 1449 BLAKE2B f3dbe5fb3372f06bbe024e76adf29df54857d4cf2f0720322863df6b1c27045f87dd98a1bc0e507e6f4f86066364261e4f7933550dc1a80f62f32f77ea697a1f SHA512 ea8f9e0c111c352455c3533127530b60f71209e3990dc24302c6920fdfccb452421bbe9fed14553350e8f90e529f333544c31b6ff5c38f7f32f4e68edde136ea
diff --git a/dev-util/datagrip/datagrip-2020.3.ebuild b/dev-util/datagrip/datagrip-2020.3.ebuild
deleted file mode 100644
index 49a78c76c818..000000000000
--- a/dev-util/datagrip/datagrip-2020.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg
-
-DESCRIPTION="Many databases, one tool"
-HOMEPAGE="https://www.jetbrains.com/datagrip"
-LICENSE="JetBrains"
-
-SLOT="0"
-
-BDEPEND="
- app-arch/tar
-"
-
-RDEPEND="
- virtual/jdk
- dev-libs/libdbusmenu
-"
-
-RESTRICT="bindist mirror strip"
-
-MY_PN="datagrip"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-if [[ ${PV} != 9999 ]]; then
- SRC_URI="https://download.jetbrains.com/datagrip/${PN}-${PV}.tar.gz"
- KEYWORDS="*"
-fi
-
-src_unpack() {
- default
- mv "${WORKDIR}"/DataGrip* "${S}" || die "Failed to move/rename source dir"
-}
-
-src_prepare() {
- default
-
- # Remove any bundled Java
- rm -rf {jbr,jre{64}} || die "Failed to remove bundled Java"
-}
-
-src_install() {
-
- insinto "/opt/${PN}"
- doins -r *
-
- fperms 755 /opt/${PN}/bin/{format.sh,datagrip.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
-
- dosym ../../opt/${PN}/bin/datagrip.sh /usr/bin/${PN}
-
- newicon "bin/${PN}.png" "${PN}.png"
- make_desktop_entry "${PN}" "DataGrip" "${PN}" "Development;Programming;IDE;"
-
- # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
- mkdir -p "${D}/etc/sysctl.d/" || die
- echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_icon_cache_update
-}
diff --git a/dev-util/datagrip/datagrip-9999.ebuild b/dev-util/datagrip/datagrip-9999.ebuild
deleted file mode 100644
index 49a78c76c818..000000000000
--- a/dev-util/datagrip/datagrip-9999.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg
-
-DESCRIPTION="Many databases, one tool"
-HOMEPAGE="https://www.jetbrains.com/datagrip"
-LICENSE="JetBrains"
-
-SLOT="0"
-
-BDEPEND="
- app-arch/tar
-"
-
-RDEPEND="
- virtual/jdk
- dev-libs/libdbusmenu
-"
-
-RESTRICT="bindist mirror strip"
-
-MY_PN="datagrip"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-if [[ ${PV} != 9999 ]]; then
- SRC_URI="https://download.jetbrains.com/datagrip/${PN}-${PV}.tar.gz"
- KEYWORDS="*"
-fi
-
-src_unpack() {
- default
- mv "${WORKDIR}"/DataGrip* "${S}" || die "Failed to move/rename source dir"
-}
-
-src_prepare() {
- default
-
- # Remove any bundled Java
- rm -rf {jbr,jre{64}} || die "Failed to remove bundled Java"
-}
-
-src_install() {
-
- insinto "/opt/${PN}"
- doins -r *
-
- fperms 755 /opt/${PN}/bin/{format.sh,datagrip.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
-
- dosym ../../opt/${PN}/bin/datagrip.sh /usr/bin/${PN}
-
- newicon "bin/${PN}.png" "${PN}.png"
- make_desktop_entry "${PN}" "DataGrip" "${PN}" "Development;Programming;IDE;"
-
- # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
- mkdir -p "${D}/etc/sysctl.d/" || die
- echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_icon_cache_update
-}
diff --git a/dev-util/ddd/ddd-3.3.12-r4.ebuild b/dev-util/ddd/ddd-3.3.12-r4.ebuild
index 5d5268c2c714..101061bf64f5 100644
--- a/dev-util/ddd/ddd-3.3.12-r4.ebuild
+++ b/dev-util/ddd/ddd-3.3.12-r4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/ddd"
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3 LGPL-3 FDL-1.1"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
SLOT="0"
IUSE="readline"
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index 1b15275560d6..30e0128647b5 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,4 +1 @@
-DIST debhelper_13.1.tar.xz 530828 BLAKE2B 582dccdad50a51907d2565fef34fefeebf79360af31691ad0c332bb04b12a2165af598a3d35088595aee3653ca27f049e22669236ee48376ab665ea7423c6d5e SHA512 8160a31a857c9e548e0c5527eb4c86fb5c452e5209a741c7a4600f03a48fd5b46fe07c4d1c64ad11c3af3b9f2e1d67df2d4e9d773bc432d6147540dab015e977
DIST debhelper_13.2.1.tar.xz 541428 BLAKE2B eb377a09fe23aef159c6a8309c1a63df94be2a1dbf313af32868f9a01e394438c98f02cbd18077cf22998e693c171244e42d33fa503e591030f4fe4248bfbc53 SHA512 38b52b03b65832a33260a7b0d1f08e6079b60318964603ffa0729cb3f56adebe81dbfb82a1785b019100e697cc6b13c212518c4608c0bb2018500be328157b0c
-DIST debhelper_13.2.tar.xz 540400 BLAKE2B a1734ecbd92eadc3f5fbd0b118ffb4c6b697b157c39cab7626bd734adb80c6dfd0061298220c5d5c7a7fff412a1a52490e7001c8d634596dc41389a7e81c7a74 SHA512 07fd1f32975a9d84940a15140875994d30fe4bc0a40b40fe83a1ff9a304121167345194802691326251490852e601c388cab5cd02c000a4a6768edd1259a7bbc
-DIST debhelper_9.20160814.tar.xz 344328 BLAKE2B 38791ab3dfb74d12e44226b79a377889911a08505cdb45cc0a6e653906edbafcac1038d1d9ff9f5fd9f714ed36681562ce7fb1c9c1109a8528523100128fced6 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62
diff --git a/dev-util/debhelper/debhelper-13.1.ebuild b/dev-util/debhelper/debhelper-13.1.ebuild
deleted file mode 100644
index 99dca21e93e2..000000000000
--- a/dev-util/debhelper/debhelper-13.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
-HOMEPAGE="https://tracker.debian.org/pkg/debhelper"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-DH_LANGS=( de es fr )
-IUSE+=" ${DH_LANGS[@]/#/l10n_}"
-
-NLS_DEPEND=$(
- printf "l10n_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LANGS[@]}
-)
-
-RDEPEND="
- >=dev-lang/perl-5.10:=
- >=app-arch/dpkg-1.17
- dev-perl/TimeDate
- virtual/perl-Getopt-Long
-"
-DEPEND="
- ${RDEPEND}
- ${NLS_DEPEND}
- test? (
- dev-perl/Test-Pod
- sys-apps/fakeroot
- )
-"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
- tc-export CC
-
- local LANGS="" USE_NLS=no lang
- for lang in ${DH_LANGS[@]}; do
- if use l10n_${lang}; then
- LANGS+=" ${lang}"
- USE_NLS=yes
- fi
- done
-
- emake USE_NLS="${USE_NLS}" LANGS="${LANGS}" build
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
- dodoc doc/* debian/changelog
- docinto examples
- dodoc examples/*
- local lang
- for manfile in *.1 *.7 ; do
- for lang in ${DH_LANGS[@]}; do
- case ${manfile} in
- *.${lang}.?)
- use l10n_${lang} \
- && cp ${manfile} "${T}"/${manfile/.${lang}/} \
- && doman -i18n=${lang} "${T}"/${manfile/.${lang}/}
- ;;
- *)
- doman ${manfile}
- ;;
- esac
- done
- done
-}
diff --git a/dev-util/debhelper/debhelper-13.2.ebuild b/dev-util/debhelper/debhelper-13.2.ebuild
deleted file mode 100644
index 99dca21e93e2..000000000000
--- a/dev-util/debhelper/debhelper-13.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
-HOMEPAGE="https://tracker.debian.org/pkg/debhelper"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-DH_LANGS=( de es fr )
-IUSE+=" ${DH_LANGS[@]/#/l10n_}"
-
-NLS_DEPEND=$(
- printf "l10n_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LANGS[@]}
-)
-
-RDEPEND="
- >=dev-lang/perl-5.10:=
- >=app-arch/dpkg-1.17
- dev-perl/TimeDate
- virtual/perl-Getopt-Long
-"
-DEPEND="
- ${RDEPEND}
- ${NLS_DEPEND}
- test? (
- dev-perl/Test-Pod
- sys-apps/fakeroot
- )
-"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
- tc-export CC
-
- local LANGS="" USE_NLS=no lang
- for lang in ${DH_LANGS[@]}; do
- if use l10n_${lang}; then
- LANGS+=" ${lang}"
- USE_NLS=yes
- fi
- done
-
- emake USE_NLS="${USE_NLS}" LANGS="${LANGS}" build
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
- dodoc doc/* debian/changelog
- docinto examples
- dodoc examples/*
- local lang
- for manfile in *.1 *.7 ; do
- for lang in ${DH_LANGS[@]}; do
- case ${manfile} in
- *.${lang}.?)
- use l10n_${lang} \
- && cp ${manfile} "${T}"/${manfile/.${lang}/} \
- && doman -i18n=${lang} "${T}"/${manfile/.${lang}/}
- ;;
- *)
- doman ${manfile}
- ;;
- esac
- done
- done
-}
diff --git a/dev-util/debhelper/debhelper-9.20160814.ebuild b/dev-util/debhelper/debhelper-9.20160814.ebuild
deleted file mode 100644
index 9d112116aeee..000000000000
--- a/dev-util/debhelper/debhelper-9.20160814.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
-HOMEPAGE="https://packages.qa.debian.org/d/debhelper.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-DH_LANGS=( de es fr )
-IUSE+=" ${DH_LANGS[@]/#/l10n_}"
-
-NLS_DEPEND=$(
- printf "l10n_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LANGS[@]}
-)
-
-RDEPEND="
- >=dev-lang/perl-5.10:=
- >=app-arch/dpkg-1.17
- dev-perl/TimeDate
- virtual/perl-Getopt-Long
-"
-DEPEND="
- ${RDEPEND}
- ${NLS_DEPEND}
- test? (
- dev-perl/Test-Pod
- sys-apps/fakeroot
- )
-"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
- tc-export CC
-
- local LANGS="" USE_NLS=no lang
- for lang in ${DH_LANGS[@]}; do
- if use l10n_${lang}; then
- LANGS+=" ${lang}"
- USE_NLS=yes
- fi
- done
-
- emake USE_NLS="${USE_NLS}" LANGS="${LANGS}" build
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
- dodoc doc/* debian/changelog
- docinto examples
- dodoc examples/*
- local lang
- for manfile in *.1 *.7 ; do
- for lang in ${DH_LANGS[@]}; do
- case ${manfile} in
- *.${lang}.?)
- use l10n_${lang} \
- && cp ${manfile} "${T}"/${manfile/.${lang}/} \
- && doman -i18n=${lang} "${T}"/${manfile/.${lang}/}
- ;;
- *)
- doman ${manfile}
- ;;
- esac
- done
- done
-}
diff --git a/dev-util/debootstrap/debootstrap-1.0.123.ebuild b/dev-util/debootstrap/debootstrap-1.0.123.ebuild
index 20b3e32fc58f..612998309132 100644
--- a/dev-util/debootstrap/debootstrap-1.0.123.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.123.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="
app-arch/dpkg
diff --git a/dev-util/debugedit/Manifest b/dev-util/debugedit/Manifest
index b462aca4af10..2b1b5cf44447 100644
--- a/dev-util/debugedit/Manifest
+++ b/dev-util/debugedit/Manifest
@@ -1,2 +1 @@
-DIST rpm-4.16.0.tar.bz2 4341683 BLAKE2B 5161e5dcc6d9a1f1d4b8e44740fb368050b808fd9e8b8276fb17b530a4642e1b9ad104b5a30c0071215aef7f823eeab10988dd41f73af1c52d575529c374b5eb SHA512 177119c3ac3d48980db55bb4ba0fdbb2a911968e5efc690bfa8cc343f850fc90531cc0dee6dd8e45d2b14f0d951ced35bd8893d24011b7f270745d281ddf4e3d
-DIST rpm-4.16.1.tar.bz2 4348973 BLAKE2B 5f415099ed5b4f3425c1cbd02476c3066ef51e8efbe09829c0c7d9732cfdeed76ab0c5eed113a1b007d35bf5d5fb1c60543b7ef23319ba0f63550d598e98dcdd SHA512 cbce8381e7a0bdaf2c7529d0ac91fda15e663db7a76b02652d53327ebcd7d5b6b6154d5e88feeda87f71727a036e7a2afcd57c7dcddef610e32957b9e430d367
+DIST rpm-4.16.1.2.tar.bz2 4346745 BLAKE2B 17485b1e73b30586acb8e9be53bfb0bd430fa05e826755729c68367c798e8cad039f091731b6effbe9fa9b7d6c4018abd6feec94f032230cbbd6068e9080573a SHA512 066b67838312f9ad076285fe8f43527aded694f5562ead4e90df48675f2e99c1f2d68693fd20b2037e2614b978ed94c417753e2dbd055a9869b45264cd932afc
diff --git a/dev-util/debugedit/debugedit-4.16.0.ebuild b/dev-util/debugedit/debugedit-4.16.1.2.ebuild
index ffc8eec35d4e..66b35de69336 100644
--- a/dev-util/debugedit/debugedit-4.16.0.ebuild
+++ b/dev-util/debugedit/debugedit-4.16.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${MY_P}.tar.bz2"
LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~arm64 hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="
diff --git a/dev-util/debugedit/debugedit-4.16.1.ebuild b/dev-util/debugedit/debugedit-4.16.1.ebuild
deleted file mode 100644
index d2c338794406..000000000000
--- a/dev-util/debugedit/debugedit-4.16.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-MY_P=rpm-${PV}
-DESCRIPTION="Stand-alone debugedit from RPM"
-HOMEPAGE="https://rpm.org
- https://github.com/rpm-software-management/rpm"
-SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
- sys-libs/zlib:=
- >=dev-libs/popt-1.7
- >=dev-libs/elfutils-0.176-r1
- dev-libs/nss
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- eapply_user
-
- # cheat it into believing we're bundling db
- mkdir -p db/dist || die
- touch db/dist/configure || die
- chmod +x db/dist/configure || die
- echo 'install:' > db3/Makefile || die
-
- # TODO: why do we need to do this?
- mkdir rpm || die
- find -name '*.h' -exec cp {} rpm/ ';' || die
-}
-
-src_configure() {
- append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr"
- local myconf=(
- # force linking to static librpmio
- --disable-shared
-
- # disable linking compression libraries
- ac_cv_header_bzlib_h=no
- ac_cv_header_lzma_h=no
- --disable-zstd
-
- # fake some libraries we don't use
- ac_cv_header_magic_h=yes
- ac_cv_lib_magic_magic_open=yes
-
- # use nss as crypto provider
- --with-crypto=nss
-
- # disable other stuff irrelevant to debugedit
- --disable-bdb
- --disable-nls
- --disable-plugins
- --disable-python
- --without-acl
- --without-archive
- --without-cap
- --without-external-db
- --without-hackingdocs
- --without-lua
- --without-selinux
- )
- econf "${myconf[@]}"
-}
-
-src_compile() {
- emake -C misc
- emake -C rpmio
- emake debugedit
-}
-
-src_test() {
- :
-}
-
-src_install() {
- dobin debugedit
-}
diff --git a/dev-util/dejagnu/dejagnu-1.6.2.ebuild b/dev-util/dejagnu/dejagnu-1.6.2.ebuild
index c38a0a001a68..fdc74d5e5687 100644
--- a/dev-util/dejagnu/dejagnu-1.6.2.ebuild
+++ b/dev-util/dejagnu/dejagnu-1.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="dev-lang/tcl
diff --git a/dev-util/dejagnu/dejagnu-1.6.ebuild b/dev-util/dejagnu/dejagnu-1.6.ebuild
index 3d7081ad4691..438cca5e5e26 100644
--- a/dev-util/dejagnu/dejagnu-1.6.ebuild
+++ b/dev-util/dejagnu/dejagnu-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="dev-lang/tcl
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild
index dabde57ce4fa..e840c118b763 100644
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="emacs"
RDEPEND=">=dev-libs/glib-2.12:2
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
index 390c5208bb58..9735307edd5e 100644
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="emacs"
RDEPEND=">=dev-libs/glib-2.12:2"
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 68b62d3dbad7..2c3e666f0fc5 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1 +1,2 @@
DIST devhelp-3.36.2.tar.xz 302996 BLAKE2B 61131c7bedfe6803c04315138b017145e7ad7cc2939022a4cfcd0c65f4f3144db705a4a918a4ecd6a6fcea2a5dce64a891d951ccfc21dec0421991455b81ad16 SHA512 8852546b8ff337c2448a88b931803029825e34a6cf906370c683ac004866a548c9de79c934fde36ec04584f0bdc59eee4184b9ed8a480303eb78b9c9d43eb55e
+DIST devhelp-3.38.1.tar.xz 313948 BLAKE2B bd070c98e92a8968ffbac7e634c19730e7c63ee18d180a5d9dda7d831b28deea49a7aa50b17ca9a8b5a411276ac055074cb76ef8cde5017ca395d49bf4aecdf6 SHA512 bcdd61cd822ae3fbe2c9542c09d058760fc1fa0bbbd55b1fc0853b4fdbf1c3856d4fed8f2263f94f41096cbdc0a76394773d43a9072d8aa89274fa61a3c2a430
diff --git a/dev-util/devhelp/devhelp-3.36.2.ebuild b/dev-util/devhelp/devhelp-3.36.2.ebuild
index 03e88a189e7a..943b36518989 100644
--- a/dev-util/devhelp/devhelp-3.36.2.ebuild
+++ b/dev-util/devhelp/devhelp-3.36.2.ebuild
@@ -27,7 +27,7 @@ RDEPEND="${DEPEND}
gedit? (
${PYTHON_DEPS}
$(python_gen_cond_dep '
- app-editors/gedit[introspection,python,${PYTHON_SINGLE_USEDEP}]
+ app-editors/gedit[introspection(+),python,${PYTHON_SINGLE_USEDEP}]
dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
')
)
diff --git a/dev-util/devhelp/devhelp-3.38.1.ebuild b/dev-util/devhelp/devhelp-3.38.1.ebuild
new file mode 100644
index 000000000000..fc5c89164476
--- /dev/null
+++ b/dev-util/devhelp/devhelp-3.38.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="An API documentation browser for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
+
+LICENSE="GPL-3+ CC-BY-SA-4.0"
+SLOT="0/3-6" # subslot = 3-(libdevhelp-3 soname version)
+KEYWORDS="~amd64 ~arm ~ppc64 ~sparc ~x86"
+IUSE="gedit gtk-doc +introspection"
+REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+ >=dev-libs/glib-2.64:2
+ >=x11-libs/gtk+-3.22:3[introspection?]
+ >=net-libs/webkit-gtk-2.24:4[introspection?]
+ >=gui-libs/amtk-5.0:5
+ gnome-base/gsettings-desktop-schemas
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+ gedit? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ app-editors/gedit[introspection(+),python,${PYTHON_SINGLE_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+ ')
+ )
+"
+# libxml2 required for glib-compile-resources
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-libs/libxml2:2
+ dev-util/glib-utils
+ dev-util/itstool
+ gtk-doc? (
+ >=dev-util/gtk-doc-1.25
+ app-text/docbook-xml-dtd:4.3 )
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/3.30.1-optional-introspection.patch
+ "${FILESDIR}"/3.30.1-optional-gedit.patch
+)
+
+pkg_setup() {
+ use gedit && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ local emesonargs=(
+ -Dflatpak_build=false
+ $(meson_use gedit gedit_plugin)
+ $(meson_use gtk-doc gtk_doc)
+ $(meson_use introspection)
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+ use gedit && python_optimize "${ED}"/usr/$(get_libdir)/gedit/plugins
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/dev-util/dialog/dialog-1.3.20170131.ebuild b/dev-util/dialog/dialog-1.3.20170131.ebuild
index e77a403b7a80..db301d4e57c9 100644
--- a/dev-util/dialog/dialog-1.3.20170131.ebuild
+++ b/dev-util/dialog/dialog-1.3.20170131.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://invisible-island.net/${PN}/${MY_P}.tgz"
LICENSE="GPL-2"
SLOT="0/14"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="examples minimal nls static-libs unicode"
RDEPEND="
diff --git a/dev-util/dialog/dialog-1.3.20200327.ebuild b/dev-util/dialog/dialog-1.3.20200327.ebuild
index 7a23e6577d51..87b962bd543a 100644
--- a/dev-util/dialog/dialog-1.3.20200327.ebuild
+++ b/dev-util/dialog/dialog-1.3.20200327.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~jer/${DIA_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="examples minimal nls static-libs unicode"
RDEPEND="
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index f14592d65b93..b4b0a5a288a2 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,2 +1 @@
-DIST diffoscope-162.tar.gz 1564386 BLAKE2B e5ea37ae48c65dae3c850a04152c322e1e8535ad982107689f23a4111ec04b9b7766681b7e61f69c75bece271d8875ef2d109b315ec5d55ad77658a065148ed6 SHA512 a5de428b491adfadc432322eba524dc8031a6be9709887f2f290376bb94b358cec45a4a0a31b8fb5f25377a33752044882245a22d7f2b71b17d5efe002c850f4
-DIST diffoscope-163.tar.gz 1566445 BLAKE2B 4985d3a1e63fd2d4ef7cdf9e933e3ac6d1bc6c18a703bc92a8dc573b368c5989107debd57d96cfa40fe9e48d43b8ef0a07143ee48dd982a4a71b914a8e4d64ae SHA512 fc02d864c9a4b799aec45b88646f68de4f559366462b2057094592dfd3bff94213c17ea048b98070ae9a1f2f30d0e8d58d630b643e198dd85369cadea227a7e4
+DIST diffoscope-164.tar.gz 1568354 BLAKE2B ee9aea028e8719d45cc077108c42e36b1a74eff0c6c191e81daf43e68c0f3307eb4335ce8dea547377cd7146f1aa5020ac5b56f24239789a74bec5bc6c3048bc SHA512 816f19801b200a05c01cbc2da408074915b626847eb133e96404a4dce883d5626f31bfd525373e899bf92592d790a4b5ca9920c168859e41f81cb6c4b78bf79f
diff --git a/dev-util/diffoscope/diffoscope-163.ebuild b/dev-util/diffoscope/diffoscope-163.ebuild
deleted file mode 100644
index 8b3fee434220..000000000000
--- a/dev-util/diffoscope/diffoscope-163.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg gzip haskell hdf5 hex imagemagick iso java llvm
-mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar tcpdump xz zip zstd"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
- dev-python/libarchive-c[${PYTHON_USEDEP}]
- dev-python/distro[${PYTHON_USEDEP}]
- acl? ( sys-apps/acl )
- binutils? ( sys-devel/binutils )
- bzip2? ( app-arch/bzip2 )
- libcaca? ( media-libs/libcaca )
- colord? ( x11-misc/colord )
- cpio? ( app-arch/cpio )
- diff? ( sys-apps/diffutils )
- docx? ( app-text/docx2txt )
- dtc? ( sys-apps/dtc )
- e2fsprogs? ( sys-fs/e2fsprogs )
- file? ( sys-apps/file )
- find? ( sys-apps/findutils )
- gettext? ( sys-devel/gettext )
- gif? ( media-libs/giflib )
- gpg? ( app-crypt/gnupg )
- gzip? ( app-arch/gzip )
- haskell? ( dev-lang/ghc )
- hdf5? ( sci-libs/hdf5 )
- hex? ( app-editors/vim-core )
- imagemagick? ( media-gfx/imagemagick )
- iso? ( virtual/cdrtools )
- java? ( virtual/jdk )
- llvm? ( sys-devel/llvm )
- mono? ( dev-lang/mono )
- opendocument? ( app-text/odt2txt )
- pascal? ( dev-lang/fpc )
- pdf? (
- app-text/pdftk
- app-text/poppler
- dev-python/PyPDF2[${PYTHON_USEDEP}]
- )
- postscript? ( app-text/ghostscript-gpl )
- R? ( dev-lang/R )
- rpm? ( app-arch/rpm )
- sqlite? ( dev-db/sqlite:3 )
- squashfs? ( sys-fs/squashfs-tools )
- ssh? ( net-misc/openssh )
- tar? ( app-arch/tar )
- tcpdump? ( net-analyzer/tcpdump )
- xz? ( app-arch/xz-utils )
- zip? ( app-arch/unzip )
- zstd? ( app-arch/zstd )
-"
-# Presence if filemagic's magic.py breaks imports
-# of dev-python/python-magic: https://bugs.gentoo.org/716482
-RDEPEND+=" !dev-python/filemagic"
diff --git a/dev-util/diffoscope/diffoscope-162.ebuild b/dev-util/diffoscope/diffoscope-164-r1.ebuild
index 8b3fee434220..1ebe18777dc9 100644
--- a/dev-util/diffoscope/diffoscope-162.ebuild
+++ b/dev-util/diffoscope/diffoscope-164-r1.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_REQ_USE="ncurses"
DISTUTILS_USE_SETUPTOOLS=rdepend
+
inherit distutils-r1
DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
@@ -43,7 +45,7 @@ RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
hdf5? ( sci-libs/hdf5 )
hex? ( app-editors/vim-core )
imagemagick? ( media-gfx/imagemagick )
- iso? ( virtual/cdrtools )
+ iso? ( app-cdr/cdrtools )
java? ( virtual/jdk )
llvm? ( sys-devel/llvm )
mono? ( dev-lang/mono )
diff --git a/dev-util/diffoscope/metadata.xml b/dev-util/diffoscope/metadata.xml
index 9a4f99979b55..86b145e06979 100644
--- a/dev-util/diffoscope/metadata.xml
+++ b/dev-util/diffoscope/metadata.xml
@@ -25,7 +25,7 @@
<flag name="haskell">Use <pkg>dev-lang/ghc</pkg></flag>
<flag name="hdf5">Use <pkg>sci-libs/hdf5</pkg></flag>
<flag name="hex">Use <pkg>app-editors/vim-core</pkg></flag>
- <flag name="iso">Use <pkg>virtual/cdrtools</pkg></flag>
+ <flag name="iso">Use <pkg>app-cdr/cdrtools</pkg></flag>
<flag name="llvm">Use <pkg>sys-devel/llvm</pkg></flag>
<flag name="opendocument">Use <pkg>app-text/odt2txt</pkg></flag>
<flag name="pascal">Use <pkg>dev-lang/fpc</pkg></flag>
diff --git a/dev-util/diffstat/Manifest b/dev-util/diffstat/Manifest
index 2589c013a8bf..75495af177fe 100644
--- a/dev-util/diffstat/Manifest
+++ b/dev-util/diffstat/Manifest
@@ -1,3 +1,2 @@
-DIST diffstat-1.60.tgz 255922 BLAKE2B 325be7c283580066cd5c2665078320d33f9a97761a641ce53e7a53200cfdd0d047adb3bec527a5c8489320a685bd43979066465886fefd7ce5a29926c43dd95b SHA512 6cbcff7dfe6d51583d59d2c9dfe4cb958202491ca3c4b1096616380564a1842065434d30858c55c3ddcfc76cd07b58dfc4c4cb6cfdcf6346af60998170f51bd2
-DIST diffstat-1.61.tgz 257242 BLAKE2B 8506944255991f3fb093c77e04d1c19e75cce5deffe7ade19f6917c9775e00d02cc8013fcd88440a9d116b66859ffebb0d1c92755ca0ebcca465dd0595fe4bd2 SHA512 48166e1241904b955c0f5543b1f11724a1a91516fcba5ad0603441d985728de3e0fca5f5212704dd0fc9a9e5062788b1b34062869137fd851932233d4abad114
DIST diffstat-1.63.tgz 270855 BLAKE2B 01a54c49200396a102c42d982e952d38d23c78452ae467e799d29ae1199aa179927ff719955d700081c4b4f4296c0b73229fa35823e3e18f80b2edc51e3316e2 SHA512 e1319f95088e615d442b0b02af922605d0c76e15ba2f0e8cf8c4db56949ac63f4a6e3e42099254480b9aab388cbd6550f515ed4d4995c6723d24f392d1872b16
+DIST diffstat-1.64.tgz 278873 BLAKE2B 41500977adacf492498a7ea38d5f5a7bb5a31d5e39a202c72ee344ad1996f36c493ff18af74cf4dda18d47617832351fd55e386f008493c39f4b64e6d3f01910 SHA512 d647477beb49b0999c5de41d084da827528571c4848f40c69c2d64d060fc89848d15d03d59b1a31d79f02180f81d92cdf6e19d0172482bc569cf2a87476f12cf
diff --git a/dev-util/diffstat/diffstat-1.60.ebuild b/dev-util/diffstat/diffstat-1.60.ebuild
deleted file mode 100644
index 966f2ca240ac..000000000000
--- a/dev-util/diffstat/diffstat-1.60.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="Display a histogram of diff changes"
-HOMEPAGE="https://invisible-island.net/diffstat/"
-SRC_URI="ftp://invisible-island.net/diffstat/${P}.tgz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-src_configure() {
- # We can drop this once a new release is made w/newer autotools.
- export CONFIG_SHELL="/bin/bash" #529744
- default
-}
diff --git a/dev-util/diffstat/diffstat-1.63.ebuild b/dev-util/diffstat/diffstat-1.63.ebuild
index 45af0bc677c2..1023f662646d 100644
--- a/dev-util/diffstat/diffstat-1.63.ebuild
+++ b/dev-util/diffstat/diffstat-1.63.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,5 +9,5 @@ SRC_URI="https://invisible-mirror.net/archives/${PN}/${P}.tgz"
LICENSE="HPND"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE=""
diff --git a/dev-util/diffstat/diffstat-1.61.ebuild b/dev-util/diffstat/diffstat-1.64.ebuild
index c50844280a39..f72e1c0d0024 100644
--- a/dev-util/diffstat/diffstat-1.61.ebuild
+++ b/dev-util/diffstat/diffstat-1.64.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
DESCRIPTION="Display a histogram of diff changes"
HOMEPAGE="https://invisible-island.net/diffstat/"
-SRC_URI="ftp://invisible-island.net/diffstat/${P}.tgz"
+SRC_URI="https://invisible-mirror.net/archives/${PN}/${P}.tgz"
LICENSE="HPND"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
diff --git a/dev-util/dmake/dmake-4.12.2.ebuild b/dev-util/dmake/dmake-4.12.2.ebuild
index 0f81ca5ffa72..c31db3ef0f51 100644
--- a/dev-util/dmake/dmake-4.12.2.ebuild
+++ b/dev-util/dmake/dmake-4.12.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://${PN}.apache-extras.org.codespot.com/files/${P}.tar.bz2"
LICENSE="GPL-1"
SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
# test failure, reported upstream at
# https://code.google.com/a/apache-extras.org/p/dmake/issues/detail?id=1
diff --git a/dev-util/dogtail/dogtail-0.9.11.ebuild b/dev-util/dogtail/dogtail-0.9.11.ebuild
index 0b51e5a80c03..424fba4e9546 100644
--- a/dev-util/dogtail/dogtail-0.9.11.ebuild
+++ b/dev-util/dogtail/dogtail-0.9.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/dev-util/dwarves/dwarves-1.19.ebuild b/dev-util/dwarves/dwarves-1.19.ebuild
index e0bdb382c45a..08387ce9db3d 100644
--- a/dev-util/dwarves/dwarves-1.19.ebuild
+++ b/dev-util/dwarves/dwarves-1.19.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
LICENSE="GPL-2" # only
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
IUSE="debug"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/dwdiff/Manifest b/dev-util/dwdiff/Manifest
index 04b9e7a45553..b48c24cb665d 100644
--- a/dev-util/dwdiff/Manifest
+++ b/dev-util/dwdiff/Manifest
@@ -1,3 +1 @@
-DIST dwdiff-2.1.1.tar.bz2 79628 BLAKE2B eb024d9c0eff18de9eee4a0fcf2d6a9ef6b049286ebb7f9715ddf18d920cacaab2738f04607b358be784f9d3e1c25f279ede620d412fad026f3280b9f8ee471f SHA512 b3392ef01c0701ea7738f1b539dab81727735e5de8ea77b56feae4e2f64dbda0155b479d7be0eedb65fc56ebc8d1a22c1ca67075abdec54205ad9c305b3751b7
-DIST dwdiff-2.1.2.tar.bz2 79282 BLAKE2B c938c9684d6ee1abacd77c1570b88157548e217e1837758f6c45266e29abc3857c6d4275d72126c29cc361e484722fe1d8c85a3714ac909b35a06d8390fb6506 SHA512 e4897ec3990261ddadf1fd4287902dd74c8350d11448714be8ea4b7808fc7d419ca2fd7fe65f347f46fdb1090d2d116c180a53fde3ff095027765f40acaa1c91
DIST dwdiff-2.1.3.tar.bz2 79862 BLAKE2B 72eb07071de413526b70ebfd30030394c8bc4958bd14128b9a8b87a76561e4bfbd61064def314a4b989da027664d999cfb9a4ac9ab6f1b06cbe3f38f271e538e SHA512 e4375658ddb919d763bedacd122e5597a4c3cd40ddff2c954c6cc88e5047d20d4d3b18eaf75c6835be21e1f72e2622e25b212ae9882d8eaa36874af3f6de4b3f
diff --git a/dev-util/dwdiff/dwdiff-2.1.1.ebuild b/dev-util/dwdiff/dwdiff-2.1.1.ebuild
deleted file mode 100644
index 87a39fe8de0e..000000000000
--- a/dev-util/dwdiff/dwdiff-2.1.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="diff-like program operating at word level instead of line level"
-HOMEPAGE="https://os.ghalkes.nl/dwdiff.html"
-SRC_URI="https://os.ghalkes.nl/dist/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE="nls"
-
-CDEPEND="dev-libs/icu:="
-
-RDEPEND="
- ${CDEPEND}
- sys-apps/diffutils"
-
-DEPEND="
- ${CDEPEND}
- nls? ( sys-devel/gettext )"
-
-src_prepare() {
- default
-
- sed -i \
- -e '/INSTALL/s:COPYING::' \
- Makefile.in || die
-}
-
-src_configure() {
- ./configure \
- --prefix=/usr \
- $(use_with nls gettext)
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
- emake prefix="${D}/usr" docdir="${D}/usr/share/doc/${PF}" install
-}
diff --git a/dev-util/dwdiff/dwdiff-2.1.2.ebuild b/dev-util/dwdiff/dwdiff-2.1.2.ebuild
deleted file mode 100644
index 5c70c554fffb..000000000000
--- a/dev-util/dwdiff/dwdiff-2.1.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="diff-like program operating at word level instead of line level"
-HOMEPAGE="https://os.ghalkes.nl/dwdiff.html"
-SRC_URI="https://os.ghalkes.nl/dist/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="nls"
-
-CDEPEND="dev-libs/icu:="
-
-RDEPEND="
- ${CDEPEND}
- sys-apps/diffutils"
-
-DEPEND="
- ${CDEPEND}
- nls? ( sys-devel/gettext )"
-
-PATCHES=(
- "${FILESDIR}/C99-fix.patch"
-)
-
-src_prepare() {
- default
-
- sed -i \
- -e '/INSTALL/s:COPYING::' \
- Makefile.in || die
-}
-
-src_configure() {
- ./configure \
- --prefix=/usr \
- $(use_with nls gettext) || die "./configure error"
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
- emake prefix="${D}/usr" docdir="${D}/usr/share/doc/${PF}" install
-}
diff --git a/dev-util/dwdiff/dwdiff-2.1.3.ebuild b/dev-util/dwdiff/dwdiff-2.1.3.ebuild
index 5c70c554fffb..973e44885e76 100644
--- a/dev-util/dwdiff/dwdiff-2.1.3.ebuild
+++ b/dev-util/dwdiff/dwdiff-2.1.3.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
DESCRIPTION="diff-like program operating at word level instead of line level"
HOMEPAGE="https://os.ghalkes.nl/dwdiff.html"
@@ -11,41 +11,28 @@ SRC_URI="https://os.ghalkes.nl/dist/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
IUSE="nls"
-CDEPEND="dev-libs/icu:="
-
RDEPEND="
- ${CDEPEND}
+ dev-libs/icu:=
sys-apps/diffutils"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
-DEPEND="
- ${CDEPEND}
- nls? ( sys-devel/gettext )"
-
-PATCHES=(
- "${FILESDIR}/C99-fix.patch"
-)
+PATCHES=( "${FILESDIR}"/${P}-C99-fix.patch )
src_prepare() {
default
-
- sed -i \
- -e '/INSTALL/s:COPYING::' \
- Makefile.in || die
+ sed -i -e '/INSTALL/s:COPYING::' Makefile.in || die
}
src_configure() {
./configure \
- --prefix=/usr \
- $(use_with nls gettext) || die "./configure error"
+ --prefix="${EPREFIX}"/usr \
+ $(use_with nls gettext) || die
}
src_compile() {
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
}
-
-src_install() {
- emake prefix="${D}/usr" docdir="${D}/usr/share/doc/${PF}" install
-}
diff --git a/dev-util/dwdiff/files/C99-fix.patch b/dev-util/dwdiff/files/dwdiff-2.1.3-C99-fix.patch
index 9d6d9ae2bca5..9d6d9ae2bca5 100644
--- a/dev-util/dwdiff/files/C99-fix.patch
+++ b/dev-util/dwdiff/files/dwdiff-2.1.3-C99-fix.patch
diff --git a/dev-util/edb-debugger/Manifest b/dev-util/edb-debugger/Manifest
index 7f5e52e234c9..3b2764138681 100644
--- a/dev-util/edb-debugger/Manifest
+++ b/dev-util/edb-debugger/Manifest
@@ -1,2 +1 @@
-DIST edb-debugger-1.2.0.tgz 608773 BLAKE2B d67136b3bfb153f0e5ba0aef514756f39d63692636adcad3569e79237613004f2a4c425b4bed875408473a7caa6280b3bfc590e8eeb4beb5bafaa2326da892bc SHA512 c04b8d3972497ac170c740f2625301ee7d3ea52b81b29084628aa0091d7cd7df12a34ae707be629cde6e0dea54254bfde25e290aba1d6bad2635eff704282ea9
DIST edb-debugger-1.3.0.tgz 618227 BLAKE2B 1650e727851b629d7778c8488a464b6439f2ac4e5a72c0738cfe1ee302538b0d97dcbf9587a1108a82f8f8f4a6bec273e31ad454063f70704ffb48ca8ba5b73f SHA512 9d813bb61cdc7b61b594e63834ffb3999d3e1bb0c7a435095efea9b3b6726369a06c553ba6633df160d9456758ff54d5eee8cfbee6a1304f3a01d09fe2c7a65d
diff --git a/dev-util/edb-debugger/edb-debugger-1.2.0.ebuild b/dev-util/edb-debugger/edb-debugger-1.2.0.ebuild
deleted file mode 100644
index 4d27f38f9869..000000000000
--- a/dev-util/edb-debugger/edb-debugger-1.2.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="edb is a cross platform x86/x86-64 debugger, inspired by Ollydbg"
-HOMEPAGE="https://github.com/eteran/edb-debugger"
-SRC_URI="https://github.com/eteran/edb-debugger/releases/download/${PV}/edb-debugger-${PV}.tgz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="graphviz"
-
-RDEPEND="
- dev-libs/capstone:=
- dev-libs/double-conversion
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- dev-qt/qtxmlpatterns:5
- graphviz? ( media-gfx/graphviz )
-"
-
-DEPEND="
- dev-libs/boost
- virtual/pkgconfig
- ${RDEPEND}
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.2.0-qt-5.15.patch
- "${FILESDIR}"/${PN}-1.2.0-gcc-11.patch
-)
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
- #Make the desktop's entries somewhat better
- sed -i -e 's/GenericName=edb debugger/GenericName=Evan\x27s Debugger/' edb.desktop || die
- sed -i -e 's/Comment=edb debugger/Comment=edb is a cross platform x86\/x86-64 debugger/' edb.desktop || die
-
- if ! use graphviz; then
- sed -i -e '/pkg_check_modules(GRAPHVIZ/d' CMakeLists.txt || die
- fi
-
- cmake_src_prepare
-}
diff --git a/dev-util/edb-debugger/files/edb-debugger-1.2.0-gcc-11.patch b/dev-util/edb-debugger/files/edb-debugger-1.2.0-gcc-11.patch
deleted file mode 100644
index 68d58b2b90eb..000000000000
--- a/dev-util/edb-debugger/files/edb-debugger-1.2.0-gcc-11.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-https://github.com/eteran/edb-debugger/pull/776
-
-From a46587a77c33256d56077a2d0709291b3ab12505 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Fri, 11 Sep 2020 07:57:39 +0100
-Subject: [PATCH] x86-generic/PlatformThread.cpp: avoid non-constant offsetof
-
-On gcc-11 edb-debugger build fails as:
-
-```
-.../x86-generic/PlatformThread.cpp:332:79: error: 'n' is not a constant expression
- 332 | return ptrace(PTRACE_POKEUSER, tid_, offsetof(struct user, u_debugreg[n]), value);
- | ^
-```
-
-The change workarounds by avoiding non-constant expression:
-https://gcc.gnu.org/PR95942
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- .../unix/linux/arch/x86-generic/PlatformThread.cpp | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
---- a/plugins/DebuggerCore/unix/linux/arch/x86-generic/PlatformThread.cpp
-+++ b/plugins/DebuggerCore/unix/linux/arch/x86-generic/PlatformThread.cpp
-@@ -318,7 +318,8 @@ edb::address_t PlatformThread::instructionPointer() const {
- * @return
- */
- unsigned long PlatformThread::getDebugRegister(std::size_t n) {
-- return ptrace(PTRACE_PEEKUSER, tid_, offsetof(struct user, u_debugreg[n]), 0);
-+ size_t drOffset = offsetof(struct user, u_debugreg[0]) + n * sizeof(user::u_debugreg[0]);
-+ return ptrace(PTRACE_PEEKUSER, tid_, drOffset, 0);
- }
-
- /**
-@@ -328,7 +329,8 @@ unsigned long PlatformThread::getDebugRegister(std::size_t n) {
- * @return
- */
- long PlatformThread::setDebugRegister(std::size_t n, unsigned long value) {
-- return ptrace(PTRACE_POKEUSER, tid_, offsetof(struct user, u_debugreg[n]), value);
-+ size_t drOffset = offsetof(struct user, u_debugreg[0]) + n * sizeof(user::u_debugreg[0]);
-+ return ptrace(PTRACE_POKEUSER, tid_, drOffset, value);
- }
-
- /**
---
-2.28.0
-
diff --git a/dev-util/edb-debugger/files/edb-debugger-1.2.0-qt-5.15.patch b/dev-util/edb-debugger/files/edb-debugger-1.2.0-qt-5.15.patch
deleted file mode 100644
index 795cb8fce681..000000000000
--- a/dev-util/edb-debugger/files/edb-debugger-1.2.0-qt-5.15.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://bugs.gentoo.org/727530
-https://github.com/eteran/edb-debugger/pull/766
-
-Fix build failure on qt-5.15. Typical build error is:
-
-src/widgets/QDisassemblyView.cpp:1503:17:
- error: aggregate ‘QPainterPath path’ has incomplete type and cannot be defined
- 1503 | QPainterPath path;
- | ^~~~
-
---- a/src/widgets/QDisassemblyView.h
-+++ b/src/widgets/QDisassemblyView.h
-@@ -25,6 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
- #include <QAbstractScrollArea>
- #include <QAbstractSlider>
- #include <QCache>
-+#include <QPainterPath>
- #include <QPixmap>
- #include <QSvgRenderer>
-
diff --git a/dev-util/envman/envman-2.1.1.ebuild b/dev-util/envman/envman-2.1.1.ebuild
index 20bf664c7e84..6d4a1643b1dc 100644
--- a/dev-util/envman/envman-2.1.1.ebuild
+++ b/dev-util/envman/envman-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
diff --git a/dev-util/eric/Manifest b/dev-util/eric/Manifest
deleted file mode 100644
index 27009a0fbd21..000000000000
--- a/dev-util/eric/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST eric6-18.03.tar.gz 16517664 BLAKE2B f7f5292df8bc694fc4715ec1a250d948123a2eb99a590e6824d985318446babff86aeb745f5b5dbd0707e771638eaa943673e5b546676bea97e266888b844989 SHA512 e488010791b44cc7da782620baec9b97259aaefeb90d491023ec1d4582fb68acbc06d9eedba7beef9ddc706302e06e36b9ebb4e46d6f035b6c74e9f4eb9ac400
-DIST eric6-19.11.tar.gz 16241807 BLAKE2B bd8284164c6c191e91fc08bc42f594107ebab50f71a980ef331d42fbd8d9c488d5674b2f53665718a6e723a228e838d082095fc3c3b2d40c3fb350c5be9a98ee SHA512 a8305c5185687d62231926bd4c484f3786ac1c20d125a1f8fb1b6bc0d42c57ba92bf00aaffd8699f8d7594c6432896bef8db13da85513ba4f217a60223f2f533
diff --git a/dev-util/eric/eric-18.03.ebuild b/dev-util/eric/eric-18.03.ebuild
deleted file mode 100644
index d03dfa98b56a..000000000000
--- a/dev-util/eric/eric-18.03.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=${PN}6-${PV}
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE="sqlite,xml"
-inherit python-single-r1 xdg-utils
-
-DESCRIPTION="A full featured Python IDE using PyQt and QScintilla"
-HOMEPAGE="https://eric-ide.python-projects.org/"
-SRC_URI="mirror://sourceforge/eric-ide/${PN}6/stable/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="6"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- >=dev-python/sip-4.14.3[${PYTHON_MULTI_USEDEP}]
- >=dev-python/PyQt5-5.7.1[gui,network,printsupport,sql,svg,widgets,${PYTHON_MULTI_USEDEP}]
- >=dev-python/qscintilla-python-2.10[qt5(+),${PYTHON_MULTI_USEDEP}]
- ')
-"
-RDEPEND="${DEPEND}
- $(python_gen_cond_dep '
- || (
- dev-python/PyQt5[help,webengine,${PYTHON_MULTI_USEDEP}]
- dev-python/PyQt5[help,webkit,${PYTHON_MULTI_USEDEP}]
- )
- >=dev-python/chardet-3.0.4[${PYTHON_MULTI_USEDEP}]
- >=dev-python/coverage-4.1.0[${PYTHON_MULTI_USEDEP}]
- >=dev-python/pygments-2.2.0[${PYTHON_MULTI_USEDEP}]
- ')
- !dev-util/eric:4
- !dev-util/eric:5
-"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( changelog README.rst THANKS )
-
-src_prepare() {
- default
-
- # Delete internal copies of dev-python/chardet and dev-python/pygments
- rm -fr eric/ThirdParty/{CharDet,Pygments} || die
-
- # Delete internal copy of dev-python/coverage
- rm -fr eric/DebugClients/Python{,3}/coverage || die
- sed -i -e 's/from DebugClients\.Python3\?\.coverage/from coverage/' \
- $(grep -lr 'from DebugClients\.Python3\?\.coverage' .) || die
-}
-
-src_install() {
- "${PYTHON}" install.py \
- -b "${EPREFIX}/usr/bin" \
- -d "$(python_get_sitedir)" \
- -i "${D}" \
- -c \
- -z \
- || die
-
- python_optimize
- einstalldocs
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-
- if ! has_version dev-python/enchant; then
- elog "You might want to install dev-python/pyenchant for spell checking."
- fi
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/dev-util/eric/eric-19.11-r1.ebuild b/dev-util/eric/eric-19.11-r1.ebuild
deleted file mode 100644
index 72184124af3a..000000000000
--- a/dev-util/eric/eric-19.11-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-PYTHON_REQ_USE="sqlite,xml"
-inherit python-single-r1 xdg
-
-MY_P=${PN}6-${PV}
-
-DESCRIPTION="A full featured Python IDE using PyQt and QScintilla"
-HOMEPAGE="https://eric-ide.python-projects.org/"
-SRC_URI="mirror://sourceforge/eric-ide/${PN}6/stable/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="6"
-KEYWORDS="~amd64 ~x86"
-IUSE="spell"
-
-DEPEND="
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- >=dev-python/PyQt5-5.12[gui,help,network,printsupport,sql,svg,widgets,${PYTHON_MULTI_USEDEP}]
- dev-python/PyQtWebEngine[${PYTHON_MULTI_USEDEP}]
- dev-python/qscintilla-python[${PYTHON_MULTI_USEDEP}]
- dev-python/sip[${PYTHON_MULTI_USEDEP}]
- ')
-"
-RDEPEND="${DEPEND}
- $(python_gen_cond_dep '
- >=dev-python/chardet-3.0.4[${PYTHON_MULTI_USEDEP}]
- >=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
- spell? ( dev-python/pyenchant[${PYTHON_MULTI_USEDEP}] )
- ')
-"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( eric/docs/{changelog,README.rst,README-eric6-doc.rst,README-passive-debugging.rst,THANKS} )
-
-src_prepare() {
- default
-
- # Delete internal copies of dev-python/chardet and dev-python/pygments
- rm -fr eric/eric6/ThirdParty/{CharDet,Pygments} || die
-}
-
-src_install() {
- yes n | "${PYTHON}" install.py \
- -b "${EPREFIX}/usr/bin" \
- -d "$(python_get_sitedir)" \
- -i "${D}" \
- -c \
- -z \
- || die
-
- python_optimize
- einstalldocs
-}
diff --git a/dev-util/errcheck/Manifest b/dev-util/errcheck/Manifest
index 8a6f0486591f..e3d9d18d849c 100644
--- a/dev-util/errcheck/Manifest
+++ b/dev-util/errcheck/Manifest
@@ -1,2 +1,3 @@
-DIST errcheck-1.2.0.tar.gz 15896 BLAKE2B ad8ebd7417146cc52d75e4c3399b3f9f07137126a68cde208a69e7af0fc464590e8832fcf95d68846f40de9c90654b155354b9aaf2e00946715a939b4691c16b SHA512 45d079fe1ccbdb6e2f46d0cf23415eeb4ca1535d79547801c55672f7b48a6346d6422b63e65e0a7150f2b9da22b981f698f00079fd8f9dc7926f87727fbebce0
+DIST errcheck-1.4.0.tar.gz 17641 BLAKE2B d3c53977930a720cbae46fcb9a6f144ca9a2093102937390561c12bdc032c46c61e39ed8320ed5cd3c5addbf68cf89a22c9968a4a8a7836e1102b572864dea46 SHA512 fb3c66b4ad60eb9ad1bb1870c7ba30e4a2e59d7520b99df4eec20a280c832a9f0cb4939ded01d8b7387bfe099a31dd4a5fb2d7d14684f8001a051e6a2ccc581d
+DIST errcheck-1.5.0.tar.gz 18812 BLAKE2B 55acf024bb15798dfdb367eec257595f02da32021ede57bac9bee878baef084cd799ec1d433e37bc27491a2286d9220404528050027f637f2ddacb708bf5c432 SHA512 8d7505ae860857bea54a8c35af66e9f33fd9cb42784fa329315bf3877d8be7078470a9c8819a78489dcab40f69f575b61a4b8b6ae173ea338be657a64489fbe9
DIST github.com-golang-tools-23e62d3.tar.gz 2367133 BLAKE2B 2995fc5582197d63f30fcdd9a21758b7641de849cbc32acaa831016571b1c8806ff8b3eb188e9e8a7a053c603ac0e28ff4dd95b369d4ffa5d2b4fcca79a12a36 SHA512 97613acf95e0d2121843ecb197e9e5a2914d344778770cd792e210096a64bfd3a7e3ffac61ea858040ef430c71329d9afc1427bdf3131e1e284a6630b3937b5d
diff --git a/dev-util/errcheck/errcheck-1.2.0.ebuild b/dev-util/errcheck/errcheck-1.4.0.ebuild
index 2a37860b1523..1ccfd9f58688 100644
--- a/dev-util/errcheck/errcheck-1.2.0.ebuild
+++ b/dev-util/errcheck/errcheck-1.4.0.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2020 Go Overlay Authors
+# Copyright 2020 Liguros Authors
# Distributed under the terms of the GNU General Public License v2
-
EAPI=7
GOLANG_PKG_IMPORTPATH="github.com/kisielk"
@@ -8,7 +7,6 @@ GOLANG_PKG_ARCHIVEPREFIX="v"
GOLANG_PKG_HAVE_TEST=1
GOLANG_PKG_DEPENDENCIES=(
-# "github.com/kisielk/gotool:d6ce626"
"github.com/golang/tools:23e62d3 -> golang.org/x" #v0.3.3
)
diff --git a/dev-util/errcheck/errcheck-1.5.0.ebuild b/dev-util/errcheck/errcheck-1.5.0.ebuild
new file mode 100644
index 000000000000..4387efb40a23
--- /dev/null
+++ b/dev-util/errcheck/errcheck-1.5.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2020-2021 Liguros Authors
+# Distributed under the terms of the GNU General Public License v2
+EAPI=7
+
+GOLANG_PKG_IMPORTPATH="github.com/kisielk"
+GOLANG_PKG_ARCHIVEPREFIX="v"
+GOLANG_PKG_HAVE_TEST=1
+
+GOLANG_PKG_DEPENDENCIES=(
+ "github.com/golang/tools:23e62d3 -> golang.org/x" #v0.3.3
+)
+
+inherit golang-single
+
+DESCRIPTION="Errcheck checks that you checked errors"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+
+DEPEND="!dev-go/${PN}"
diff --git a/dev-util/errcheck/metadata.xml b/dev-util/errcheck/metadata.xml
index 2727c597869e..d80a15942bb7 100644
--- a/dev-util/errcheck/metadata.xml
+++ b/dev-util/errcheck/metadata.xml
@@ -1,10 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <maintainer type="project">
+ <email>dev@liguros.net</email>
+ <name>Development</name>
+ </maintainer>
<maintainer type="person">
<email>toffanin.mauro@gmail.com</email>
<name>Mauro Toffanin</name>
<description>Maintainer. Assign bugs to him</description>
</maintainer>
- <origin>go-overlay</origin>
+ <origin>ports</origin>
</pkgmetadata>
diff --git a/dev-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild b/dev-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild
index 8e221804e410..b7eed9571280 100644
--- a/dev-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild
+++ b/dev-util/fix-la-relink-command/fix-la-relink-command-0.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}.tar.xz"
LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
dev-lang/perl
diff --git a/dev-util/ftjam/ftjam-2.5.3_rc2-r2.ebuild b/dev-util/ftjam/ftjam-2.5.3_rc2-r2.ebuild
index 92ab28ca204f..2a9019245170 100644
--- a/dev-util/ftjam/ftjam-2.5.3_rc2-r2.ebuild
+++ b/dev-util/ftjam/ftjam-2.5.3_rc2-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://david.freetype.org/jam/ftjam-${MY_PV}.tar.bz2"
LICENSE="perforce GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
BDEPEND="sys-devel/bison"
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index cd82316c7f3a..f250168978d2 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -2,3 +2,4 @@ DIST glib-2.62.6.tar.xz 4703424 BLAKE2B 0a27245be2575c574dcc730dd051a8c284f421db
DIST glib-2.64.5.tar.xz 4778456 BLAKE2B 7fdee0e16a7ac820f4c4f7dc66d37add464d3005e89e6013302d3ef103319331811d68e9b42db072b82242c3d7badfbd085b69333e770012def89dc8aae7a2eb SHA512 a87537274619b6de88a0e68555059036ac18c748b5005c8d84728646b0db342fde0b8c5b303b9ad79f64d71ea4ed990d52a4fbd68cda3ca74aed5fe4d497e060
DIST glib-2.66.0.tar.xz 4839236 BLAKE2B 930bf071bb4b1e744ca46cb5267d42772488030f848c7b11c5424fcef087ac27d070d20cf403ae504e573ce49faf26ce9101656391d3915ae04422d021d5561a SHA512 358e6a840b722139593eb7825c3aa70153eb26036e05d13d3286bcc6d2e962c2b4ddcb0fe5c6728b89bfffbd178101e72c576081ae714326a272a9fc34ed953e
DIST glib-2.66.3.tar.xz 4837796 BLAKE2B 44632477b56bea5b6324deccc17e2d6b72e00dba518f9fc3ec5edad8b20df59f8bf9087e5de16b587b72c2f143d9ab650c478666132b1564da9bf333f380a4e3 SHA512 ab2670ae4eeb3b561c0e71ff9153908f450e430cd43771bfee09233a65826dc16462537ec64bdfcced867f4c8663341b6b9d17af5ba0fab8564b8f21b04a45d7
+DIST glib-2.66.4.tar.xz 4838124 BLAKE2B de2b8690c9ef9d66378b396ec0abe2bc83380654b3ca2e221678fb6dc9bf449c544a7e2b2a662739f7b400e9ce0a5a0af115ba2f06b8f5597967e518fdec4937 SHA512 b3bc3e6e5cca793139848940e5c0894f1c7e3bd3a770b213a1ea548ac54a2432aebb140ed54518712fb8af36382b3b13d5f7ffd3d87ff63cba9e2f55434f7260
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.62.6.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.62.6.ebuild
index 5c962f099117..1eff5c37cc87 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.62.6.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.62.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE=""
RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.64.5.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.64.5.ebuild
index 13e3ecde7db4..8becfd4be10a 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.64.5.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.64.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE=""
RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.66.0.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.66.0.ebuild
index a2efcc87a8b5..5599ea49adb2 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.66.0.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.66.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE=""
RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.66.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.66.3.ebuild
index a2efcc87a8b5..5599ea49adb2 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.66.3.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.66.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE=""
RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.66.4.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.66.4.ebuild
new file mode 100644
index 000000000000..5599ea49adb2
--- /dev/null
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.66.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="glib"
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_REQ_USE="xml"
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit gnome.org distutils-r1
+
+DESCRIPTION="GDBus code and documentation generator"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-libs/libxslt
+ app-text/docbook-xsl-stylesheets
+"
+
+S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
+
+python_prepare_all() {
+ PATCHES=(
+ "${FILESDIR}/${PN}-2.56.1-sitedir.patch"
+ )
+ distutils-r1_python_prepare_all
+
+ local MAJOR_VERSION=$(ver_cut 1)
+ local MINOR_VERSION=$(ver_cut 2)
+ sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
+ sed -e "s:@VERSION@:${PV}:" \
+ -e "s:@MAJOR_VERSION@:${MAJOR_VERSION}:" \
+ -e "s:@MINOR_VERSION@:${MINOR_VERSION}:" config.py.in > config.py || die
+ cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
+ sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
+}
+
+do_xsltproc_command() {
+ # Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils)
+ xsltproc \
+ --nonet \
+ --stringparam man.output.quietly 1 \
+ --stringparam funcsynopsis.style ansi \
+ --stringparam man.th.extra1.suppress 1 \
+ --stringparam man.authors.section.enabled 0 \
+ --stringparam man.copyright.section.enabled 0 \
+ -o "${2}" \
+ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
+ "${1}" || die "manpage generation failed"
+}
+
+src_compile() {
+ distutils-r1_src_compile
+ do_xsltproc_command "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
+
+src_test() {
+ einfo "Skipping tests. This package is tested by dev-libs/glib"
+ einfo "when merged with FEATURES=test"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all # no-op, but prevents QA warning
+ doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
diff --git a/dev-util/geany-plugins/geany-plugins-1.37-r100.ebuild b/dev-util/geany-plugins/geany-plugins-1.37-r100.ebuild
index 3c2413baa959..b9c9d27a86ea 100644
--- a/dev-util/geany-plugins/geany-plugins-1.37-r100.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-1.37-r100.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-LUA_COMPAT=( lua5-1 )
+LUA_COMPAT=( lua5-{1..4} luajit )
inherit lua-single
diff --git a/dev-util/git-delta/Manifest b/dev-util/git-delta/Manifest
index 772b6ea85ee7..5e8614915cb4 100644
--- a/dev-util/git-delta/Manifest
+++ b/dev-util/git-delta/Manifest
@@ -1,121 +1,201 @@
+DIST adler-0.2.3.crate 12168 BLAKE2B c7743569d700d7ec3185e0459a18181148f8cd7579f4da1fab30eb2e3c3cabbe5a7467f7760f0cba4b2fdeb62f8d988ee1f24637685d76db7acb56f679cfc996 SHA512 565849eba122eb94d240a0cba875035537058cc168f137a8a3b99392d753815d56fa0e1a1e851062632700b0e3d12caf67f5f768b9f727956a2e5b599029e9dc
DIST adler32-1.0.4.crate 5105 BLAKE2B 344a5258e77328a24a545e32f9bc653fa25b7ea43803ed7861db261bce227aa1599520a42acea3de1f2acebb8fa9fad251e2688413b752eafe2401ca1a2ee34a SHA512 5990e1e277a1c3aae5adef5e4601b807a756a40e88578bb91f1c70d70babfa97fb3f2c1b963482ec8e18c16d5e722bf90fb42f9646c8dd840373f28965a2d123
+DIST aho-corasick-0.7.15.crate 113071 BLAKE2B a22743be74f873b9545648db6a994250e3e39b92ac99601580e3b02194d205e921bff0b1952a4cca3399a3a7828555a1abfb0c1466f3930811c6b95c1a07ec5e SHA512 e67816efa7305937a7cbbb0079b91b8afa3fdab52cfb8eeddeee156f18bbeed26f941cd4cb18ab2bdc1da5a9ff1dcbe9d2090deec68c00287bd99ace18ee8b24
DIST aho-corasick-0.7.6.crate 108953 BLAKE2B d713366d0783e1ffbe65408e4d38ef9f12276f61043c768265de5d47e446a378306096a70252c9a49a6e7d3b97a09f30405a3d8df6b40dc2dfeb7407ed574c95 SHA512 120aa28e72279f561d7f51657aa0800dd46504cd92f758f848284e5f3695be6f5e24056a66b0f2d971c527277e92ae938e2357ade37b5cbe1c93913a5dc308b1
DIST ansi_colours-1.0.1.crate 9937 BLAKE2B 04d86fb964138cadeab0cb708e99d198189efe6ad871b9cea43967f610922234f371befe7b25c8ef824f94daef5b6c52e47a5d86f7966b82ff100ae5a4e38281 SHA512 16d9470385c55eb28be0fd3ea0bf5d8832676282636edb71f670c629a77884f590bf4ea13f2bf1002031a5a014cf1bfb32bb7a09da27af3c1d85e4a0f524af23
DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
DIST arrayref-0.3.5.crate 7644 BLAKE2B d1dae7b54208b842155dc77c226236bfa3fd671fad39a101246f4b1496d28608e657fcb96fc8447ba5b0835260484b46ff35e2fdac8e092a0b5b79646ff39d18 SHA512 6417e092a896e118a69e219f4e40f94756748986769e24ac233ea33a3a0a6e15fbebec5f4d6dc3592da7eb5b2e572cb28ad330838875323c6e925275b5a3f5b8
DIST arrayvec-0.5.1.crate 26816 BLAKE2B 172dab8f0129134dfc89c6032c5fc15e2f86a5cd1e5be18b87fe2108d18a1bdb0f597a6ed4cd214dc663fbfb27b05c66846fba4543b5e068b5c75d075bdc5bff SHA512 53db2fafea1f60ac1af9ecc0bc9b69010e9f8573048481d55969ecdc9f3d19832fe05824acf10a0186b0464f0fbfe898d73500fba39ed63650c64dac2c2e8043
+DIST arrayvec-0.5.2.crate 27838 BLAKE2B 51e2eacae0ef148f3f52d21ae00794e540e7ce4c013fb496dd1347ad91ffbbca199381fffbb064225f829216f6c5e915edfa64833f91fabdd13c3f011d86491f SHA512 1896b5f64b4dbdcff8ad234bda4ea8129bcacf87839347304717e94ee9f369cf5f4371755e453ff7d72817edb8f7fdbc726d77cc4f28ed05148dc89c7714b004
DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
+DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
DIST backtrace-0.3.40.crate 68183 BLAKE2B e1c01acc706617c66558dcd3ed1ebc33bf3fe56d03ecd5ec00eb78df3d5fa745cd899108a779894396636da461ad7a2775f6d77cd35fa96f97181f3e80694a5e SHA512 8b9da3d6c515ef7bc5b04cf4abd53221cc114c912eb5033558b1c45eb6d85e56c0fc39579711fcd26f69fa364a823945901e4c2e5560436013b7523adf267d27
DIST backtrace-sys-0.1.32.crate 518920 BLAKE2B fbbd3b59533830400a788fd117ced47461d2f2b04d205d03f242d596c284e89ef2dbaead81e6974aa65197a6c69c0293f18dbe89daf3323d0c01dbc92462a075 SHA512 199658b1f95611f7c68a7b4fdd76044fb6784a7ab777a9f5fbe3a4a770bd6c31ac08dfea1297dd85053f0b28b1a686c076a78b120ac46fc3c639c30c937d49c3
DIST base64-0.10.1.crate 41988 BLAKE2B 6e28a70cc0d5e426d9a3944825952851928ec2e32fa2543a8e1d1b886ad306f38fd6e673da62e96581e56613f133265feeff5b0d2f1e2e34593e58c0424eee9e SHA512 674a8cbee95a41f755499a4e3bb93ebd3f80140c3e8e2d44a0b73890ee423754e7ba8abcd92132683cd54501ff5d14438d023a202eaf12776aecbe36df9e5535
DIST base64-0.12.1.crate 56378 BLAKE2B 90a948eebbae820ced325055b2d49feebdc3b178a271fa7508356d7e44d9f81f586822b6512169f3c1e9901da491b1728783182796c14e6b2c8c647e57202ed1 SHA512 06c73723c4364ac8bcf4204a943893080d1752dd925a13da800889f486b1ebf97bccae79b7b04cbe758afc95bb1d61464276365d4721689896fa641a8e55b660
+DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
DIST bincode-1.2.1.crate 15489 BLAKE2B 98d8a7b3653dc75aed07a637707a8a0d7b574c9a7e9ab8aa39d6f235d003ee15dc4abdd76e3ba171b10aafc98dc16f9ef8413f4154c30848ca0c12d4972f527e SHA512 b86915db2079128d6abe52c8f3fa0ec21815faa988bf678a162c2caaeb0d2ecf2f5df496d5dab08f399578b4f0258f252e890d9ab9e8347c50e5d7a2ab374db7
+DIST bincode-1.3.1.crate 26121 BLAKE2B 7bccc02071a11944e787fdb4c86b082827834df31f3fb751ed32720d4c44e4a26977838e311580ed330d9f6bc5ad76632e0af5530a3f8781ee739d9dc1ff218b SHA512 75e62caef54a58ea5d24acbdef70b55893b11706400ad423919084a4723f5ea60e337447221171c4cd86d764db1f9f767c303b4cf5cd8f27318519db77fb82b4
DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
DIST blake2b_simd-0.5.9.crate 33575 BLAKE2B f5bd6efad39b7727bdf033bea9796eb0eb24ffdcccf9d9682c22942a5acfac6c566377f635e3030d2ec9cea05129632627c1906031a1c395744c787354e4948c SHA512 cb7ea3db1911976e48fbf64df4c9dd071d26f54b95d4f14adae2767bd18e5b7948a4f908bf9e5fbecc6e17d4849b878262cd8144d07c04e2d0745fa644ecd19e
DIST box_drawing-0.1.2.crate 2819 BLAKE2B 968243dc8cc4c999d87b1ecf45314e9ed5fd81c8403b181f6452889df92edcc407e98774592a4072c1b3a0f551ae99913cbc01bf97bec69dccc7e2b7fba14200 SHA512 fba2720279dbfd56a14371951b854aa0a30fb4caeb5b95703ec6721d681dfe97a37b21b069e6264565510fa3f3d0716dba99d8b3021bec76410c823ef262e746
DIST bytelines-2.2.2.crate 4218 BLAKE2B 48523123ac1b5b643666ccd466a9fb48c4aff77bd13b198b24d0e1092dd971bf5ba804d97a83a38a8b99ecab94b51e837cb4850d5b0789f4d2f0115159c4176d SHA512 0d768b579993c0d72914affe36d61632e0c39310094b4d3dde29e69039249c9bb88af18e8f8033c377b05938c50e43ebd29114d2c664b2c904be27c61b1b8dad
DIST byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3d5b17c14233047fc3b70c829bffe6c129def84f529c1017ab2882c1bb66e86eab7b749a0d40daf2650da85d0a SHA512 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f
+DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
DIST cc-1.0.54.crate 51972 BLAKE2B f3760987ea93e71254939a42bc795cfd68b994494c2d5820fbd6bda29e31b3a28d55ed9aaddb35f720b26b1bfc01f3369af81990b68da06a7c46c17eb014636c SHA512 4562c89b52786cd16a66c1970a4005485299ff0c21c61fd22a08fada933e5ecf3fcc1686f6e4f5a8ec4827ac00ed24c1c4ab4931ec5e9a12d2e5c283f6096b77
+DIST cc-1.0.66.crate 53454 BLAKE2B fe34309ae50a3b022c36270a1dc819713f9d70e9ade2f421c33c542e865dc861e3b5191e8949de253515aef6878f786a6abe048391a819d09bf57f33054a90ce SHA512 b07a70f88fa0588fb0f6bc7376e985834672cc9914a0713afe01740af6bcf01821d15720d831e8b7ea8b42f5866dbd011a245997f35bf8febc3b13d66089723e
+DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c
+DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
DIST chrono-0.4.11.crate 139811 BLAKE2B d327f6be0a890ed74f2a2330777dcefbcf87e0291e47ef9c63aea46050f38c89a9b2e7a4716ac92202fab66aedc98ae81e090f1921a1aa51fa7ba18cb1cf24a9 SHA512 bedb698ae2994fc6fcf858b86a122cdaccd150996eb3e4313f876599cfa2180c2f687cca78ba30860365e04b75911fcdb19b5930fc155d1c17f06ec8197d3da9
+DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
+DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
DIST console-0.12.0.crate 21278 BLAKE2B ee79ab5478a6f49d4c42389f2e9d17a5fe97749728fa548330a49b0869e8d839576eb4fc3874c60b873a3de8be9bdb7f928da6303c2ab0e68e9381052abd9e82 SHA512 f35d40ef5f91d99eddaa498b8e043f884fd624afd39215a7f207ca79b99d9eb563b47595974af345ce68542d76d58da17c358ce60231bcb0a1dcb9da31f7c6c7
+DIST console-0.14.0.crate 22587 BLAKE2B 3e91af20994c45b503fa4187ca537fad18efb0b552e09a3cc8e97f84ae0b51309dc1bff91bb54d06412f4779bb218652d649936216bb24fba473b988f1191ad2 SHA512 d453e82559629f0a7516760c18ce28ad347b4016e02d0c4f1aa725b93000cabc41749ce0bbb43cc98d6f9b0b92bf6726a8a265369d86f54a41a0a3f4ff8dd4b1
DIST constant_time_eq-0.1.4.crate 4654 BLAKE2B fbceff4653396f9ee4c6d184d60fe78b77acd9b90986e83183b25acbf44d92b6d936df8ccbb1e7aef5c7487703058b93078fd90cee5eab4d14796886e3c6a863 SHA512 65b72c522f7ff0abfe0e562476bbbcbeb1271bc9cf61f9663ea5c08730787242b30df472e7b74a2ea9979466c251030c35f36c916d20e0c6b99826fbecbd8f96
DIST crc32fast-1.2.0.crate 39161 BLAKE2B f71c85801f945602d53f93ce251c978c91f63fcd92fecba5083fff0f06738697e99d92c17a824605d5d56b3224db224ff32e4b147b6f6af47ae714dcd511e7cd SHA512 2ee73e0642f83e28034c1baca65156e65d751214e83f2a4ce94b6add5ba11f74ffc80832a3348ece1c099367be2b11e820dfb349fae89fbced1b68bd6b0466f0
+DIST crc32fast-1.2.1.crate 38172 BLAKE2B 80801a345f4c5ed8a5fd335bbf672eac1733a1c2b333dc8a8e0254338148ce7b34402201a8d2d7434dd1b057f33d99d3a8f02610ea50b54115d80bb8da28b2b0 SHA512 4c04236bb15a5c63b712c62652777917e947823abb20a0d0b372c850ec1c8695faa414e8de73904f1f1a296d7b00a6206cde8da404cf4cdaa2e8408e64b62b5e
DIST crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571cf2fff72b2a70e86a554899987fd71a61a8ab6a15c75e468164755fcc3218a1db54a4fa406f766f9a9f03bcb3d9bcd02 SHA512 771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5
DIST dirs-3.0.1.crate 12245 BLAKE2B e58f9383d0bb78f27219337c83879ce355aa60290df659b9dc656e3febcc2577b8fd5234792fa354f1c7f2b651e590fe490384f79b0a8a332eff44e3b459d9cc SHA512 fe5eed57f7f3af0ebc53098f7d7295702a5339d7644d271a81bf5a966ae5b3e688eeabbf2b122e6e7daa1080dd30e48d8cbad969f6820b6cdb1680c84f0b9623
+DIST dirs-next-2.0.0.crate 11689 BLAKE2B f5022bc51dd50bad4ad0fd05b159a4117aca47afbea66dc42c8306ca58f3a550165afbcf9f5f721ef5ad8d357eaff305c6f6e42789354a910d5f1d05d3b7b7c6 SHA512 6ccb732da8ccf7bf35952c22a3b0caa8238319feb0a6cd3b0957e6be12548a2ce507c69cb6d3cbd2adfb37e13e6521c6229da5999edb0e47a292a41c3ea1a766
DIST dirs-sys-0.3.5.crate 10643 BLAKE2B 8df1e6ca2c8e8560913bfb74e7bea1b12e1b13b6d337f3c76f517716622586cae8ff9999044e3265504a44f161526a79baffff2d123d3ea6c5cfebefcf498010 SHA512 ff7eb48943b61773dd2aa8dc10372186d613c225a2b39caf48966a1a5af087dd0177b8db80b1353a504af8aa1c8b4a0a849edf6c7e4389f6b753bfa3b7376833
+DIST dirs-sys-next-0.1.1.crate 10490 BLAKE2B a691f9603b649f648d410c7588a84c69adaff41179aa8eac899ed47082f171d765876864f08e3d0dbf3fa3798c1342b30e3bdf530ef06ed017c235a63b15d5a9 SHA512 e89af71b6bb4e23efb8ff189b42615672c2aa305fb8798393de2f9151c78cbfd5f3e45b066f5de64dfad69a84b15e72a1cdb4377f31ee9288018143017ed5730
DIST either-1.5.3.crate 12278 BLAKE2B ffbe3878098daadcef9a554b60b2904d8d4814ea38cb915ee0003d3cd11243e04813dfb41384545e7b180f7d542c7aa2c0a351b736d4f449e70fa11d0a09cca1 SHA512 5e283412597bc3a1341d42c6cfe824606e056aaac82cbf3f662e7074ab74f1f80befe9de1b1011ce2dc970a0ec159ade5ed5b3e71c9984facee6314eac20d0f2
+DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
DIST encode_unicode-0.3.5.crate 42677 BLAKE2B d8044f314f03f93965bc4de11c065f08112d33c4e1b42d9054476dd7ea925e22fb7b32fa855250be2053a00d877bbdb83a293c0aede3aa6e48d978b61f0f57df SHA512 e9849cffcffbf66e28b609e86b0d26b1267f6e2858c6564f93b071b1257aa505732dc3b7ae5bcb347874514fb8c21a606282bdcf69de842f8b96e79547f434a2
+DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77
DIST error-chain-0.12.4.crate 29274 BLAKE2B d082bcbce47411477e8b597cfcb76985cc7d6f1696926cb5314f4e84d2c8642939f5263e110aaef56353ec086a21874a8093bcea1d018be81c86ca42c2c30d71 SHA512 c0ee19a0ba2d79ff1843148d0a582045e68466a9dc429e5f3c8a3a75bc1b6e0d6de03ad69fce851bc0297e7db77b2c6817a13c37e1c3d4501ed41db8a454bf79
DIST failure-0.1.6.crate 37950 BLAKE2B e203ce20e1e0276a779407b43aee8479d620ce097b6264fd092e3911b2a771c393c931426f48e98fac5a2bfb8331cdc0c7acc6a8c6c6e056a5a0934dfa82dd27 SHA512 9f962b30c3d242e59b22aa0df59524ab8a996e9f1c9c32677d22208edc37f0f9d4727e9e6e8f1841270d3ac1e1bf8057085e067bff23478b7e5f020f475690b8
DIST failure_derive-0.1.6.crate 4902 BLAKE2B ffbdaf135c6baf66d5ac37cee6050bbad6f1cf6399ac4635a96ffb9f8b9cc80ed8533573a3c8ffd63f207b9ed809ce1ba7825da256c264b558673fdb6e563cef SHA512 5134df91747949e5f697ea98ea17716d1fd11f67fdb94230739d57bd8abba367474d45a1409319973a96bbfa0204d6f6854524ae41e9377e44f6eef66a5dfcc3
DIST flate2-1.0.12.crate 73844 BLAKE2B 46d0e592e68dae030c4e05aa073ac8940c8778e707b315b33f54eefabcbb2074f9843b784a98b4c7955a34d965482505ea0700e5ac04774b40473889fb335e3e SHA512 3247d6cca560ed4e7518a3b035e1745472f5ad98f049c764a16a4559b6dcf2a006acb613b57557556f917b529376ab0eea2d3c5ce0ea9e044b0fbae804dd3ecb
+DIST flate2-1.0.19.crate 73768 BLAKE2B 1cdce9db71ace32d45b90774cc0804f4f663d1193687e9487ffcb8b8962006c680449dcdabd296e1b1046bb3dc2d910a11106f24debea5c63f757b471fc33fa1 SHA512 6e802f351085ce8804afad32d9502980269e2c03e2315349b9dcdbbb6895f61c89fbde822e31504eb00d94e665e1a8186ea3d128b5b612c61323494a8dd4332e
DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
+DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
+DIST form_urlencoded-1.0.0.crate 8412 BLAKE2B d65250a1d56cee26befb8733733ab67ffba9b9826755194158f336a22e792d38320292548ec73cedf18a56a806707334eb75833e54bb811c56a2ccfee05aa731 SHA512 193b8630b2790931c1ade898187637b2efdfed60b2c98a2dec6658380433fb7711fc2d8196834c19eecddd219ca7383e4a4946bef25c664bf4dc010388b60605
DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
+DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
DIST git-delta-0.4.4.tar.gz 1024790 BLAKE2B c0a74299196c4dde617db74832d4db906b8b3eab2a1b302ee81ce5a9fe2df4daf8306768d00d9914153159aa8fc0d5aaaebd9ddbeec3c79ce41bed8c92702308 SHA512 1d42f87efef0ba065860fd2c3d2db3cfc1e97580b4bd031e91393a21479ab61d5c7afc99eb232eb16bf8db6853072b714027c720fd2d452be74e0ef0a5d1dc34
+DIST git-delta-0.5.0.tar.gz 1053905 BLAKE2B f42269cb12367ac07761975f775c640dc5bfe30cac0cdd60c2e91f863e2de869364b0e1937a8f70012b0afaed3690f0013b0364847eee3ebb5b23264f403dfb2 SHA512 1431939ec5afb09b8586d974ea795c5a804307195010bf461f8651f8ad2eaa953bcdd8d6bad8186d982592857304f476cf3c14c0816bbcd82c84358b8db98ae1
+DIST git-delta-0.5.1.tar.gz 1054097 BLAKE2B f08cac42102b3c1b84c967d7380056cfe3937ffba849ece57cf5639cc2c6330f33bc53d9f77847f2a3de856164d86df55cbc7ae03fc5171fff937318c94c640e SHA512 437c30c45d8d8076375efd99f0b65e202cf1741605d6d94b097ec335c94725a13326f90efaac4c07679fa9d418dac212246dda51bfa2fe90e902b49223efb4e5
DIST git2-0.13.11.crate 173742 BLAKE2B c14fa5ff6c6d7dcb78a2c7abc3ac8254e50fdfc21926484596f6e259a8fee825b4b11b4a592e923a079cda019059c2feb787c82e4bc23e0de1c18a2b68f8d71e SHA512 2cacde47dfbf9df7a46d8d25fcd182f3ef239c4dd987e7f21b3e49e29671bcbae84f387014610559b2bacdad0708a9ec2804b67befb1ec139848a625508e93a9
+DIST git2-0.13.15.crate 180011 BLAKE2B c395900bbe65628ad8b0a51c99ddbc5b5d0b76240c0c030a1df08f18f0220515ac9e613a8d6eb7e71a64d303be843242c9dfe96c62ee8cf6a43b2369cccc15bc SHA512 c08ada81843f512cb855f5951c0fc97d4bb64af98f834bba30255b1ea70e4a7848ff018944a6c4a7d36fc480e631be4c40a5259e493258a6bdc1c233775cecb9
+DIST hashbrown-0.8.2.crate 75830 BLAKE2B 9b08d98fd06e0cdf1dda7a86b8e2c6b1463d28eaf108c38c7c8fce1364ff1d752b044a46d0081b2348c6eecf0bf3e935e85a2d88c67b144e86734bf85a8e13ef SHA512 a6c5e5ae29d3068d54799efbf79b40ae95c2ab64807fe61ad44a49cd90c72b44f1e72340f5d6e2af1f9bb2684675dd86fb74eda03cfbf3a49d3dcf5080867a02
DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
+DIST heck-0.3.2.crate 54718 BLAKE2B 6514f604361932e0a8e1a86786d3ec7218d95f8b3b3bcfc9e21c5fddc58ebe28bc0781e2ad24de4dd4296da85e97c742d8473370c99a593e7e5fc7df00fc9b4c SHA512 cbc72c3473ab14fe445491b1d9586d50de9a462af344638b871f7309fa805069a1405bcb1e0859b561f48583fc71045f38d03b92332d35131c67e140ccd241ad
DIST hermit-abi-0.1.12.crate 9217 BLAKE2B aecc8c743241596ef4dceaa61b4ac36ee0a2501e97eac976c733638cbc8a3c4926b9e231404a67a3687aae03049ad8ebb10fdba2d8c72002c0c08a2f8f76e3ec SHA512 7c2c7950f2b70dc64ef7c111b7790d7128b49c91aba9c063e11a3e09070b28171de6b77d1f31b4ca0c1642e61bf4b9d50e41d72b9c9228bdd1749347eb753df2
+DIST hermit-abi-0.1.17.crate 10065 BLAKE2B 79aeac5f72873a29b53368fb01ed4288224692cc7c55221633775641ade40693bf3fb44db22cbe4422a74d1d6330450110f21b586426b6fb8ef93f116476c644 SHA512 1ed4688f2cc1f1d5ba2f7637e2a9dc230712ce8907e1fa3d95ae374cd4b67a325138a98f2a524cb03f99625775057aa0370f480a73ab20485f0456e2f108baf2
DIST idna-0.2.0.crate 257203 BLAKE2B d26117124891f90b5e36af291c9038e2f4d46402c41380a6a89758459fd73839137e6faa401502be12dd81292cd9e12ec82fc611c0ff7a150510d19010767558 SHA512 375d6d73537a5c9cebfc850a2b561d57e748d80059ca27fe5e35c058cc12a5938cfbb39a76cfe57fbe589f7e36f89ccd91ccdb8899458c322e277c299293bc7d
DIST indexmap-1.3.2.crate 47144 BLAKE2B 70330e3a7bca371051f871b029938c1c3d6507739cdfaf348347a811a69ee923ea9f5884b6375b0b95d7f06472e18be3652ce110ae91cf723d609a01cd4f9dde SHA512 f3a618bbc0274cc9c8e25183448b1f65db11107bc72debbeb178040ab3f5609e4771df00bcd0a9b8cd5f395b982f7d031dae7c3bb8ee71d7abba19fa21534dfb
+DIST indexmap-1.5.2.crate 47558 BLAKE2B 67d5cbd16bf464bf2a003e13285f559a2f02cf427cbb9d84ce80bea6a57a983c2b7db834a0a7172bb747d003b1d81530bea0c7cc8017cba4b963cedb14f8a1a2 SHA512 6297d720181a41624ad255c2f870abd2de12a7752f7ae4c724a64822c36b37275103cd75e35f6e690e150688171dd34de45b01cebac74a3711be7a3f5728ed6a
+DIST itertools-0.10.0.crate 109656 BLAKE2B 73b65db4a9f02cd6940a81966ff433c5d9d82bda15b2250907728b2305451e2914e0211ed16e9755585d6a4ea67c3f2b1a5b1ca589afb60f20f23d1c1d31da7a SHA512 ecc194ded512a0979c4429c0395125e1d3968c61f673546b755c0a8bf2fa5a604690baf77e95dbb91dc26a3004b50a856a8aee0dae0e4c1bd83073e5e7cacefd
DIST itertools-0.9.0.crate 96429 BLAKE2B 36d3b1dec7ece85639337f1a40a00330a5216ea8c460d13e52f0f9fea71bed5b3914cc4a7e05b407ed41e0dbc2292ae5873b3481297edcd92ec547866d044b8c SHA512 1c6650060750f3073140c4a77fc4d1acffa7d18320012807df0e20ab06ddb39afa7f086d89626e3909f89dc1f0408c9ccee4dd9454ca1f7a6a145bb213e7c5ce
DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
+DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
DIST jobserver-0.1.21.crate 21228 BLAKE2B ab1a6496d609e19235f022e920495e708571116e90f8c036edb5f7ba270c2ac938f7571e89f3fb714043c87623d4cbf1d404067ccac6a8b41e4a6768039cf02b SHA512 944249819e1e3dd09495ead941330e9abe439647c1e66ab7e2140c0c9e100b63f4f792fe06aa3c86f509f057df297ee2d35df0ccdfd4bd6a115b6a44076237ad
DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
DIST lazycell-1.2.1.crate 11691 BLAKE2B 9b1d6e9ced918aa94dd5dddcd3ffba59116dae922d264180ac36c288d8a6dd9244324a7c3050c5991b216a241e482ee17b2e6d27527b88339b606586128df1f5 SHA512 de74ccd6a3c32c360a12a51ba1d51d6530130396b37d63350a960956ae0ba13e9ac31e2bb70b61ddf055fdfbe7e559b20a38415cac3906839684905a01256ff2
+DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
DIST libc-0.2.60.crate 409744 BLAKE2B 1d2dfb912a0a01d93ef10d57ee7d2259c0b82ec29b34a0f1c4065c6be080685f556407cee896bd74b01136a59d9c583258818118c81e9ecec5a6387569affe77 SHA512 649bb508f5e2800712618e76686c12dd3e7956ce2197d620b1b53427496296889f2743cf060e53400b33ea86982dff2c7d7c85b151fc1233895fb4c7f786b39c
+DIST libc-0.2.81.crate 513105 BLAKE2B 789a79faf2d5079f5c4248446fa7c07b11af647bbcc32521e7989928788bea7dc2f65204f396b4fe0c7b3a6cf5248882d7775b97c028a3af1ba35e8ecdb489f8 SHA512 8e121e0dcbd8218e02c2c6536ef6398cd002a92406d433c39bf84576e9b881c5b8a66fee826da6a6189f44b825f3a9d959075eeb0501d7f604bf9cc1a8b8d437
DIST libgit2-sys-0.12.13+1.0.1.crate 1555713 BLAKE2B 2b8455575182d4e56be1dfe392b4a55cb04b2d61c18982623dfec182ff348ac7ebe42cfce97bcf8e4f17cf55efb6a85b7e31553d4ccd1911c91748cbe8d0df6c SHA512 fc8a1e85ab4d23a408ff5f0af9cea16db6a9a30a68885340431ce7e26bc4e13ae50c96cd09485c9f3bc3f74ab57cc16e3b50f0a73ed8c67571afed289bbbd913
+DIST libgit2-sys-0.12.17+1.1.0.crate 1434697 BLAKE2B 864f59851b8d3aab35f520a5a5f726fbe3f97d36046e47fde7b237d01b9e40a03da0d0e08f241b08b4f53eba417795acfb80440e2870a5f473ba3e5f50409300 SHA512 a7232df268f091309c3405ff17833661ec5952404d7fe63a68c8ae98bf134ac49acfd4ec5bc3402382b07bcce529fb7140938fb150828a7d670bf164a73693eb
DIST libz-sys-1.1.0.crate 1324239 BLAKE2B cab82119fdeed84c3c4d37080b2065002dfe9de7b9bfa63256a61ff98cf06fc08e9f1edf02288589085d0f7a400335338b50f9c5f7bca5d2c71fdad433e802a8 SHA512 2d7ca1dc376d77c8b4b764d02bb6371c72ab6f07def5f50b22d77d19631e5a1f67d2e1a51c4cf7766fb365cda2286692181c6a05f55126404033347f307b9283
+DIST libz-sys-1.1.2.crate 1339299 BLAKE2B c055fdcdeaff5d44cc95f6cef190094317644e4881f356e46b0c0347221ffb867afcd29ecd4d995bf397f714b705ce84cf34ab87010770e00b3aed1956fa46a0 SHA512 2342c738230ac570c61b466920e2ceafc0194381643540f094f6541917639a4f5b11d46d575bb03c7623ce109d376bafc3076a9d172233313e38cb6f49ed16db
DIST line-wrap-0.1.1.crate 10010 BLAKE2B 8f64561931efdb39ef256b90ad12573df76449afadc11f38b5431c1fff73da3ef1dcf9ad8ba0c30cd1ef1b0a8d894a7b34327e4a5eccfea08051ae5abedb483e SHA512 31976e14355317bab470e6716542d3cfd59083a1808bb199dc2eddd51d05fab122ab054783d0996c1feb53bdb316e6fa24b34cae9ed8e8cdb2702bc43fd805eb
DIST linked-hash-map-0.5.2.crate 16109 BLAKE2B e65a12161dd8b4c0ca49d25e20d0e5b68c411c349c00c6a1faa01f4db4b3f4c811bf9b64947922b8ab900a6bcc90db30e8a6d58ba9e384201879556408803e5e SHA512 74861f70ed09b119c6db1b0dc7f7c8c3483c2824955bf88ee892b3a3fa1a54e9bfcaf7fae0cbc4792762e330584dd347532532e1a0e8a8bca222b5cdb2c7cf94
+DIST linked-hash-map-0.5.3.crate 16130 BLAKE2B 20ca73044271533d2da6bb6ca863a192b61231760fddb82ac373a34fe63d92efe5b841fa401b9aa509cc1e05b86cf672eae3f26ab5c07c7b0c25e764e128344e SHA512 90ec22fcd830ccfdefd1f7c480c5cebd5e95c822e0c28fff9ccf00bfbdda080c17a722697fdc991ee04a4a32e974309440a91284bc13c9ee70284e4e247d33b1
+DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec
DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
+DIST memchr-2.3.4.crate 23077 BLAKE2B 5ddcc5fba109030040dd0c394344860ac0cb96679948b364c3333eddd29992c335c2a46a6f496c2fe085981ecb6e5386f7d44c1d489cabba180c037f1a872013 SHA512 24cde03e6f7cbee1c1d12dcc691190c7e3dc72f468cf41e2397560961d62685976fe47de51119c04c473cccf75b38311bd887fd9db93e92563aebac8f9184df6
DIST miniz_oxide-0.3.6.crate 44717 BLAKE2B 49d69fee6911ada1effe8ed73072d7815ed94a2705276698a178fc77ebf8c9e92eb286d7d71727a894f46e605afacd620d48d6aecf8975d2366e46e2c8c8bfb8 SHA512 d041b41617ae0e614f85bcfeca31d0c9d031c24942f786f43166e34ebc37bd67e3b9a44779e74b119e3d95d288d0842736ba709dd2faa3cb418415e2c86ccc93
+DIST miniz_oxide-0.4.3.crate 50058 BLAKE2B bc7a152a984de061803c11255459ce3d8fa64dd5b38de9f2ed29213abc1922d68746ff523de3b99e0e95a8933ea75448a9fa1e14cbbe248549074cd5ce7b3c1d SHA512 8c0e2b3a585a0986a61977d4459adb1a7c396ab53f4f688dcbeb2a09c60878b0423f54fd1879c190f5c64690a2473ed2a07d4162a650f6c39f402f6b27e863b7
DIST num-integer-0.1.42.crate 19463 BLAKE2B 91ea6900dba5a38bc7ac4de0db8706f5335baab636937e9efdb1b82ff0e8ece4451503de3ac9e473a4dd7c70d599066f14840789fa88aeedafa585f0f98ed61a SHA512 8c7e0529888e18b872a634e8983034b0357143aa72914b45c02ee87447204296970e9b1ed078d9436ecc779f25360b1a1cfaae5a9bf7c8ffc68793d7c25593b2
+DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
DIST num-traits-0.2.11.crate 42000 BLAKE2B 78584a3e8011391b47c7ce45c5a63da5fee88aebc2ee7ae8d788e22b1d6cf46e31e70b7bf6ae094d35ed8dd5ea4f91472e6050c526acff3f181ee383fee139a1 SHA512 12d73656db34456a30de7538daa1efb6e6f61353a0e274aca388bf184732402d8eb8ca19282fbf51975e0541b5c8d764a0148abe346061dc81922d5eb12592e9
+DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
DIST onig-6.0.0.crate 30200 BLAKE2B 9e9ea6ff6345db408a09ee78e57acf12ba698bdd90c8a41c7c9a9e17df048570f6241de2ec3be8fcea661be66665a3ad70526e24113b09ee97d87700b1eed782 SHA512 f5ab1586c23a96b813300d0478c6f4d401f3a6e44c562f72cc251225374811d3d89ec77b2660a10b5b52d71e4c1656f1f9fb9ab640d227af308401162663be69
+DIST onig-6.1.1.crate 30790 BLAKE2B ee5b49def2318cdc1fa7123484eef48551faba5be52659403e7c037e84a9d2c786afdadd44812b1a478762ae582fe24f46425f9d70f1adecc870020bdcb58b29 SHA512 4d754f05a3612486f6730f850956a041f1fb8ff723fd512acd0a8a0a4a2c8be2b98cd6f7b6a882947d3b368bdb5822241e55a87eef331de80c375433d326a864
DIST onig_sys-69.5.0.crate 614674 BLAKE2B 3f98097a709b1e95e84404b81ea104a4800e0b9f0713e988c6417c36e578b8148a8b5bb8c6dacd2d59d760ed79d8cf1f93f2ae2cec7ee8abfcb607e5dbb92538 SHA512 644019ca67a89790bab5cb173f5499bf3b0af5a4c39e027e79a63e5752f471c6bff86f679e1c86502b6c3cf795c23cd461a87c36b2eb687dfe21e9d232bcb7ac
+DIST onig_sys-69.6.0.crate 620817 BLAKE2B 294bc78ba0aa31743ec12c1cd2c29c3566fc960f64788681cfc3b333e942efc367c1721efdad06bba218a48b3eb1893b28daac163f76cb28a3f872e940ccdf02 SHA512 79903461da8cdacf3f50c7f4d7a1babb200a883a3fa6515119a6d2a82c15eb64b7f758932a2a8c46f89acd052d8f2ab84cf87bf16a3ec9c570667232f54418f5
DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
DIST pkg-config-0.3.17.crate 14533 BLAKE2B 729b15209bbbee8a6d3854e30a89b3e6041ca3cf7b1460ff6008e37866e326d9ec8b4ac582c125676e31eefa048b143beda33432b95f00a8f51cc7fa33ee4986 SHA512 42be78556adc07dffa8933ab1436d5d6a776018898377d58dfdc9f961981f9f21397301b41536c55d8a3772bf74a38069899d1a5cddce5c24a032017137044bc
+DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
DIST plist-1.0.0.crate 39489 BLAKE2B b7a968fdf07cab728f64f60a002b1cbf14946431e42f39af4e851469834c58b20b6555d80b51325552368cdacbba27d62c34f7c02da599eb1d06153e52b22de9 SHA512 e8d5e70fe882ce0c471f6a13ea0db897e10594ca28c8113814d7c38a3ed92c90f734ea45646ea12bd6f59c17e060d2269229d191ba9fc3d514e0fa7ce2bfb855
+DIST plist-1.0.1.crate 39980 BLAKE2B 59c5e604e3e381e7d9a76fe7b694ff1779842bc8908fa187b176f361735c8fc8bfbb208ba3ae6ae5871ae2b8fa63e7266379b344eaccda17fc84b2c2ac545e4a SHA512 67c9b478ff89b3461a44c72e0718047fe8378909c3c371de36d875b54e867b7c41f56ccf6215688d7a511fa291620eddea1e1fcd7bfe357276d3d08ec9a84376
DIST proc-macro-error-1.0.2.crate 23699 BLAKE2B 2d8310300002d1dc3fa68391190c5536e1faf6be05f1dd2ed1429d530dc527f431bdb93a994f2e68ff6120523b0d10a4a2ab35a0703f3013b404d0b82ab68372 SHA512 a9ec65c02f853f05f6adbfd398a82e84dac5bc376f041ede65a47b510914f5def1ae480c1a7e68aa6fab836efb6bda0d712d45243472b73c12d1ce7cdf8c3583
+DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
DIST proc-macro-error-attr-1.0.2.crate 6974 BLAKE2B 4b8fb0c70873eb487dbfbcd37d5a5dae6d877a910f3523d9985a511ea97795082548f03bef926ca91028340dada954217926e7b9d8cc70765343f6d86c1e7c01 SHA512 1fe7ea1e005ab4d6b777b2caa4a5c2ad7655b5375fa987b0b2cfbec6a0673d844aee2dc273dd327687dcdf21a165261e78175eed69e881dfbe1f2992eb505c78
+DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
DIST proc-macro2-0.4.30.crate 34731 BLAKE2B 0a27a06151b54e4ba50f08803a5de44d9c7702ed72cab1b775408696057246e3336dee3a61560886cb24fc4cf582339c8bde7d9211e4e0524f2c719b774339be SHA512 73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0
+DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be
DIST proc-macro2-1.0.6.crate 35414 BLAKE2B abec56bdf8bf2109337e007c59c7c9c78ff0af3848c9b45567b2ee1d5120ace78fdf327c61becf917ef64366e5947792608631f197d182753eeeaf81ffd2a1cd SHA512 d0a6358eb6f9334128a5b47c096bfc57452e13d603c9514df433409069c00468fa2b3c76761d7f3696abb061c1c3ba24150e0cf9be2c5d571d580238d2d27853
DIST quote-0.6.13.crate 17475 BLAKE2B 985287f3e619c46b052e704c6da78565fe5d8e4f9a0d503aa0e8818f595fbef32a437d67228c35cd02d817ee3e19efc03e75239013a87a79553bb252f15c8ac5 SHA512 bafa9ba42ea6ff2d6df652384485c58327de6eaea2832423eedd8ef8b4aace673c23b70f1f22106515ac13d7f625cb8b1a5e8c4388c1701ea3cd86fb9ac3056e
DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
+DIST quote-1.0.8.crate 24997 BLAKE2B 53f8d9e363e2697b580f4bfa39257a6ea1d1899f6cd73f96233cb476de1aecd0c4bca9a8856d128af81ae0f428be71c19b0d2e4816d856bff20030c4cc9258b5 SHA512 448d06465d93d384bf31b0249fd143a92edc4b9be8bb3a8c1a86366241be6469c3874dac98acb3810d5177b106d7307c7d9e879f91cce2e278a319ef1935577f
DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028
DIST rand_os-0.1.3.crate 18965 BLAKE2B 3cd93b10a46a70e0e3ccaf1fb8ee52230d74b7d790351652a8e39323bf0dcb446d14e9229e13c14a84e93394a22e0a127f50ded11db1df8ffc0a6bd564af63a7 SHA512 01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575
DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
+DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
DIST redox_users-0.3.1.crate 12557 BLAKE2B 42810692ff093b9ce056e5b539834ec3fcecdd5cea6a1ec750fa456c4293ce483a9de6105eeddc6b6f41c591c7f292b744b4f12de65eb634ac4b855e6fb450a6 SHA512 086a01e32fa5b5fbccd2d84e23141e3ee5a50e5ddd6135b579c75db5a0eb7df676dfaa8e2582038ef19c09d123fc68e9d0e99667d4ea46f5011d4e7fcf5692a5
+DIST redox_users-0.3.5.crate 12644 BLAKE2B 093141c98164163dc66378f2ccb48a5f478c5b40b69ad4ecb89fe8967e4a309974088ea5f7a2b184b625fc03348f2e75b0809d3683696e9b74d5c4a5ac6a4e8d SHA512 d90f1816205a4f2eca59397f6866e5cd965af652940f56930f8bfbe2b50eda75cf78b09200bb69416a35cbeead3cbd4de354805568be2feef1ae4d691b9a6a3c
DIST regex-1.3.9.crate 236683 BLAKE2B 29bd39b138a8168015bb7a6b36bb5f7f9918b7c00bca28a720f3dffd5b805d3374a6648a04792585e85922e099faf547e5d02aeb23008b7802424351633ea23a SHA512 425713d3eeb4132d4056e6c1a08bc2fa5032b9971987c531b5707a9b5670ae15f037bd68921f1545580801957d1ea283eff87e533477364c7f76823800202f74
+DIST regex-1.4.2.crate 236931 BLAKE2B f316b777df1c97aef2994745e1fbd9ca676b0da6bf4ffad4e54aa11014d39aed343884ede3648b5fd676dcec5e4840e9d84f4a4faaeefaf5a2d772e2c5b9ebf6 SHA512 a9bc8061b7563b8494b21f35bf3c2af5f58dcc1b0df4e25ab8d3f99ba66527d5163e2c04b229b688fcb7934961f718fab72f22d66fef53562c5d96a2fb3887de
DIST regex-syntax-0.6.18.crate 294440 BLAKE2B 355d6a2704e1267064719927269facce1f1c8897566d41e54741183969cde5e56c38d0c0b610b99dea3635de20fa00ebfb8748ceea331af6984198d927a93b73 SHA512 9cd999837890a87d0cc6bc351029a422bd52e5c621763e5c11ae9dcf1ba5edebabcd9e6d70db0b1656072a6109d439101412b3aab0d6ad357ae02ee7039a010e
+DIST regex-syntax-0.6.21.crate 293572 BLAKE2B 49c499ba1c03447fe7c90f27147dc5d96daf815e330a4073fe293d3be594fab1d798d35a5e49f6af43c71befd47528927246c4ebb24b6a6a141135484bbecd31 SHA512 56507f4432804ea30820984f6cff03c3514988bc3e406b3ba3a89c36c9c5d75951e4acd000ba85b95bb83d253898ce7d7d282ed930e811e12bb644c4a5ec84fa
DIST rust-argon2-0.5.1.crate 27795 BLAKE2B ee178d0009a4c367d813e3e4a6c6f765334a0c366b8f0d98f40d55c6fdcfb64284cc7c490c6185d419430f702a4cd051971463c7994ea3323f331eb6c6eb0132 SHA512 80c1c48db1463e1506bbc8147c147c8e37a8cf26d6297399a8e645c8fe81b6ed9be9048a3b3dda67cbdbd505085e9ae79d50faa2a846021ba65f959160465f4c
DIST rustc-demangle-0.1.16.crate 19137 BLAKE2B 04226ff97786b81c90130b48cf6542ea448661af9ea7afed179e71d04abf52cfd3c53fab26d4d35bdf2c1d5a735882da7703527aa48ba7b77f337599c2324150 SHA512 36a63a28a72c710d08524adbb7d11def37db23fe123fb6ea848623b4207c7f80d8415bbbe951488ceccfb8f4f1cdb66a8edfc4c0eecdaa62c87df9e032f4c063
DIST ryu-1.0.0.crate 40170 BLAKE2B 5938a70fe991ac71974a38172acff9e559ec457aa12775ac53305742696a7ccf8f4619734b1d7b0e2db01b548ef2945aaebca605c186dd0b599f47dfb3fbf536 SHA512 b5dd360611fdf76ff13d377c1c79ce09a4fab90a8b7fc917a4424b8246c8a0da7d3ec515b8c69b695d936b1207072d173b9f40fd5cb218f1eab947862112caf0
+DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
DIST safemem-0.3.1.crate 6931 BLAKE2B 4f8a0301ea9d8bc6c74d9e379a2b9526a7d39fa03252b53f69e1baecdaf4ad23fc8c6e21bd36f2754b0dd9dcf608365c2ba450ca023188476ec92b4a7d6612cf SHA512 e2555f4c78d8ebf0457d38fbe881b708c5f2c8625c00a1d00054915ec4c4e65e3e84de7281928176ccb0c9a63a8a6468d791744ed4650e9d628b51d8b62bee66
+DIST safemem-0.3.3.crate 7778 BLAKE2B 6ebc0e234054919687e8a369bc30ca6b007d0e4f8147157ba1a90c290b7f0b490e5c21a6d4406671e26ac073f9e4e06a2bc9b1f21eb152b05c4022a3a4ef3793 SHA512 2e4852ca91160f9f1e764b75145d794726a5f6c162cc99ecbf9cae20474a06cb3a0dfc245b895c51342240f6875423010b33e36d038b8b419a37e4820a9caf72
DIST same-file-1.0.5.crate 9861 BLAKE2B 3f65c5cfa1ba526157f838ce10695c56dc9241b044890629a3bd7f589f3049b04944d70ce10f371f6844343222954fbed5674c04eb6a7b934a3a6761fc897825 SHA512 33be985579210b64eed7e26f24a695e2a59992ae51723e5aa026ba34dbb05be4c377bb25db9797dca1f70aa4be58f33cae32a89b61fe6b9353de9fb902ba2dcc
+DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
+DIST serde-1.0.118.crate 74248 BLAKE2B 0d78d29a9d97da401dba93cd6e118dfa48c73351e32ee48bdc2a649ad60f1b198574b78a5261564d466e8097f8b635e810f4c8a52592e3f39550910e250971e8 SHA512 d3b316e721ce395fad656a598fed7e83b248a3dbd98a9eced98fdc337c8fd40f415356a0af6a0e5a104a592ad10e1265d47d94b10b343ce9475797b3a74306e4
DIST serde-1.0.98.crate 72417 BLAKE2B f0a49162951fe9e69b02dcd1f24ddf37aee08e23128de15e4a4490f07bda9f1c56d9abe3b90422152989d4485e78ce9e0da2ac8800d401922fe4732640755845 SHA512 a949d803c7c66312f280483c532c705f8b3a2b4d058b717195ffc539ce9e92bff707a585cb9e2f52c16152107edab40ff8bc4cf825c06f6b73f1fa189cb9dba7
+DIST serde_derive-1.0.118.crate 50589 BLAKE2B b1328a3c7fb0fd6321f0d020969f1b7e32150488410d574cf9e75ca06bebef3d753dacfac4e45cbc0eb9626246734a1dd5b766b96a1a98b53f3f17897dcfb349 SHA512 f0909822f73e900c8a0b791a30fc5cf5be0a79e6c455766a90d6cc314408b95f2b9d7e3ef99363860d615620968e217da304457d2d6e00f60da8ab8fd2db7115
DIST serde_derive-1.0.98.crate 49046 BLAKE2B beff0012254085fcbe0a73dad9b8f9bb650270c1dc0900cea98e816650ac3f0e12931560a2a36de9a589cbff767ebb65c11a8746646899b3ac3328292b8530b5 SHA512 16313a0fade030fce860f02daffd47febfe3c470b5ecf3a8a53d88eae42b251fba56dab7caceb3560f562860957be4fc66ece06d176757c61b8497f5508a1ece
DIST serde_json-1.0.40.crate 69695 BLAKE2B ad156577b557ffffac9a7f75e6e0f6f6b86c82e33db1e674fd00dffd6f9c33a13f838f062a4bb39ab9dfac63199717f96bbbd53e107ce8231aa88665fd7a2eda SHA512 d09bc95c963f510686106d9885f3420b9eabba8bf32626597dafd43ffbe91ea72ee4a3fedfca922794a727214d73929970acced8eccaa23616cde33dfde9f842
+DIST serde_json-1.0.61.crate 114887 BLAKE2B a06e2b3572b01b57d39a7df4d4c333408594cfe80b6b6a810f8c36479550f56f085cbd7e693d3c27f307bf0b49eefd34f55bef1872a4a0318797e4b9585cce9e SHA512 ff626602b547fa8e48c37251d2f6c91633fd45b49ed8211e66a3174f52f9aafe8778238466e7deb5d5477ed23eea0091596d78894e0967d6978f6737ae115891
DIST shell-words-1.0.0.crate 9798 BLAKE2B b2511d6a956842346f672edc9a3a3554af6d424c3ccad4244c190a7edb5c6d9f18166d91a90ce2c4e86239b858cb04f36f3cb2ac0f1e64926bbc8377f3745d57 SHA512 f1de4606bb249fca7dea437464ef560aa49839382716b9c940738547a5def28337501d9ba77d96a63ecb956d3c49867d6f4742f14946448a2c9d0b1ecea9ebc9
DIST smallvec-1.4.0.crate 24645 BLAKE2B ff5102e2b3a03bf5a8e3e2325f93ffc96dccaf2a4c9ca50ccbe7837215eb356e21d2aa5c02e5130a657c166913e8c42cf9dfe50352b6301231b4bcd37225b6fb SHA512 32a56d7055655ee7d4a6556afd63db7200c269a109ec3bee29fefce8bc75363762c3cf625aa3edd3b06a93046b8c64fea2036403b63ac0e764e08af78c936a63
DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
DIST structopt-0.3.19.crate 50644 BLAKE2B caeb54d559de0830b10b8d20603f09c03da46a856041b470522a59a574e5f73177d4d180a1dda7525251a7b4f73f8b3fe0a96b90d7da3a97391f542d7bfa2fad SHA512 e97e81b936c7077bc2f58c3d65eda8fe3f235929a1f30e9ddcd4666e2ff0a4b24a9175e5beb0ff1414a55d2b6aadba54f762c4ad83ee5a6dbb4b272bd7d59c29
+DIST structopt-0.3.21.crate 50761 BLAKE2B e48bbec27a34ef80f28e21d42b5acc8b2cf012e1944a6b7f6395f4bd420281e18767dacabed0ca37d94ad26e73ed201c9df06d5cd781a4c107b5741eb0880e53 SHA512 df8592f10456a5b1a7bc7b290357c069ce4eba14d2558ecd6face231e49c748a8892c31ffad000b426e8180d3e4dd607329db91f4b5617e971b2edda5bab42f1
DIST structopt-derive-0.4.12.crate 19742 BLAKE2B e1da17d19b5244ebc32522827e7acfe4133bb919374639f775864f7bd4b52fa16374640d4022f839ac682954cfd07c692d70329a347281d9dec4035bf89c7afa SHA512 ef65a34b9a9f23be853340413cd5847434b2c3279a401f938a0a82d5499f9c17968b85f13c60a058a69fbe78c7c24380fca31f0e7ef86d986fe15a082353d98b
+DIST structopt-derive-0.4.14.crate 20116 BLAKE2B cfeb48f5e4906ca24b61afc085a5dc41edc6f69c6060a1cd7e01b844b076928111e4be2f24b3cb28e7704c09bdbbb3c3a1b2f9012ae9e23cc5f795af91fb1245 SHA512 bc20dd9d10c6dc1f5975b074a63eb84b49385ad272b62d8526962e88b28cada3998c3944dedaf8560d6577871747b875cd399dfe06851472c0a1c81fced429a0
DIST syn-0.15.43.crate 184065 BLAKE2B f0f1f97fecc71c91da6ef9d8c5be43f0a320fbf5d7ea6d1d6ec6743735790adea03b0058b8c544b1b06ad7618b7c7b56c64ceff5ccbfd2cc2240772cbd46e720 SHA512 b2b022706c802a601b92e21601113205b147c8129b9c0e6fa86d0c4f823fc3ac3c1bcb48f678fb2396c76759580254b16f10267d8d22a98a733dded34ebbadae
DIST syn-1.0.11.crate 193782 BLAKE2B 17e0b40ee69575efea77249343af2fa67af0990f08ac8efced152ebb88ad1301211306a2317ec163219d485a097878f8552ca353f43f35ffd5d172e6c92da0df SHA512 6b361c6cb27aebb3da5e81db270e7cd0fe8bfb11289c25ce46127214e222c2b64f53164c8869de41b77e9b780f967454ed5d7c5b73442ae292eadc4dea77494c
+DIST syn-1.0.57.crate 229228 BLAKE2B c1f4e6a38ce706f86d8f075409fb341ed9a46aeb8d0f4534fceb2aa2fd717063667bc89361b2d95916c0dcb036d5450d94c23139d110afdacabe91c0a5f988cb SHA512 2e7f318f15c57d518df8e2875545f92faa8171c37f1ac15be189bd58e9a178978e3734417ba99030c62fb84e55e4300fc477d0422fac60a7ee8b759cdd1e56a6
DIST syn-mid-0.5.0.crate 14149 BLAKE2B 87170d072ab6f5ffc6d7f4dc1a08869d4e5c0f505b9130d9b5778a55e206a488b048e47895a524e117ed58b3d45907c8877c897d1d88536a06c9319826b596e7 SHA512 759e29a2ca984eddae3c091be036ad630fb985408be31d838af3bb04fe1f26a3d2b7ef597c1ffb61a72c96383cbf39d8fe83cfe0d79ed4bc3250a585156e637b
DIST synstructure-0.12.3.crate 17788 BLAKE2B cd122d9c374b59501efb3b38da1f867b86a41d5c7d3f2e854100297ebf193ecd3fb4a64a74f0fe186645de2ad2c95fbf6e96b4872b76f6140400307ab69d1196 SHA512 919f908c679439cb9c2e60ee8672484504f03781412fd13f5cbd745a86ed794691665bcd7ea995667e89344d0eab725125fb0027c60f240290b300d04be26a59
DIST syntect-4.4.0.crate 751314 BLAKE2B 4d70ea137ba28e733e2bf505f547e1caa8a38dec33497e092d5efa77e321bc468ef955a0957ec949a0c68df31684e33234838f177f201e77d5e70aec8337829b SHA512 018fc26a99cad799446dfda0e406af87fb63e35cc5684fe2928f42f1b0a1199606a25b9ee4f1bd138abebc40f365c26407716856376f1ed6d3352c879a1689f4
+DIST syntect-4.5.0.crate 752883 BLAKE2B 9c9ff2cc63ea421c0b8928a0578b278883d0a86be7f7c256820120a858f8c02b1d292e2474e5f2b63486e45cf5387e1a8ba4db2a5c9e7a2b0cf4eb687b42ffad SHA512 17653ae9baa4da049c899820f6033b3e7d71b96ab70b9c12e57a1ab305d155b12acec470167be2a0a37ea9c89ec4d19850f72d456e6857a7cf4dee65fc288273
DIST terminal_size-0.1.13.crate 8094 BLAKE2B b46de1f0dfdd6f4dd44c21a5cd7936cd9fef67d96be44775c29f3850e39b94f200c719bd0c0c31727725f1741ee9640a83c1f3083a45ed665db7f03e50793826 SHA512 75efac1092c6919efc7d427e3cf7d4c36a4d12b3d5c38ee35f94ddf2fb0efcc16fb92e608382905475d5de3078e9c64a29ec77816572797fdfb53a6708eaf266
+DIST terminal_size-0.1.15.crate 8795 BLAKE2B 2e7590a524bd8e439d385f925c3d5a3aadea20bb24b7fb5c52dedc4dccdd67f986b304208dc6d9cecf0e4b2c449dd980613b4e381603cad74fd9038420b289e2 SHA512 cf1612f46c8502e079b87a240ddecdc02be8481cb7b78115ba1550a9a732103bc19de11f46160dbc5af06f8576d3dc780ed0b199b7f24c92fc0734e0d07e484e
DIST termios-0.3.1.crate 9541 BLAKE2B fb2862550920607bf7ab65157b25392ad67c486227a0298ad2b0b58ef2f2f240ed1b0a6b02bcb905078cd4721b2e56b76a9c1ace1fecdf15643f76d3c39da2c0 SHA512 5f4f423f7aa0ca7e25f1fb0727029e47fbae9024aae6e168b911ee036bd217084332707ae809b2713d0ae35fe6a7fd1d866fbd1f06bebead32c0c2534671b311
DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
+DIST tinyvec-1.1.0.crate 39037 BLAKE2B 8033a336c2c346df70d5c6161233043a7e196a2994b62c15aa022b7053f7aee686092fc7e2db551cd1a09ee5e4a038e777120c5c33c891bb47b71c78cac60e92 SHA512 29830cec393506651b20d045c584e3df5ce5f13fdf70e866d4d6b7e97fe4f6b07ccf2a2c64ced5b092d5d963af74f826930d96d817db90bc0e4ad112a399926e
+DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
DIST unicode-normalization-0.1.12.crate 91057 BLAKE2B d5b8354990e1911e093d63d9b3b3adeacb38142ac68637fbfe59c0822f34c743e348cae9f535421c12cc6a56db2112dd5ec75f96c173b1f34a68db66c8ad8dd7 SHA512 0e095a59ff965499a5d2c79bfd4826b793103bebb4d2666c09e675110a50f79d985eb29565e4c40bd8fddc30237f874324d8a24786ead697ee0698ef8f79a1b6
+DIST unicode-normalization-0.1.16.crate 92805 BLAKE2B 556b0b95b6d21f95ad99181e999d2f2a1291951db14e95cdaa4596b159323e999a135380ca0f795c996f97ffaa0c25465bfe5884bebc8903130bfd7437d4b86a SHA512 c1f83a79b0fffd2f0e1b8a579ae4e5021c4cffd74c259d065919b937bdd78b9ef83650cfd777010e7008ceb51e072777b195dd2483e1a85798a98b72f8648ead
DIST unicode-segmentation-1.6.0.crate 90703 BLAKE2B b7d63bb8b62cabc604084957aaff021df24a1291f0ebdcddc424cceefe10ad399ed53152211c3e7557e39e21255166f922256f9f8e1fb488d3bae368b49a378e SHA512 80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e
+DIST unicode-segmentation-1.7.1.crate 93066 BLAKE2B 80058a79c64972dfff897b08a24e9f18ae0fa312a50f86fc321961eeab83c5546bdbc30534315870d891e648bde1d7d77f459ec9744455bdebb94bf6e326f2ef SHA512 183ca68d456a8d53e6f255129e8fd07b87d8da23b8f18187231d6fa70dac80e4069eb6c501d45155d9f0050b6bd713964e55f0e4b25a40546c4d245a17fc8dc6
DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
+DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
DIST url-2.1.1.crate 70383 BLAKE2B c4096cb1bd50e9ca97fcdae0ee8b58957e21507607eafa8d84ff71c3df1ba52c68299609776f7baa45c93b971f8b61162fd8afd4174a5c7b66f36dc673707fa0 SHA512 a16c3a625fa85be9305f8150d5711c3e3aaa1f33753e7ecb8368b176cf3ea96f51fde74598c8ea3a5db2effc338589fd2834b297a1fba4bed967fa39e670fabb
+DIST url-2.2.0.crate 42787 BLAKE2B 115380294b06c833fe183423b26f32b7a0cb3eb7bbb53380c41b32c031d6d34ed55f11153d5ed8f3e82effc13b9571f3b27d9889fe61cf63a68ea3767ef63cc8 SHA512 5474daa20242552fc76f8e21a28f8880c011627773fed74061fdf15afd5a33cc1b09baf6583112126a1b8287ad71a22055d2bbf78a73a0d82a115db1334d05ee
DIST utf8parse-0.2.0.crate 13392 BLAKE2B 05296f48fe429a871f42e729e3540ec3a974a69892c6bc9da95e23c0aee2163c9b115a9614eb1943363076793e17ac4c89e28066a9816cab30c451524a5832c0 SHA512 1f6a2eca32e42c8e4b53d28c4fea54c426ed66fc01447b3cf8fc0fd75694453eadbe3ba000ac8ee0347d16dbfec47681254117949109081798eab5370886827c
+DIST vcpkg-0.2.11.crate 12600 BLAKE2B 1c44c8df531a75f686c0497e70a72aa0c1b554c02ed256e6b08407b17066ed949f03bda42645d56e1227b50dc4c0e3865f10856605c2eadab3b74f55f005789b SHA512 d67bc244c81827165bf976808f79fd02f9149a19006898e60ff8ef11df2d72657c56bc9fc14c8f91b091075ceb23c3f96a3df81be345bb01881679eb47a0e6e9
DIST vcpkg-0.2.9.crate 11279 BLAKE2B fc36eff275a69d9dc959cefa730b8ad53f4f277391d4858658ca1fe0bc5ebc4f3f311e46d5e5a8fe4a404fa135362f3115830798b7746d6b562e26f966659df0 SHA512 fc0cf61329f1ca0c16357749edf10a468b5e07cc8353cbbdb1af275b1ef450b07291280e128c7768cc57e23e5f20ef6bcff78a9af7d3ca44d486a709f081f83b
DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
+DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
DIST version_check-0.9.1.crate 11459 BLAKE2B 72f002c00504f635b7d2d7ee7137e07ba9c182d2e41d32a51851896f6bf6742c5524b7f66946437ba581ccf80b9c9a57280dd4b02df0918569ac710511940fc1 SHA512 b9cf363169df2022a961f5bed4fb7da07513e0283a85aa69752f6ac567e942611ed2216ac61799db1a199e2bdf0fd9b994e35d4a40c6cd80cd26b97cbfe977cf
+DIST version_check-0.9.2.crate 11979 BLAKE2B 6568f8d4652fb470162bb2251be2260a6bf83e107a4f957ed91117938d5da48c42bedfb5e6622bcd6c37950805666b78984577bd8dae687dbb39e452078bd97c SHA512 b88a9d545ef103fe6d0eebe7ddcf328fc21fcb02c60828b347cfc35afd957669e652a94d880ef992450c167df3505838bc649e0d83896542fa13a149875acf26
DIST vte-0.8.0.crate 23854 BLAKE2B 27fdd36358b5d10f2b30e2dd8d0f0f3201263ca86bb5e734966cc67099a125df91512c39ed8dc06206dd3db90f02cabf7ba85c6471c402999c7529c2d607031b SHA512 c4545c8e12bdb78674434eb8414dac9d2885c2547f302d19533eeb77dc2dc8d97f077ace4905f8f105269e68b808bd01a1a825ddb86fe5947c8a4acf18ea4ee7
+DIST vte-0.9.0.crate 24930 BLAKE2B 91b3c85493037d35563337e43ab64e14503e997b029bd2cc68e56a4e95cd25f1e65b9bbd24cde567e170f5744d55fa965f1b7abba407486cb44f84a21d0bedbf SHA512 ac7c947a01ec404132133740efbaba0bb7fe441fb97373c144dfe4f19a6e5d300657768c2a93fbc7be78247efffcf90257ac2373d5f1a283abd98a968f88b5c7
DIST vte_generate_state_changes-0.1.1.crate 2422 BLAKE2B 6e8fb4ce0ca0fd6b9a4dcccdfb02445babbc13d47de5fae9bbb81e8c67ada8a40e8dc5e57c120c36876293b111ccc71e1069ea3fdabade6f9ba5ea2d44ff4632 SHA512 ba09352e037cbd279cbf5641c9783a24f76e54f1f09e13f0ab1ca99c9646c1e3c958e8e302d7cc88431073bad2e2d5619410f2f93f96f1db25f0f0ded0236f7e
DIST walkdir-2.2.9.crate 22423 BLAKE2B 7c5f1aa4a2078d4821a1fffc57751950295c99706b48198c70556461aa42b2535d93fd95804a6c5003ea906848accee510fe5bc6148c4155e6de074ba324da2a SHA512 43b8f629a43195c8cd8ad6821b431dd3648a19e6abb83f78deaa3300e7dafa32b31b3c89a228499585e3da4520ca26d82dabf938c1204c8011e5516b3b82da7b
+DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
+DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
DIST winapi-0.3.7.crate 1075776 BLAKE2B 694cea6d0d14fbe85ba718c0ca7b9db79ba8f943b44f4741d77000617de43314a2c657285736a032c138b5d2095b06146a2ac8d84b8efe2307ef44bb7073c604 SHA512 6871b93ad8d48e39b90cb7b31b3132f84665f965b4dfe06fcebdfb873e7d099007cf3d7a50e832a941c3425ad2f39c3ab48a77151e60863685b97fc05c71d134
+DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
DIST winapi-util-0.1.4.crate 10089 BLAKE2B 5dfae5588233a6fa10ec000b3c5de17679e7636bcfb70cbbc1b2b1340543334125b413d53583459823be253a32b90279eba5a3a8debb404390d0328ed6377352 SHA512 2a90921a30ca021b6178b175b780e4803f40ac87f35bcb63bb09fbc9c79f8f991dd94fa3a0fa525c2e38354d9f6dee780a6cc5ea0a24bff49356d052f6bb8231
+DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
DIST xml-rs-0.8.0.crate 50974 BLAKE2B 47f5c663e0982b0ca6caa7aceb7029f2bdff948395ffe07da50fe021d7014ecee7c1d45ea9bf370da8ddbbac637bdbf39b9b829769041406958f069ce884e5e2 SHA512 94f0bc729d58564d63b4708518313e3dc7fe7c6ff9ac94019df1507d7ce7bd6428f2bc16fb116a9d676415a94812ce1e54e30b469a2a9b5fe29dc82486c536cd
+DIST xml-rs-0.8.3.crate 52547 BLAKE2B cffdece0269b9c04c763481af3a3a25df53d7593552c0956a0efa30669aae497e7c4865c92bcf267f4d7684d0ab957fab3d62b76a241fbfd6497eae25bd9154f SHA512 e44048aa2a010c6242d79c8590bceb300d7056cfd1397c4e4e4411089a3c3686b49603fc2336ea69596b6775b729f1197ab6d9d7d8f83a758e2d962c07aec033
DIST yaml-rust-0.4.3.crate 45768 BLAKE2B 6af7374439000dc5e8795b26fccb1bc691040846f844e10765fe5df06237f5cf52752b0f9d25ed7c6f62337f628ee7be2e024f8aeb6b55a7c76f0d3b2ad0489c SHA512 31b0236fe041706befa938cdeb9c74940daccd2f80bdbd4e0e890901c868ecffc39367a41914c8bb98373d1002904f18b18ff13a08bbecd19dec634c08b7a7a3
+DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
diff --git a/dev-util/git-delta/git-delta-0.4.4.ebuild b/dev-util/git-delta/git-delta-0.4.4.ebuild
index f0c7d558abdc..018bc8592754 100644
--- a/dev-util/git-delta/git-delta-0.4.4.ebuild
+++ b/dev-util/git-delta/git-delta-0.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -136,7 +136,7 @@ S="${WORKDIR}/${P/git-/}"
LICENSE="Apache-2.0 BSD-2 Boost-1.0 CC0-1.0 ISC LGPL-3+ MIT Unlicense ZLIB"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
BDEPEND="virtual/pkgconfig"
DEPEND="
diff --git a/dev-util/git-delta/git-delta-0.5.0.ebuild b/dev-util/git-delta/git-delta-0.5.0.ebuild
new file mode 100644
index 000000000000..fbc091d59d13
--- /dev/null
+++ b/dev-util/git-delta/git-delta-0.5.0.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+adler32-1.0.4
+aho-corasick-0.7.6
+ansi_colours-1.0.1
+ansi_term-0.11.0
+ansi_term-0.12.1
+arrayref-0.3.5
+arrayvec-0.5.1
+atty-0.2.14
+autocfg-1.0.0
+backtrace-0.3.40
+backtrace-sys-0.1.32
+base64-0.10.1
+base64-0.12.1
+bincode-1.2.1
+bitflags-1.2.1
+blake2b_simd-0.5.9
+box_drawing-0.1.2
+bytelines-2.2.2
+byteorder-1.3.2
+cc-1.0.54
+cfg-if-0.1.9
+cfg-if-1.0.0
+chrono-0.4.11
+clap-2.33.0
+cloudabi-0.0.3
+console-0.14.0
+constant_time_eq-0.1.4
+crc32fast-1.2.0
+crossbeam-utils-0.6.6
+dirs-next-2.0.0
+dirs-sys-next-0.1.1
+either-1.5.3
+encode_unicode-0.3.5
+error-chain-0.12.4
+failure-0.1.6
+failure_derive-0.1.6
+flate2-1.0.12
+fnv-1.0.6
+fuchsia-cprng-0.1.1
+git2-0.13.15
+heck-0.3.1
+hermit-abi-0.1.12
+idna-0.2.0
+indexmap-1.3.2
+itertools-0.10.0
+itoa-0.4.4
+jobserver-0.1.21
+lazycell-1.2.1
+lazy_static-1.4.0
+libc-0.2.60
+libgit2-sys-0.12.17+1.1.0
+libz-sys-1.1.0
+line-wrap-0.1.1
+linked-hash-map-0.5.2
+log-0.4.8
+matches-0.1.8
+memchr-2.2.1
+miniz_oxide-0.3.6
+num-integer-0.1.42
+num-traits-0.2.11
+onig-6.0.0
+onig_sys-69.5.0
+percent-encoding-2.1.0
+pkg-config-0.3.17
+plist-1.0.0
+proc-macro2-0.4.30
+proc-macro2-1.0.6
+proc-macro-error-1.0.2
+proc-macro-error-attr-1.0.2
+quote-0.6.13
+quote-1.0.2
+rand_core-0.3.1
+rand_core-0.4.2
+rand_os-0.1.3
+rdrand-0.4.0
+redox_syscall-0.1.56
+redox_users-0.3.1
+regex-1.4.2
+regex-syntax-0.6.21
+rust-argon2-0.5.1
+rustc-demangle-0.1.16
+ryu-1.0.0
+safemem-0.3.1
+same-file-1.0.5
+serde-1.0.98
+serde_derive-1.0.98
+serde_json-1.0.40
+shell-words-1.0.0
+smallvec-1.4.0
+strsim-0.8.0
+structopt-0.3.21
+structopt-derive-0.4.14
+syn-0.15.43
+syn-1.0.11
+syn-mid-0.5.0
+synstructure-0.12.3
+syntect-4.5.0
+terminal_size-0.1.15
+textwrap-0.11.0
+thread_local-1.0.1
+unicode-bidi-0.3.4
+unicode-normalization-0.1.12
+unicode-segmentation-1.7.1
+unicode-width-0.1.8
+unicode-xid-0.1.0
+unicode-xid-0.2.0
+url-2.1.1
+utf8parse-0.2.0
+vcpkg-0.2.9
+vec_map-0.8.1
+version_check-0.9.1
+vte-0.9.0
+vte_generate_state_changes-0.1.1
+walkdir-2.2.9
+winapi-0.3.7
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.4
+winapi-x86_64-pc-windows-gnu-0.4.0
+xml-rs-0.8.0
+yaml-rust-0.4.3
+"
+
+inherit bash-completion-r1 cargo
+
+DESCRIPTION="A syntax-highlighting pager for git"
+HOMEPAGE="https://github.com/dandavison/delta"
+SRC_URI="https://github.com/dandavison/delta/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" $(cargo_crate_uris ${CRATES})"
+S="${WORKDIR}/${P/git-/}"
+
+LICENSE="Apache-2.0 BSD-2 Boost-1.0 CC0-1.0 ISC LGPL-3+ MIT Unlicense ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+ dev-libs/libgit2:=
+ dev-libs/oniguruma:=
+"
+RDEPEND="${DEPEND}
+ !app-text/delta
+"
+
+QA_FLAGS_IGNORED="/usr/bin/delta"
+
+src_configure() {
+ # Some crates will auto-build and statically link C libraries(!)
+ # Tracker bug #709568
+ export RUSTONIG_SYSTEM_LIBONIG=1
+ export LIBGIT2_SYS_USE_PKG_CONFIG=1
+ export PKG_CONFIG_ALLOW_CROSS=1
+}
+
+src_install() {
+ cargo_src_install
+
+ # No man page (yet?)
+
+ # Completions
+ newbashcomp "${S}/etc/completion/completion.bash" delta
+
+ insinto /usr/share/zsh/site-functions
+ newins "${S}/etc/completion/completion.zsh" _delta
+}
diff --git a/dev-util/git-delta/git-delta-0.5.1.ebuild b/dev-util/git-delta/git-delta-0.5.1.ebuild
new file mode 100644
index 000000000000..da3282a3822e
--- /dev/null
+++ b/dev-util/git-delta/git-delta-0.5.1.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+adler-0.2.3
+aho-corasick-0.7.15
+ansi_colours-1.0.1
+ansi_term-0.11.0
+ansi_term-0.12.1
+arrayvec-0.5.2
+atty-0.2.14
+autocfg-1.0.1
+base64-0.13.0
+bincode-1.3.1
+bitflags-1.2.1
+box_drawing-0.1.2
+bytelines-2.2.2
+byteorder-1.3.4
+cc-1.0.66
+cfg-if-0.1.10
+cfg-if-1.0.0
+chrono-0.4.19
+clap-2.33.3
+console-0.14.0
+crc32fast-1.2.1
+dirs-next-2.0.0
+dirs-sys-next-0.1.1
+either-1.6.1
+encode_unicode-0.3.6
+error-chain-0.12.4
+flate2-1.0.19
+fnv-1.0.7
+form_urlencoded-1.0.0
+getrandom-0.1.16
+git2-0.13.15
+hashbrown-0.8.2
+heck-0.3.2
+hermit-abi-0.1.17
+idna-0.2.0
+indexmap-1.5.2
+itertools-0.10.0
+itoa-0.4.7
+jobserver-0.1.21
+lazycell-1.3.0
+lazy_static-1.4.0
+libc-0.2.81
+libgit2-sys-0.12.17+1.1.0
+libz-sys-1.1.2
+line-wrap-0.1.1
+linked-hash-map-0.5.3
+log-0.4.11
+matches-0.1.8
+memchr-2.3.4
+miniz_oxide-0.4.3
+num-integer-0.1.44
+num-traits-0.2.14
+onig-6.1.1
+onig_sys-69.6.0
+percent-encoding-2.1.0
+pkg-config-0.3.19
+plist-1.0.1
+proc-macro2-1.0.24
+proc-macro-error-1.0.4
+proc-macro-error-attr-1.0.4
+quote-1.0.8
+redox_syscall-0.1.57
+redox_users-0.3.5
+regex-1.4.2
+regex-syntax-0.6.21
+ryu-1.0.5
+safemem-0.3.3
+same-file-1.0.6
+serde-1.0.118
+serde_derive-1.0.118
+serde_json-1.0.61
+shell-words-1.0.0
+strsim-0.8.0
+structopt-0.3.21
+structopt-derive-0.4.14
+syn-1.0.57
+syntect-4.5.0
+terminal_size-0.1.15
+textwrap-0.11.0
+thread_local-1.0.1
+tinyvec-1.1.0
+tinyvec_macros-0.1.0
+unicode-bidi-0.3.4
+unicode-normalization-0.1.16
+unicode-segmentation-1.7.1
+unicode-width-0.1.8
+unicode-xid-0.2.1
+url-2.2.0
+utf8parse-0.2.0
+vcpkg-0.2.11
+vec_map-0.8.2
+version_check-0.9.2
+vte-0.9.0
+vte_generate_state_changes-0.1.1
+walkdir-2.3.1
+wasi-0.9.0+wasi-snapshot-preview1
+winapi-0.3.9
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+xml-rs-0.8.3
+yaml-rust-0.4.5
+"
+
+inherit bash-completion-r1 cargo
+
+DESCRIPTION="A syntax-highlighting pager for git"
+HOMEPAGE="https://github.com/dandavison/delta"
+SRC_URI="https://github.com/dandavison/delta/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" $(cargo_crate_uris ${CRATES})"
+S="${WORKDIR}/${P/git-/}"
+
+LICENSE="Apache-2.0 BSD-2 Boost-1.0 CC0-1.0 ISC LGPL-3+ MIT Unlicense ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+ dev-libs/libgit2:=
+ dev-libs/oniguruma:=
+"
+RDEPEND="${DEPEND}
+ !app-text/delta
+"
+
+QA_FLAGS_IGNORED="/usr/bin/delta"
+
+src_configure() {
+ # Some crates will auto-build and statically link C libraries(!)
+ # Tracker bug #709568
+ export RUSTONIG_SYSTEM_LIBONIG=1
+ export LIBGIT2_SYS_USE_PKG_CONFIG=1
+ export PKG_CONFIG_ALLOW_CROSS=1
+}
+
+src_install() {
+ cargo_src_install
+
+ # No man page (yet?)
+
+ # Completions
+ newbashcomp "${S}/etc/completion/completion.bash" delta
+
+ insinto /usr/share/zsh/site-functions
+ newins "${S}/etc/completion/completion.zsh" _delta
+}
diff --git a/dev-util/github-cli/Manifest b/dev-util/github-cli/Manifest
index 7e77491acab9..6e7a40d4f8ff 100644
--- a/dev-util/github-cli/Manifest
+++ b/dev-util/github-cli/Manifest
@@ -1,15 +1,31 @@
DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.38.0.mod 1006 BLAKE2B 9d321b9bad7e881795f0215828ca23ff5753b8ca9cbe64ca085bcd2f64d36d0d5bdd5c3e80eb64e19e067748b6b23eb7837827cede0e75a840ed1cfa2b00c1a8 SHA512 8aa90e6ce7d50af3db56c8a7abdd16822f6351cabb96e6b75ac0cdefa15bb4a2d402aa84e6212fec4d599ec6f13cb1891bb37f41200e6a05a27642375a89a959
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.1.mod 1150 BLAKE2B dba381727351af838c47c0d81a0d842d3851dc4e4a6cce1fbea14ccef9dc21407dbe2749fcaf130df4211b083ddac015bc532f7285450e767064855cf729ecce SHA512 6a49609209f9d51e4851ed5c55a06b9451c0101de3bd92b7fa5b3662b2e85df4a667ad8068288773b9a85670c65fbba46f88c643aac290d1f65e2a44ef531409
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.44.2.mod 1075 BLAKE2B 370ba9f085033653a0fe9d328aca613b7feb50eb9407e55ed583d7b9302fd844856c9a1a9dca69c67c360c0a7b49ebff6ebd22946fb83c6c7061b9b8c573e99e SHA512 a58f7bd34b5ba8affd021a2d34be64e49dab0d9bb893ad25e00bf5b50ff92c4762b6d9093134b483dff2573ad3c0ebb5f42808dfbe33081cef0e96dc5215074f
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.45.1.mod 998 BLAKE2B 8dc0e29275055b37db12138b6e30fb22a6ccd995b3c3566efbb616f799660cd7073bfee935e41a77f311a95d0ec40ef9b5e40673ff8e59c9c06e5cfa32675adb SHA512 ade24f2b10476b5e5eb42d6f471b73ccb7d8107e6a26c5b1fd38191dc7d4ffee31552088fa5854983c47a2c4868a13bfc22d7f92f834662c75f7c4c88e0274ea
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.46.3.mod 960 BLAKE2B 879529244d38fbecdaea27588031c2d0d82551d8173f7e41f004dae8356e2264259d80e66953e941aa856a9613ae82211ea8dc0b12f9188f65bdf54487052952 SHA512 cbe178d04fe28f9b7dd07b0317fd4404d805e80ceada4953ad47763bafa2f215f88464c1315261a902ebcc52145af09df4c96a341e42644d38526909fcef313c
+DIST cloud.google.com%2Fgo%2Fbigquery%2F@v%2Fv1.0.1.mod 319 BLAKE2B 99d93b5a4dbd4c90f3e8dfb58e64ed41fdbb484f2348297a90c8dabe03b036ef6917c2c9fb7cc4795d0c8d25af10cefebff4c4bc1b2ebcdc876b6db8beae5eb8 SHA512 338a067f7ad15d8549da11ac146b65657923ae4fee3caf2eff888c104c0df0edcdf0d98f5be6a67a764aa39210d5cad811ebd9d604084a67049b753246fbf89a
+DIST cloud.google.com%2Fgo%2Fdatastore%2F@v%2Fv1.0.0.mod 433 BLAKE2B b3d58e290d719434bd433ffda9572fb233171493c7b81bfe353d9b7730130d5dec365f4e93a136a25467851b5f26cb21be6be06486696f010ccff1fcea140662 SHA512 8082ab039764aa6abd6615b1cf3a1830f2813dd5b791a27b7f0ebf5fa1ee68fe040a5e12988e6c91ba5d032a0a6666d384d6eceff12165d394a75ba56b744382
+DIST cloud.google.com%2Fgo%2Ffirestore%2F@v%2Fv1.1.0.mod 568 BLAKE2B d3d62f2d5c018c4ea3c829f7485e5a1239e2d810f79306af4d08ac32acda4d33e8e90c66c63540c4c95231f5fa116634758858dbf4af2a953a17b0db2b5c1cc9 SHA512 adb3d294ec1e9476bed820afa92aea5cabf77e7996d83bd1f03dff8447dfb13dd18ab4f091ad6ee209128151dcbfedb4967f99ccf7e10f5286e90b2ad56441d6
+DIST cloud.google.com%2Fgo%2Fpubsub%2F@v%2Fv1.0.1.mod 508 BLAKE2B 9915d1d1a768852b3f262784771c8fe2e7e176e61f7d77841f8d3adac571dc141e36c6455c19090cf00a98a7a5ef0c2c887424142e2ecad339f8105b1c30f91e SHA512 8a393b8614207c22c73a706ccc3e66a8a16d2f305ab95d8f70774f13d0bcb7396b0ac5095daa57ebb991225a1db08c3110f1e85c26dd72f3bbcaf73fea536d9c
+DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod 374 BLAKE2B 4fef9f7da9f23e94efe43be0e279958715949a889c5d51e388f5b66ec9a7cdbf15a717c988883647032998facd71359ad1dcacebcf3334100144abbfa12dac03 SHA512 faf4a02a513ae4c23f931b8917e74a056c528b4267ef3b5b704949283910bfc5d41fdd7264b78d4fc1f6e5b370474a7c9933a2fad36bb5c872006def71f8ed0b
+DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
DIST github-cli-0.10.1.tar.gz 257623 BLAKE2B 5b2dfb95ef4f4880524cfcae178e1c30dda608fc0d437e7f1090d04124cf4a6b1aaac8314baa9f27e2215758f44a1067b7807e61fa3271e75b9150dfa3b739ee SHA512 ab7e236b3aa14d4cb24e2af96fca07aa1a9cbacf4b80fcfce8ed157e24cca3c8c6e5ffa05240dabb8494e308960237d5b6920a4c426de6c00b655b201439d769
DIST github-cli-0.11.0.tar.gz 267416 BLAKE2B 4200693f4e63eec6c7123240f0eee871e82fc58e2714896ce85a09b791450d275a77681ad4f91f044c8f5041b3d3d35e1e4131ade1260d1b46e275468e172ace SHA512 9b4bac9750c38170817f4f818723f1b2a48caed0e49a706f6de3a151c9c84cd492b92c65bf1c9251d672831bf81fbf76c64ad2611fbd70b745fc091754db8eb1
DIST github-cli-0.8.0.tar.gz 225839 BLAKE2B c460405973e73374d393f19a6315a9b4af4de2ec3634b37a1669b8683e0cf5c1e5872dae4d130e9fca15dc88881e9abc4888d706b1050883361f378c8da5916d SHA512 5fca1f148a2973eafffa25df052ad09a8407dbcd2e41b9c5152011b990f02c27e1dc75b41d5c2b985bb18c6f1070839e8d526032230a910f9f776147a3a31c19
DIST github-cli-0.9.0.tar.gz 236398 BLAKE2B 8a1004b8fcf54179e2538d71471b4952fbe9ec2b67d97bea130afcceeb0b6dfd93ce9a9a477f54c1f689a0c5707cae5550445719a7badd81c66748543909d4fa SHA512 75d09cdcff4f31d6cad0e9570af3aafcffdfd8bdb925596780abde24c0ba20a212cfc9426aaa29e7409c7fbb7061bb8c88c15aef11fc9d9490265fa51aae5cd8
DIST github-cli-1.0.0.tar.gz 337523 BLAKE2B 8b7e2c507da77224d03f0c349eb0cb9538f3293a3684994cec1a8fc3f6f9f261d71f8febf54936afdfe734b0595ae052a2c6c83db803331b4991c453b50284d2 SHA512 c4b9c041ff8e63551ea6d94ec65017f8d264bc5b5c5b70b0525fcaea672c34f5e6aa57d096decef35891fb8d51a732c15835b0354e712b9dda353b7c869988c4
+DIST github-cli-1.4.0.tar.gz 386950 BLAKE2B 68126e45886e1bc38ac6c3a541e52f69299a6e12f1b6c5baafa6d5c3fbf5be8c30854b5c85294de6b50dd6bfe9e12262758a4751aad1aa4f310206ac10d4cf2f SHA512 cac1675bef1bcf749c87cb1d196fe687e32b304d73e16d4fc21dc4f429d18d4c04aa00be713a6b76e1261df565ecb589b8cf2ad322e4f7d49ea102369c5bf644
DIST github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.0.7.mod 731 BLAKE2B 1ca410dae120a2ec12efbe7c1d8e0fdd2a38ed1ed76ab770e37aa6ba449da6b5ef6e32a51e6ee263a982f1a593e2ee239fe0a774063d4295261f9ff63e09fc1c SHA512 72213e0d0609572f5e749a4f295a8b3ffd13bfe38f786fa3174e53ec318a623e9122c69718944034aa70b05ddad1771cbfa62d2fdc49df2152c5c9679a681ff9
DIST github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.0.7.zip 90292 BLAKE2B aa2accf4630d73289f2ef94ad870fc8599f25b7eff43d56b08c0b72464848181845db5b9c4b6bde5c91ad0969f2baa02d1d2f2aaca27287952895ab547b60ab3 SHA512 aba8a60445568ecb8f68b5d85604845e2a77a216f747b15b8012be59f5609a4e71d367aec4c6a222c9ec93d1b8063a190d9d529075be19ef633ef7f26b138216
DIST github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.1.1.mod 719 BLAKE2B d95afef5c101e842eb6754ce837753f0d953c76546b5cfa0a25b672e42db57b78e7fcf9fbc48dab261301c448a811818f53aabb251edf6cb209adf196a5cc0a8 SHA512 11355981fa0cc2c28a274175a123c7a3ac5dab596ea08faa429da137611bcfacfa15b38110943b520a99565776039f2c48c5474eade25aa64b8eb5a3fdb3f098
DIST github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.1.1.zip 151157 BLAKE2B 9580dddcd115d6a103153197f520eec62845acd051b3ab0771826cc4e5c34fe81173fca5878f92bff5513633b630fdb8efbab3b25a8e6d2fdbeac167307774b4 SHA512 37e1f668ff036df4352f8d612975d050bb8e70be2b02b3fbcb44301c26d48951aad6ca7857fae36e418edd68bcab4d3a56b2ff195dc396e890993b1d73454303
+DIST github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.2.3.mod 719 BLAKE2B d95afef5c101e842eb6754ce837753f0d953c76546b5cfa0a25b672e42db57b78e7fcf9fbc48dab261301c448a811818f53aabb251edf6cb209adf196a5cc0a8 SHA512 11355981fa0cc2c28a274175a123c7a3ac5dab596ea08faa429da137611bcfacfa15b38110943b520a99565776039f2c48c5474eade25aa64b8eb5a3fdb3f098
+DIST github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.2.3.zip 154742 BLAKE2B 1eb9644a4458d70e3d0ca66969cd4c50ee3ac3ec89a3840a0168d703fb4d716cdbdc703e07b9c60775220dfda3d48791d7410484314b7263f231155d51ec0d1b SHA512 765d4137f91984faf60380e9a67726cc679c26dcf421445b932aa18db9f2b29ef9c58d69c3cdbb97c3f1703fb880152d53c6eeafb639392a35218afc6491d8aa
DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip 56132 BLAKE2B 5edcfe991d7fc40094d637bae8d8d6f1f897ab3d3786ade2bb80287738103264520681ced8d30d2037253206c32d3f867f4d024a571cb9aad030ebc451e198eb SHA512 43ed64ae515738487e9b75a2290d0b2bc25e83c021a9f29b21487c37adbf34e74e1e7d3d5ec0dfe678c8396356f95c3993a5f5610d1791ff62056cd182a4272f
+DIST github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod 33 BLAKE2B d234bf9be3dd919cb1f8d33750a24dca68c90fea110fd0ff62f0dba86d2ebbfc66d55fea62745b6383c5607bc91cfd78c9d2cf12df251397e85995c04707caa2 SHA512 dbfa64ac31b25fdbff12110c6f9815abfde65f281e40852e7165499a2cefb6656c74fe0b82f0f018304daa02b83b421e9c15654efabad39787c69c1b2996a79d
DIST github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv1.0.0.mod 47 BLAKE2B dfd201f05c706aa363cbabd93007bc8ce093490f650cb59d3bb29c8a2977490fd11ea1027ddee290bea8a33abd78ef87336bef390490bdc8dce7ef6b8e73ce70 SHA512 283a7606aaa0d7463b9744a13a6c2064ca5d815077622a5d36e43be704c17403d80e6a5e106f544baaacf922b14d106843d99c1af174808960cc27a3fc26db91
DIST github.com%2F!make!now!just%2Fheredoc%2F@v%2Fv1.0.0.zip 5490 BLAKE2B 2355f8a7c8ed837b4fe28b744243a75b9e5202d8db5fc9458981de02d763d3ed518f7af348a3b2735a59fd873404ec3762602fcae11e9c48d9ca1dc48717a3ee SHA512 1e834235edd8f3551d0d040ed7fd26d4b324efe8406125adbf932dc92cc4c10382906a0f5c86bf53ab9456bde907f169b603b8d0d2862e5a8eb84b294af459a1
DIST github.com%2F!netflix%2Fgo-expect%2F@v%2Fv0.0.0-20180615182759-c93bf25de8e8.mod 36 BLAKE2B 000094171fec75b4e45d40bf820417400401971e3f18eb68588d15466e709097607b89ba18c8d8b6d2d658e4f718ab0662cc605c76c955464d9e6d45609945f5 SHA512 a1e0fa80fdf59962a05f1f6b1232c17f301010ada93a8628a89ea187de325c75f7d85359306c613371552671ffef2e513938e2d2ff57731dd2b226a54f87049d
@@ -29,9 +45,14 @@ DIST github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.mo
DIST github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.zip 5773 BLAKE2B c1026dc04da3122194368b90c597d7a3b7a90279d5ca27e6f3b397f0054c4f51dbb61205804fb0257c07ce078ec3b328fdc638e752411b379474cd51d2337488 SHA512 0c048e8778641577f394433483fdd4f916c9ff16ddd4d7b1b37c4b999b5107353e6867c2b2430b183027807e53f160ebb2419ad85f1d1b2e0bc0b190efe47352
DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
+DIST github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod 32 BLAKE2B f5b653f20e85bc44cbd3882fdd8f425c0b71733eae4bcdf2623952f1ed2524e8067a169f1cc0025f6570aaa4653969baa7d4626db6cf0dccb0d7378cc36da6b2 SHA512 a201f9c169bba0d962c2595ee8c625a2b7e39873e4bb3eb1ca646340638917dabb2309f1ba4b71d9fca4cf2da2d3684076c67ba362dd07a39538a45240f7f987
DIST github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod 35 BLAKE2B e9ca430f98cfcfdc5bc1e50ef421253011f21fe2a9a06b15b4b818f336c64a544ede9a8d1552740e85358fcb16a588345124b06fb2788951c24c9dd92c3b1cda SHA512 a0c76da94f068f583607520b728036f45ea071b727d3aee601eee712bd952b5f6c8cd5df1e1484195b07bb4c3b224771dda1fc7848dcd086a6dc93ada3ff2ce8
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod 35 BLAKE2B 97d3ccde6ba4ad06a5344183f954cd6dfea580673607a6d54f1c0f3a643aee512bbe5fe7bdbc22629e6ffeb58f70422b9b80577d70fb58db9b03ababc0552ba5 SHA512 fe8dfbec1d09d7da5829af43760a4ddb5495b6a63eeb76fb3758aeb2fcf83d83ea443a15789d7042a0f5e637664babc9c388dbebc63ff7d35fb9545c7c7da991
+DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod 40 BLAKE2B ce42c81a7dcb03d21a99d6240ce12f8455297722513497b1a75f2c848b5fb7ef70b577c2406638442f16beedd68806de890a5c299cf1c008c439df23df2f5bb1 SHA512 ec4424da8e1e3849408da7bfe83d37e21ac75edb889de8ef63be897d59678679b018f4606be78500952e7eee73a6252ee6e477b1a1612e2d036dbf72c17b9c9b
+DIST github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod 36 BLAKE2B ad3bb22bde28277f26a819b093ab7392da57c027bfb91bbbab4686d225ddc4e239c0905f6eec64cda2fd47746bd625682f663a11007bdbbf64f9cbff7dd1de76 SHA512 f961ced2c3e902be60fb862fff6b1c4457c57bd7586375a18857863be63d9b3ea998b05fc0c9c3a7270387e9907861d6f9d6ce4024643ec84ea6a63e59e915c1
+DIST github.com%2Fbketelsen%2Fcrypt%2F@v%2Fv0.0.3-0.20200106085610-5cbc8cc4026c.mod 568 BLAKE2B a2769032d81e02d8f4945648d36e862a996841d0e138077fd190b47b700fa08cd4e8e8d300925fcae5ebe48ea972afed0dcde81870f3673a3227ba90beb5e341 SHA512 262ec838f5c4b97bc186533c20456e62633038ae74747c7b884788bd06ce01863a59237557877d35f37338ebc018d2c1c8ae963e4a42dd42e0823a5b3ec81bb3
DIST github.com%2Fbriandowns%2Fspinner%2F@v%2Fv1.10.1-0.20200410162419-bf6cf7ae6727.mod 140 BLAKE2B e7d82ecc42519dddcefda566053466b04af58afbcb422079068dac90c384ca38cbc6e44d044986ac3f753ffbcbbcbc1b1c32c334f1b26d1abcda487599d7630d SHA512 f9cc1a1c738579aedb37b69badb2624e4fd936756de67b2656849c406497bb547208db7a29f70e98a3e7ba5081878227f69680e53dc3dceb0b46ecb8c509c43a
DIST github.com%2Fbriandowns%2Fspinner%2F@v%2Fv1.10.1-0.20200410162419-bf6cf7ae6727.zip 225908 BLAKE2B 81a35285be6dfb797ed4621426fdb05f6ebfcb4358222548bc161141b73488ed4bf2206374a44308a99f300039fc04e783e11343146c375f601ed7d43c867efd SHA512 6890d10b3d8c02de2f3d0ff0e69eb772a4cbf3d293e6cc065f96ee4919ddcfac34d380f89d19381c02fd5312d9e54d7217f13b8e94cedf5c0bdd5b8e01f9e2bd
DIST github.com%2Fbriandowns%2Fspinner%2F@v%2Fv1.11.1.mod 140 BLAKE2B e7d82ecc42519dddcefda566053466b04af58afbcb422079068dac90c384ca38cbc6e44d044986ac3f753ffbcbbcbc1b1c32c334f1b26d1abcda487599d7630d SHA512 f9cc1a1c738579aedb37b69badb2624e4fd936756de67b2656849c406497bb547208db7a29f70e98a3e7ba5081878227f69680e53dc3dceb0b46ecb8c509c43a
@@ -41,12 +62,16 @@ DIST github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.1.1-0.20200320173916-301d3bc
DIST github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.1.1-0.20200320173916-301d3bcf3058.zip 553185 BLAKE2B f8157149a821cd527c9b9a4980e7d18038f4be550b20c3fef3b7f45818812773cebc35ab2955fcfeebfaf469a160c780a20a52323907848db0764e1c633b13b6 SHA512 aed0a7f014eac4cb07dac7e4fd446523e5787903d7bfe3dbf187055cd7ed81bb398652a7219af6cbee158599fa6739d4b615d41007d26d00b01b078813f2aff8
DIST github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.2.1-0.20200724174618-1246d13c1684.mod 284 BLAKE2B c24bea0833ca93fe4e43e639f601cf7c2123aa21320193a59abed6a8dbc18530e1d2a9e90eb8a27d6b836978d5f79066b2b6ee328f3cd24508bae3f03a47d021 SHA512 55e98df741d1b7d2376e26b8c23f322e5425fa346d98f571d4f5c22cbfd63b6ca88c8caeb2f538b355a4cb8eab39984d1cd0029ab7570184ba80eb2958e8382c
DIST github.com%2Fcharmbracelet%2Fglamour%2F@v%2Fv0.2.1-0.20200724174618-1246d13c1684.zip 553508 BLAKE2B 0e613623ae7238b16c77b0245577bbc65ee903fcd36f2a970f0e62955e2aea4b7ee36fc3b20bf892f95ed02417ad1a7288b09776bb4f8cdbde800dc364883d6c SHA512 31dd378d0006e449b88ac2ecef5e47198c10f86204e4ee0e1128c211ab31da3d4c62dddb594b5c34cf446e9aa7228c9ead3cc83895e5157d8067d728fdfbfb12
+DIST github.com%2Fcli%2Fsafeexec%2F@v%2Fv1.0.0.mod 40 BLAKE2B 7ab19e087a8058fa51d0e17ecfe123b7187acfddc96633385d54e68cd4522de69b5005da6f6f47970cf92a0c1f6164c2dfd439b620fa51c0d64d13dc0945bf05 SHA512 427d6b45641cc39b572963ab5d482860e50d5727ea8591598787d0bcdf00ca5cb12d24dd28bbbac45855f38d07d07bc686af5276f75ff5b0f6fc94eaffce150a
+DIST github.com%2Fcli%2Fsafeexec%2F@v%2Fv1.0.0.zip 6901 BLAKE2B fefb4882a93946812fc98c20dbb38cc8172fd207742552d233f3a3076de1da102a58188662e14bb86cb1b1b1ff50b898e0642f151c42f3cb13eb19d02e83cd14 SHA512 7b037e25dcc46063606f753e419143a8baa19a817fead39f7322370f8f4cc8abb3937c8790db85799d8a86582c0dbd9e7f2ef74408d837ecc646f23bec2bc6ad
DIST github.com%2Fcli%2Fshurcoo!l-graphql%2F@v%2Fv0.0.0-20200707151639-0f7232a2bf7e.mod 182 BLAKE2B cfaa0b1b2ef310b9950e6e41ffa374e1e4c19ddb07519f493c5c2e7ffab9d7e8a1da63646d8e56b603075a93a3dcb9fa6b5acac9f183dbabe78e00bb28d3f660 SHA512 f9514e587a38fdf0bf2d29c6d908b242645341b4b5e1616bc2257ebd2eb1afa45ffc41132077957112c3d23d833c102dd7291efb8cfe32f326db40e99d20b6c2
DIST github.com%2Fcli%2Fshurcoo!l-graphql%2F@v%2Fv0.0.0-20200707151639-0f7232a2bf7e.zip 25883 BLAKE2B 40e18b6c3af8a28922261454d82fca14c83f2153d3d84f2729f15a19b6cd8e61cdf6d31908d259ef3eca51527ee0cdc162ed114d48c24c9a03d82912e436507d SHA512 eacfdd76948c11b063d041db27fb51b28e2c3dc434113a668678905106907adf10cc8004117ccc8d312ebeb33c81201d1bd90392b4a96707dadc2f2d4b0b5bab
DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459 SHA512 ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5
DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod 31 BLAKE2B 7bbb809c199d39bac173751c3dc21b23ee8b020f20b4447c33681469b5083c64e74f699fa8d3dd55446b76ed44fc0949337303a776efeed90a764af1d751c8a4 SHA512 12f6b0e7090b257656ee9068083207fdd1b6d9f0b27546cb5b3a5a520e5944f3eccb8f6dd644a17e1089bbf787fd26b3e83eb0f0353071c8c4ef23ca99bc6251
DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.10+incompatible.mod 30 BLAKE2B d511bd14351d68fcde2b3be3f008373eb12d2c61133c80aa3a1938e53ffa061c0aa51065f07b208a073b448c25309c3b2d67c0ed19ad3697309a679fcb844414 SHA512 a986c2cac4728288aaf90667b54ffe9cbb9e1a55697347f9541e6aa0dbfc5b8d245c2ac15e8a9558d41862d98325f3f2f4055b02bcf1e9045b78bb3577b3f45f
+DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod 30 BLAKE2B d511bd14351d68fcde2b3be3f008373eb12d2c61133c80aa3a1938e53ffa061c0aa51065f07b208a073b448c25309c3b2d67c0ed19ad3697309a679fcb844414 SHA512 a986c2cac4728288aaf90667b54ffe9cbb9e1a55697347f9541e6aa0dbfc5b8d245c2ac15e8a9558d41862d98325f3f2f4055b02bcf1e9045b78bb3577b3f45f
DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
+DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
@@ -62,10 +87,13 @@ DIST github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.6.mod 34 BLAKE2B 900b7c39f85b3c3
DIST github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.1.6.zip 689531 BLAKE2B 959fef9198d29d7ba6696cd8b1f273c14284566490efa47b6ec768a5a9e77fa251083451a3f3f589abb00bdc4d00051dd8ad1850b5f660e3a79d40940ee6168b SHA512 fd02c0253ca30ebdcb5d34699d66ad8333192672f89b89db5b6ad00ebf3c8a8a7280f8e650e2080572fdbb86d0e09f4535bd08e7dfaf8dc6e276e7a3c92ef0d4
DIST github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.mod 34 BLAKE2B 900b7c39f85b3c32ae1cdcb56063defb238ec2dd7620f1a13b0a7b7a5c1eb237854d00d7a6063cc546fb6c7a41bb0fe6d71ba4589bca57d8dd1183a806685f9e SHA512 91475e539eb45a642590606c6174f07b3461691aa18cc232362694890b446a7f033834676273e33cac54db288a793fd70d07d5997997716f954d1806ac879091
DIST github.com%2Fdlclark%2Fregexp2%2F@v%2Fv1.2.0.zip 691188 BLAKE2B a59e078427dcfedf06e31b212306e6c1bf0ba16248a86b5b3bfabe913acab2ef35b6d3f9f6b165cd773cffc9f030f1aa930e1a3dea7e066820949703962614bb SHA512 009731d05f05cfa69b710df82c894a2f31a53bd90aa3554b34bffc9f304548e5ed5c1142338e8917fd526e0fc54d1b5cb010eba8508a689efa0d852bdfe484c4
+DIST github.com%2Fenescakir%2Femoji%2F@v%2Fv1.0.0.mod 43 BLAKE2B 251da0399d8aebbab22fccd29d618291bd01442d1940107774496a444edabc62bfa9daa58f49ac6fcfbd09e5160af4543b458b9f02ed55957d1df864a6575838 SHA512 df166f886fa04fce87433dca9cc4889cc91eb8ef03999a17fea64d2415e1e8ee2fa6fa214ce8a749b6e1cae1a806f1d84373edb0a3382e5eef0c150013fdf1c2
+DIST github.com%2Fenescakir%2Femoji%2F@v%2Fv1.0.0.zip 74220 BLAKE2B 7d077f187ad1666f1cbdf91997e95d19314434a5b02856c1e289708fc360414a49c297419b6eef93b639f9f238b198f9837764428e7d15a1c361c8cb7752013a SHA512 93e9d750b6484b9b2b8700dca0105e58062cd6f20d3b69d3372e9568e302bfeafe5c466dd8e8f9af6fd6a68b81d34c3ab8a4bb9d99a26cc07d07f07d73786f16
DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip 11987 BLAKE2B bb585868c568466b366c1c50762376d9e2b6f3d3ac287af94c45f7d348516d2e80ee96c6980a4b5fede40f1302f0e3e900e24aae16fec29801a795cb7e514dec SHA512 70f78081c04bdbb52e8f5d24b8926b39a28c4f069beaee0d7bf24be946f2b0ee3bc08d8ecc1305412623670e1767433a37d458df3fc849d244c63b6222f1f599
DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod 36 BLAKE2B 2b77fbdbb6c6c20767c120b390fbd2992bf79dcae0a35c27121a6e755233da3ecb7d74e74c38c0a2463976b546ed8bbfb8a8d8cb140526dd9a0c4f524cc131a4 SHA512 5749d33fb085d63b7c12f43df824c96f168323cf6d88cfea3e2536eeb7b56689dab9dddb8cde1ec8bc9c2848e7148b8a37abf8523a99c55ce10f896245c5f341
DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
+DIST github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod 29 BLAKE2B 1cefa73995b3d0b4206aea263f55c672b675dd22d42c61a92f7380b6e726f2d7ea40e0a9e456181f34808f5386eae3c485bd2872857caf1824254fe4a55cb635 SHA512 a709c650da5d5f513e94891b88c26697826fafebc1ca964fb9544415637ca14e3b9f1f4ddcf738e28032e10a2d39b619678ec5c8d44cc0a1dff738c75645e2f8
DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b68559846a28bd29f39f584603cd79e1189a9ad76909cce7423a811f71265baf5b7f381a33bee76917759a9cb6ac131ab21450b4b52558cb6190 SHA512 526b97ecd0ccf878c0ada56c5217405c34c59d4c9cb53808f98b24a2823c0b3f1a74e862b9b1a5594034e570aa6749574d5e49212d6d48724e984f528b8c67ea
DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod 100 BLAKE2B 2558b7edc234429c8bc0926d347231c2352cbfe83d83bc3c7e76ed0ac4b3a843de65cc3e0dede3f0acb7a2dedc623584eff8cb236787c12d7f5a47c9e1c39145 SHA512 5782a5d5e5d4c64244a8463e0f15dfb97de4b60b9fed527ebbd8dc5a26999af8ad0b3ce0064da30182c757785ea9b35f253c5946b233fa3d9a61c873b23011c7
@@ -75,30 +103,63 @@ DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod 88 BLAKE2B 0699027ef7284edb7
DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod 30 BLAKE2B 6dea6116bb7fb72123a93cc8b83dca5455b76591c7948524ffe664bf966780799c4d007154502922e21f688aef5148211db6b0e3dd3f6b545c4192f5bd5166a8 SHA512 3714d2a95d0435a113c36df5feb13f77a07a1514fdf6b5f01e6e8cc5d159067736e0065bad8062dc636fa5c52c98e3fea6985075005b2838bdf53e0b07093024
DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.3.1.mod 93 BLAKE2B aa4bc48d8914434d540f570e6017b3572dc4b75563174e73ecce9f86460669a264389e1e24ce26cbe056a26865b3cee294457315034b6ae9779001b7306d91a3 SHA512 5dff0170dc085e1be63ce69886cb019b9df09a5678128b3b0a1b174756500f7d4bd62dc25ee7546977e298f719746ce951119908ff59463a79a1aec7a8882e32
DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip 461624 BLAKE2B 37b2bbde9cd1153fe5811ae008983179820ce40fd6816155fc7b7d040e29b8725509f68c30b5099b686e9a6ff31a2d029188aa526ada6375fb9c7a236b8a7d1a SHA512 a99c2150515bc3deef1d7887644497fc4aaa96ed6c2aaeae91aabfaee6668c144b34a2c75ca829636c7e88d59b297601867b0f188ac048de452b5e0767480608
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip 465217 BLAKE2B 4caaf832a22faf1c45e04bebf35d29b38bfab18a490ad1fd7b2c6cd85ae678fd3991505f68e526f9f2205cf919374b07d57f8abe95d8f74dc8263cd37a9db3dd SHA512 7fe69c066b2407e6000ae21888f6cc696e51df2342a71e196aba1a9a9ecce630bd9a4d41c58b3105002508a4d0efb9c5ae2b8a87f848b8e2c6293558b8c4b4ad
+DIST github.com%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
DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod 32 BLAKE2B 7c7baa1e29b9806fb97e0d557200e8722f2d373e149127307efa285cdfedb36dd57355168554d1a1bada62144e6a6a00c4d3246aa9afc7d0ffae0f087459c552 SHA512 7229d917bb0c788b07297e1b09b8f7952f951998a56f17ea1f69ff7c2f565a5686b212f42f45c6b8351905d6740a2ec5a235e493daa531ae00cb709faf67ae45
DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.zip 74164 BLAKE2B 6a3c04c2986b35dcc32f14553534758c3270c294a5e2595487f884e32e76cac2ebbc34cf7e42232eb7d85e71fee7660b513de4e365981e625515b086c341d15c SHA512 7be2dd2b362f56ad7fb7be35b62a841ca051d4fe31ffe1ca784e393b0cfe44674a050cf1129a15094872bc16c8ed9bc62afe0e7017bcaf1a4eb9b2e39423f790
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.zip 107826 BLAKE2B 29a78a894dafce98587969d844470c650fd2dd5284b0801a7a63a052279ee60f9c95c65398b3d5448b7ea5dfa67f971c3c8cbd5261ebef63b437b0a945fe8d38 SHA512 bdce84633bb5e735b6500b4d3da15894ab2adb34af81bdd053b2b19ffd5286b9fd3f66c73d13c930d72521627486bd80f10f8d3945cb50bb161981aac6e4ce7e
DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip 127156 BLAKE2B 1d06924d2e9fadaefa1a506c16830c88e983c3d14b3bb9a82c216879531ffb664dc90de8fbf3b6025ae8b5e7cee1a9ecb900a7eabb85f6144d304fab7cacf21f SHA512 365bb5271fded39749a69bdfaee6e29740b26b84e0a737fedab3e50cc0416a098f0ed0a14704dc1ec9bc1eb81b8827de4a151024f5ea3e6c75a9fb9abfc14d62
DIST github.com%2Fgoogle%2Fgoterm%2F@v%2Fv0.0.0-20190703233501-fc88cf888a3f.mod 32 BLAKE2B b4a6a587860fd47f9340df6d0af6ec2cae0f503dc71c715ba513bf266e707f02df445c0a0006cf9839a647ea613703bb9fdcf6b002de99a5383dd33ed960173b SHA512 c1830b7804ca1b5a7c6d258f0dbc92c733b70551b1fa44ea0144f0b263e3f7283047c19770971565386d197fff2e8685cd67c2870f85e0dc1f9143016f9bc572
DIST github.com%2Fgoogle%2Fgoterm%2F@v%2Fv0.0.0-20190703233501-fc88cf888a3f.zip 23165 BLAKE2B 828e907723a961b6ea098162a30917e9f710ac38218529d2182056b551b7da98578d9e4d52b1259f9b4f2c03d1a1d27490bc037e96eb55a325eac8a7360a7718 SHA512 ead3c46b7409ed22f125b75333fcf558dcfde165e20a837e89228e5674da65a92df59380c4018d6784a3509d4e99a54cdf7ab7c5d6ca09bfe2cbbc5347ae456f
+DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 694b57887cca857fe6950b0df444dc6e3d757dde540c1846ddcd4bb8f96a5eef3f469eaec30cf415541ff2f53acaafffbf4032189122875603d7e5e3dad2ef97 SHA512 cffb5dc1c6531ae9d5998b3a57ba14de5dd8631a36dd48975da07ce5ec052d97b6f632c5d30ab9ab695f178758837aae8a6344c67d57c7a39ca8e9243f8211df
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20190515194954-54271f7e092f.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
+DIST github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod 34 BLAKE2B 1eabef50b2977886d7980d7da197828b826c54018766418b3160f5cd512784635e5791a40cc4fb806d52f5ead99f941fae8037872d6cedfd6c851103f3be1a74 SHA512 a46cae976ce90d1cef802eeaa873c059cc9ec3678d5c3c304a9de45f44f20a24d68fa290cfdcf78c4ac222a6d619a005825de8f11e72b9a5af476a0b0180092b
DIST github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.mod 40 BLAKE2B ddfa83250a6d66e0f112a249993164e9dc1880abef25e9d8921c58bba907eccc0fca5f34cf3333523d81b22e615e6bda8e1080a7bbb8d21e33fafc168de0cf8f SHA512 33a53fe7874517289a9eb9d87b62060ab4827159300acb6f933018b30fc56e3356ec3d33ee64e452137cc6c892a0c6eddeb7e6bd383be8972407c6e7568f94fa
DIST github.com%2Fgoogle%2Fshlex%2F@v%2Fv0.0.0-20191202100458-e7afc7fbc510.zip 8977 BLAKE2B 54e69095f7fc33a26037f2a924ce3291b3a9455c6716a50179ddb161accb07d79f30a72400ddb13229109fead8a9a2e8e85c78f63ed0c2303e0777a571e2be84 SHA512 74bf278d42859148df97c1fdefcbe962ebc583e3c567157b4e17721fd4cef5db7d24c9a76fb32a3d827e6bce6ba761181d9a2d1eca804b59f3cb792a30198906
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod 88 BLAKE2B 840afaa28e8d5b816289e6556e114311f039b477e5ac86fc1c2ac80b1f8d7729ab6a83b99baa4c03de9634240481feb13900fd4049753b8de839656d6a7cef8f SHA512 31e50016a01fd485775368e2e430959278cb6c03ae6b1871b3d0c173fd43e91654ae87d1758c08daf897e55be8b4044bcb47fc072ec645d16e2594f345b46c73
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod 79 BLAKE2B 21f442637ef0be838858e192b563e158bf6ed1f7e06e09a3872fbcd613046b095c5209d9ccd9cc0853ef14947b6b70d4483675505d0905a1d2aab15e7bfdf80a SHA512 2af320b0514b032ee87a92d99d673579981571f325d0d46133e212a639eca274d5a6f8164a7256cfa6c063967b98ace36e637f53d90331903fd6e4a21f1a5a19
+DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod 36 BLAKE2B 94a5b4cb6c6de32397f001dfc95c49960de212f67fbb6b4a1a4806f78cac88a2698c3c2e19b7e1cb64d07a3ad6caab25a1006bb4f51b65e1c62c5a12c77d8b9c SHA512 21ce8fb666af3c32e843c816626a7c4c0c63ed1f170c7a49eea4a2f40e28e4ba0105dad2e17aa527da7dc3eca198a20dbb6566e60ef48d7d7cf72413bc81d24a
+DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.2.mod 45 BLAKE2B 5f187c997ed74f2aab1da57c9a828be383e41f47905531da8babc1360612ba5d4cc0fc6cc48106647ffa450f334c7cc5f455bea7f6e6b9734f3e55734cf623c6 SHA512 81ef224435efb5cbd429dd4339e8410234855f4a268302a61d34e76c388e89ea22c97ae90d71a6ef910ca00d3178e40d3587eaf484112966050fbd1f1f4843ab
DIST github.com%2Fgraph-gophers%2Fgraphql-go%2F@v%2Fv0.0.0-20200622220639-c1d9693c95a6.mod 106 BLAKE2B 1a65e75a7724f3ab30867040585056b7f0697393e038fdde69d8b6f6173f6cd0302e3a4e65f42405878680707c40bb3163e422a5da49edfc78ef47ee1c503ad3 SHA512 470fc9dd28cd76702e86a4a6e1df812506dfb9bc0e0cdbed8be2bd6859344a575b9ada6f9d7f53eadc44300f1e4e50e47c65dc4171f50ddd2ebfaad3146f780f
DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod 52 BLAKE2B 9e5de5c147fb3f100119fc7c290e9790af57892762b7ea8b2a8328c397432466ba56ee20b64ced6dc548d58bf8ef0ecb2e62a51de2524f90a0ff39921d0f2a3f SHA512 c9e15e4a4436ffdedfe5ece51858a45806d6fd77d2306c35eb986a866a3da5bec0d5d06ddba55a05ca45c8c29a51bc7c58150849b5dbde569a6810012f3ace4e
DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
+DIST github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.1.0.mod 449 BLAKE2B 1fbabe18b977c8e6283312fc1f8d8b35514104080a4880afd4445b92fa20af4db49ef3f7fe1da703d4237e6bd78902e64fcc7e9d4db85e84153c2bdbc6a6366b SHA512 a6d33e281b580e5a3461edadbf4e5ebe6aa74a8a929b9f0e96582592b24c85eea1ab202457f88f648018cf5991d267811132ec77255ab4886b6ccf958487d5eb
+DIST github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.1.1.mod 220 BLAKE2B bfe2c5d746b4762c2a5e90ebf1db1e0489fae5f8de20cc1a16f4c9aaba016fc4500251efd3daa8a14b0a6145220b6e429ce1608cf11d7d69605c68fbcdddb684 SHA512 883151379f088d2645429c88fd2fc598b736fcee56feed40d05efe4540562d409cb54ec061b58d9dfd5f8a363bf3e5183af3a44cc669ce23ac7fc7b9f512950c
+DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
+DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod 41 BLAKE2B 927bedbe012a3bba2fb1363bf0157795f58be7dde5d303332f72ae6d7bd13775e9e1e034db821821857801b21b2366a92a28bcb84c00704a12925db0ce19a4e4 SHA512 302b6f472b54597aaeb4b43528098b5a5264acc97abf2228d8cb62bf32e6a29a7171ec6fb8898b494ffe837ee044e58f5596bff425214985aacd2b8b69934341
+DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
+DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod 39 BLAKE2B c5b445c060258545233b5453482e0c739f815c1ff605b539610f3b0bdbadb6da88954c6a408084f171354256bb8521b528573f56080d4125f4fac474ff9bde83 SHA512 45b4424a023ea15d95167322e022269e32f7a718dbeaf192d0cee9f6bd136f5b4a26827d6d041a8103a95f622a0dc92123b32e6463254199893f360ad8680de0
+DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod 87 BLAKE2B 34587a565b583aac6338d7d23b4e7c2ce12deb6700e00bec711d3d8d829ef1ae356eb1b28873d5bc2a0d6ed249dd6095539a1dfd8c177bec32e08d97f4003620 SHA512 d47dfa43806a386eb74b60f692b3bc580997edb9d7feff6633992a5adbf94d102a238e036d828952e204960152c62895288af6f09e2582e8b1408d259fb834c0
+DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod 89 BLAKE2B 9e53a988f41eb9425cc2fe3051c0bbe67c65208e6988ae1b455450183c225739b540edb0e59cdd8d010c34e89c4e4acb70687c2bcb861d379443a5c36e261458 SHA512 3446ae69871561766d2b70963eccaf443edafd9328f0f58a97630fde61fa746e59d26ee5d833548a92711555656aa9c1f44bb9e241aa87e21f4424a1f10fbe1a
+DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod 40 BLAKE2B 211ec0a2a2a91bfe13a6ad5d7c6cac97497b62796053c633e945a51aa13dc946b6dee1adf040db0e270e1aeca614a43242673dfe44baf06034856d89a61b4030 SHA512 756eee5fa17dc2f37aa9bd623aa2ea86e6ca35a804da1b48067b08fcabd4083ebcca867bb3562453d17f517aa1e6aaec0143cf5776fdf3686ed562f11147293d
+DIST github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod 38 BLAKE2B 9696a247ecfb868250995f7fde811a647e8b01d6f3a33996109c44aaa16bc85c0c70e9bc621857db7208f5ef49706cd3b2313f13b9e6f3327aebac20f72b4a8f SHA512 dec8c92389eca1dc304cce77cc70a3b51940f073581320117627c759edd5b523c379473179865f1e3e3f86deb9f323a5fff54951871053ed43293b0454182871
+DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
+DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod 39 BLAKE2B 65fa1ffbb1bf64cb9bd4830d71ef2ac2fd2344849de31367b61b8c54cf6d2ed8193f54b32937e0f80298b1e59b08fc291d52c91955be5b1fcbfecc4851f16e5c SHA512 40ee5ae5f6991a06b8ef61f04349a5012e36932b53c678dee58d25fc1bae386d6d431de4167641721c28f686071439fb8c9c250bf9607e9743a7280244618d87
DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.zip 15917 BLAKE2B 66bf9607834472667be4da679727ff2b004e95dc52e4c69d1470586244387b3cb2afb792b8f7d858c4edb3f73151771eed8d7509c7da91ad31655a945ac4d326 SHA512 b1267266cdb9895cfc0707dcfbb3dbcc8e3a53adb297811ee70d20f6a77d080f5cb0c4b8438e68d933a7ebf701c0c3e3f9a1b881916fbdf5b4832d5ae790ebe8
DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.mod 39 BLAKE2B 65fa1ffbb1bf64cb9bd4830d71ef2ac2fd2344849de31367b61b8c54cf6d2ed8193f54b32937e0f80298b1e59b08fc291d52c91955be5b1fcbfecc4851f16e5c SHA512 40ee5ae5f6991a06b8ef61f04349a5012e36932b53c678dee58d25fc1bae386d6d431de4167641721c28f686071439fb8c9c250bf9607e9743a7280244618d87
DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.1.zip 16706 BLAKE2B 3077f81adf72f995a24e9e8e0fd90e0457d5c210cba7b820dfed7a2cddb06eef4ad4747ff0da2e663419ba891df9fa7ff374e1bc73f2326faddcde17bd3e6bae SHA512 c44bca4c63fc38ebd97c2abb7b5bfa2af635548723697d9533590242b936f1b55b119d0f4a327f1b02c546d571cd0d085f727c00057634d8c2316d1c7249fecd
+DIST github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod 35 BLAKE2B e084dc4953a472039fcdbfaceb0046f7af0cbe4078af4f2560457d8a47e3bf4654c725578f4f54ca1d41f48e37ff6bd1b3968e9b061773ce9fbda5fa5c50f17f SHA512 a36b4a70bb4b943055ad91fc4f754d55473b48f1e6330c9526e4a50dc4aba3b3462b787c71d7f2e863f78518e945ce15f9198a9bd0d6817146f92799733460f1
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod 75 BLAKE2B a44a3c2185418f331e2648bdef36882414dbf8416884b8fd385b7e926c9b837d317322a433e7312e14c27eb095cbed26a74eec9822f0f063a2d14e753031f632 SHA512 045ed40015294ebd8f7a6df06b418415da8f091d09fb4d34fd70718bbf5ce9f49dca7399dc5649336de3fc83bbbd93e740ad6f62d41ea540fae3b17f349cd66b
+DIST github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod 37 BLAKE2B b9e2cfa29511ec268d1dc1e0d8a8eeeaf1c246c1cd828fe6c2618c2f7d313deb4456e5d35d60034825585430da755b96d25ee003028f55c1b2aebaee2fbda535 SHA512 82c9a364ab098ebb6f830753e089529036cb405aed375df5b55459b203a1d2d02299103925bcf4dff94bf4868e7005f114367e90fd2d24d5f1db3e0287628f66
+DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod 376 BLAKE2B dd92d033685d65d1876a52156317b2f1196028c035f6ef039849df4066b93fc518e9f9c06a666b4fb1fb803d984266f57fd9eecd891e241bc50f8b54ed6a9952 SHA512 541dffe3beadcf5eeebe266671462e3827262ae700a146c4a08700b325018b183252650b50a7d4e539e872c0b6e5d7e35de4f1abdd955dcad51543ea6b22acc1
+DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod 921 BLAKE2B df064db28a23bae411857c5abc0e9a0e4635556e51326db806eaa79008505c49b9ed1579a7db6f72a9cbd6128fc10cb858cdaac6d71725fa4b21b43526767c04 SHA512 8128789efce7912b540284205af308c33ab47af7dcbcb165c1d0a86e342b17bbc8dc5c8cd6d5c5e751c412b6b4b8e80bb6d2f3b4fadd813dc147301ec27c45b6
+DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod 774 BLAKE2B 3b47f3c78972eb538f84348d5e698a2e44d86d4f51316b8cf596be23433e91a763c24ea9463cea0f52476c656067ee4e254d5cb905464d7e32a6b69aaed0bb56 SHA512 7fb4f6b07a08973d6cf33be6f03356eb1b176d816955274a4aa1571b8965fc311ff0c832901fe9a716c5d5bb697e7c861c458ce618fd7d2d4eecb316b2efbbdd
DIST github.com%2Fhenvic%2Fhttpretty%2F@v%2Fv0.0.4.mod 44 BLAKE2B 94ad329f624923cf978da8c5a6ee75345463bbca80f0165433c6e2221795f0fc9d5751ba2f00a815dc4ae9320c3a2994c8ba70e5775eefdd315dba02561d6d70 SHA512 40bca3f1c4e260519e554e71f0578c9e8c6e0ee064d65446f869fe24ae73c84beb01b91db4e48cc324cde72b43ea695721b490606dfa2aff17f1037b51de7fda
DIST github.com%2Fhenvic%2Fhttpretty%2F@v%2Fv0.0.4.zip 50127 BLAKE2B a1be6b96e421a711f6bbb67520724fd3723a0f218bb530e77f5f34916d8d8f526a56614ab5b0336b6f3707cdbb47ab96e7b1c4a32917f3d2e76b74daaec636b7 SHA512 e094a536e0a8de13a21272073bfbffce16e27f2971c5426a34199859828f014c8c2e60c105d2765ddaa46fd1340f6550c052160dcb16b97383c2f0269395a094
DIST github.com%2Fhenvic%2Fhttpretty%2F@v%2Fv0.0.5.mod 44 BLAKE2B 94ad329f624923cf978da8c5a6ee75345463bbca80f0165433c6e2221795f0fc9d5751ba2f00a815dc4ae9320c3a2994c8ba70e5775eefdd315dba02561d6d70 SHA512 40bca3f1c4e260519e554e71f0578c9e8c6e0ee064d65446f869fe24ae73c84beb01b91db4e48cc324cde72b43ea695721b490606dfa2aff17f1037b51de7fda
@@ -110,6 +171,9 @@ DIST github.com%2Fhinshun%2Fvt10x%2F@v%2Fv0.0.0-20180616224451-1954e6464174.zip
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%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod 38 BLAKE2B 091e824ab9156af7978fe3aa6f61ae046588510903cf635ec166225395e40df6a1c715e4eb3c47aee849435eca3cc10db971a7c28acdae233eda85a4408c7520 SHA512 377d94cf7dd50f88b57ba829ded5169a6c41c5a304814660df0a3447d10860b87855f25cdb945a6e4de14c41281651330d4109c6dd6684c86fa4dbba27a3872d
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
+DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod 43 BLAKE2B 02346f7c8a28f8d40ef233bc1fc6f3cee54a54bfd79b374ab7f3435039a5d9f7da5d7fb7824c618d25034cde1d355b503bddd76b804d610828a080ccb2707dc2 SHA512 801663d67d1aead6b01df89e329c8ca969a1f860b5ee2c2018094791060bf6e8cddac8e2d788ac823e32278d4e9ad1dbd72935e4da2cf6e65a34dc97f195ce7c
+DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f
DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc
DIST github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod 41 BLAKE2B e9dae477e838938303749c4e7f1d0ece371d20bfb8f0d6fbb915a9ec249b82e300ef691c2175137488065828f67b02503576420fc95c2aa40f4fda262526dc7a SHA512 ab1be2f5ee91ad8c24a7c1d3c2277506dd76f85e8511f53e923ea7e0ecba140303c9312f0ecd2e09631e2e6591ad31a3b19e900ec102b486ed9b56c38a0d0c84
DIST github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.zip 7034 BLAKE2B 7732946a34f604c858bda571c3afee7e0e02720d02127d8b4887f4f0363389b50088727de91b0436f0c943d11de80dfb766208f15665d0b4e5cf68f2a7b00817 SHA512 f9c4eaeeb1380aa5e219a19923cfd51f2612fbf11b7f37c710cdb0dfe20270f8cc7841d50dfd17110b004ec46e4c90329286213e04de481a54094df73efc9fe4
@@ -127,6 +191,7 @@ DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3d
DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.mod 51 BLAKE2B be532e33c9a0e83b9d0b760b21d97ac83850299adb329f754f31e4b46dc7fb7a7157d2a41cdc258924ef8ee5c111a95ac3b0037d749cc936e1988a46612522cd SHA512 270b19446ac9a396f5ce7a000873928a44edb1457f86d294971dae08be37cd64ddb8edc0293e100ee60d56c504851aa69ab11db0b4cfd46649c5f79459e40011
DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.zip 442291 BLAKE2B 02ee4982a588e0fd1575206340bd97663147459664a2942edf151c4aec2bd20da83984c68c76e1c505c1ef930b77f934a8210f6c0ca106a0c0c91ff63733b92d SHA512 8e275955eb9e5034c155c6e469e2a3117bee30fbe42e8ae394f496b83f473a1568847707707716dd5a3c57dd0e0a4bb4f4cc9af04940218ce24420493e923f14
DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
+DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod 37 BLAKE2B 6bd675a05c0bb6f9dc12d09203d13de115801888cf8c02cb5d609f72d214b7e7ebf13a72ddfa2eb9172e9c2ba1f3e5a040f089a86ce9fe873d49288d5f7dc5a7 SHA512 3cc3ae26618b96a0fc076b18bab6f8f0f6a1064d6a9913c1015a9867fd3571d17f5d2867d72cec008e9bc7005883a596edb21424084f82ad5b572443de90f976
DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526
DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.zip 12177 BLAKE2B 8089c6123a976fc954dc76f74aadea87031bef339aa263aa38e80d3f3ee0fe87c58d9986b2961e29b746618617e2cb6b2cfbacb5c413acf963a2464d36dd0bc0 SHA512 54509ddbb3aecd1980215f73a53739d2f3c757daf67c78e54c508474678cb5df929a3b8e17f8d2b66438c1e78989a2268db2b32d6a0a6d5236abb6936a09ac04
@@ -134,8 +199,11 @@ DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod 160 BLAKE2B 10c23e5a0ed
DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip 13586 BLAKE2B 8f8bc0b542920d0effcd6939a66e34609401f564af0c1f6330bff2925abc664add3c36534bdf8602ac176e74ed85ec8c8597f748a7ec82db9e9f86207c563fee SHA512 bd6adb6aaf44c6c59bda2407a05e192d3336154cec35d0a6b6244cc5b93dc5e53509abded7c5999af166821749dd2e55333a8813ce64c310ba5db2df597bc171
DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.zip 13682 BLAKE2B d7065d3799d84593a9f7f7d93b8c286b7673505bb292208ba0475573667831ecf1aca5236f4703f1bd4d43e41b7cb688a9abe7502181edc9a76305e2a5842ebf SHA512 60a5dfa6c733fa6f71f2b0fb16ee153b2905f940b5eb7e95ff0d04bd3537961467426a1f6064d079fb164190d6a8b3c4bdeece2bf643057f34f7f96e9842f54f
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.zip 13690 BLAKE2B cc3568a99c03ce4ef19e52a8429b485e774eabddc3ab24315a58b149e8168c448bb1fdbaabb8e3eaea918de96cb7411caa000be4585f851edcb26cb0be9f0a7a SHA512 c39ebb2cc99a555054d55ffcefd5680292c66eed23b1ba8a3595259dc24cd42d432b558014066554308f14fc452b7a830f8b10e635d317b5f14ac0e0b24b1528
DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503
DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip 8902 BLAKE2B 7257687403b9f8f066147fdd4ee1bec7e4b02cfd3fddda8349a89d9b9ea5b93d9bef61280ed48d68adac4dfed7e382ee96886aa0d65d85406fb93dc6fe0c53b1 SHA512 79ba14a04838c509500e6098553e8aadcd7105445387160a8aa1a6d7b0e70f0e807c99036c31faf51920544da2156195174c8530e317a72728719cb0a9a66098
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
@@ -151,20 +219,32 @@ DIST github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20200706080929-d51e80ef957d.mod 29
DIST github.com%2Fmgutz%2Fansi%2F@v%2Fv0.0.0-20200706080929-d51e80ef957d.zip 7713 BLAKE2B 00c6ba491b5508ba3e1e6954be790e00da0c7ccecbd3d95abd1f791d2de4b40297b2f4bb9f9dce68dafcaae451f9674c358fdfafa82b94e441bc559dfb894437 SHA512 7d5646b8fbf81e808791fede4a64c2b5d9ff8353253fb6a0914c992ffd205ac6023e55c43fea317fcbdfa1260a74adce4ee240cd27f94988c8596eb5e9e092a4
DIST github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.2.mod 111 BLAKE2B cd42dc1330b96fae45e713c29f29646a37b6ad3470419a4bcb43c20c06a5b4fc1f3e198b5b2f99ea6da0d3eb241a2e5becd89fdcde6f015a773cc0170686dc40 SHA512 3f63e75a3eaf94a9dd340bf3fd5f615ea713ab08725e9d90435ef4a7df218f1793069a73c0295a667edc008cabe6ed8cb9e3db71035f0a3b801e73e89fb38697
DIST github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.2.zip 155023 BLAKE2B a7deb9eb724afb25ca7e806b916ff452a8077833ad962901e4d48ee6d7c907e4e2f05b6d7216905e412be864e9f7634c7ec648ce98b8da1e2e448a5087c0681b SHA512 49e76ccc9a2932cb6e7c32f98ebcbd851554d5e5c70d8302563178a39713b81e735aaf6c1cd20cdeb66b655734da11fa0994bda94fa1032845da96bdb899f958
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0db250d3a84bca13c7c3b8292ba71215a041006c8ea39a36b88dac7749a9bba96dc463b499633591f6f19d43369067b0f4f46594b8ddc SHA512 4ce4d3df63fbdbfe3505816e81dc7e806554d79cfe0254ce8e0228bc16eafc014c98475c24f4a6e0c6efb6fa16e891e2e47c43c9ea10ce20a95dc69f686f6361
+DIST github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod 416 BLAKE2B 845f9f6d79c8b18d4a070255eb93aac9afc50ad01593fc5c6076c59e4b5c09f34856b29ab24809a67fd10ffc5cc28908faff8358a52cc8885947c53622d6090d SHA512 7cbcae5e1749c55a0c3fa25b007035c0c44c8f982a37635735afb95c63a20ba019a51e74244c568a170b5a379ccb10cc8c9df716b6261d324755ea92c7f462f4
+DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
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-testing-interface%2F@v%2Fv1.0.0.mod 49 BLAKE2B d388b11419bfd0c80b52fb3bb5a2600712364115efe7b40ac02ba2da11d40ca30dffac19646056a4aa754de05c490d1f68af4549bdd1fab7596dae593eada97d SHA512 3e334e248e9584b050eb81bd23071a8542185c64b5f112f46b82c6842d2b8707099403bbba1b8485d64cd62faaacab3fd52e868bb405ca6e6067034e66ffc51b
+DIST github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod 32 BLAKE2B d511476a16a86c50db84dbacb40afb4b30ac3f72c4fd5a8b20fdd8bc6de1c46592bd16b24f77bd037dcb23ba86cd217fa740b59a784c6fff0fea1720d2045695 SHA512 451fbf9129c151784d97cfe6af29d27a277b6821411cfa5b23e6730ba0f5d5a830054eb6ed660dd2192c16abd54d5999be5b80e39bbac3499c3198311d01ec1f
+DIST github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod 35 BLAKE2B 0b603da65c4738d257fb759b8aa3971011ee721c1fc783663e1b26175335c6c90ad56eab45ddb6422e39dc0c6603e13ea64756f8a97bbfcc5e77845248b16a74 SHA512 2249854bef533dc77479041f9dc5610e14c549be1aac292a39b8b74b36c9fc42c04d211d8d5b71082c05971cc26a94a57751c3e61895050d41909270ee5123f3
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
+DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
+DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
DIST github.com%2Fmuesli%2Freflow%2F@v%2Fv0.1.0.mod 87 BLAKE2B cb79e46ab6a5bd617d293b588909a6b6c130c9349047eba687a75012c179f3a5efefa43939160cbb2074790d1cdfa2fa40085e9998233d305c38452478bac527 SHA512 578e4ad956f847509c7aa800374a036919c08d5cd6f26821e6ad4ca773c4ca64c38256e5f98e9127cc61ff9ecae8e12fbc02ee369f674e27eec6d2bd9523af30
DIST github.com%2Fmuesli%2Freflow%2F@v%2Fv0.1.0.zip 21720 BLAKE2B 4d088d303d11be2734aad265a65981ac006f824d1564cc9a1517f1ad85192c042d1d00da87647d012522f477372f4816b9b15af5ab187d8a3d5a9ddeeefbd7ec SHA512 65c5012688d4e6d6730a2a50d770aab99e6664948ff2375b76b44283c7b0ebd3f35d1c2a460830e936743a1a9267b9fd1f9986ada7c8b01c459199dcc54b2d4d
DIST github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.4.0.mod 195 BLAKE2B 199a83e2d16de25f166542ce1be5be51a5bf4bc80c4dd5d5f2c28851591ff97922d09a8da44f685ab0287f7e01ffbf7a6dcb260ef3eb804b606db72effafc31d SHA512 247fa27c3b947eb1808a687fc67732cab9ccf48ec075375096f93b64490243f04f76da7cf4338a3200ff379cb97448f29abaf981190da5e44d82a87d9eaad96a
DIST github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.4.0.zip 408235 BLAKE2B 597bcf10b4edb3914744517a09fb0e33c521968f5df27cd3faa53da57ec3b5c7749e4040da26cde39baf3b6a0ea51a0180ec21962a01b10a4808802993d5fb01 SHA512 cb5f2fc5b32eb4f0608c0b6466a1b5a19c99bc309ab1f83627ad7d576c872c5d2d5d9b52c774825e77e6d863d9d395f853fd4f705aa3608d097d09583a07a764
DIST github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.6.0.mod 233 BLAKE2B 57f3b11b63eef192fad7cc8ba14b9be56ea9865b650d85d1db2e5a5a67088e03bb7948b61033d616df25454d795f33b9e6c65ad5c791a80f2db135728072774d SHA512 fc2d84b74177bfa1208cee1965ed421f6527bff59c2b0b3a10d31b41f1ce629e2537eea56f42e4e6f438607578dacace1ecd1cc4e81fa90d8530d048ae1e9a9e
DIST github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.6.0.zip 411922 BLAKE2B 7e7334afdf133c56cad4c63d9ce3add449c688750065c3e1da5f2bb28c75f7ce8afe58642213dc4cc19bf8e64ec25b7f1baedb5a4caa28da066e9a4035f8968e SHA512 d3c0cbbe1681820cec2c117223a838c5346bb48216262152de5faca819300cfbda8def7db03d3e6c07ce0223df5177164d39f593ec43ffd52aac872f0e39e520
+DIST github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.7.4.mod 225 BLAKE2B a5466467d259693afe121c04b8096e3f979bf0d5440801898d135e97c1c52af157a9224f984739d9e73e5bfabb619ae23738c63934a67d72ba11abe81dee3d58 SHA512 505a79466a4a2d5368afbbef355e0abd7f41936f8c489e3e584430d6d59aa0a2d28679de67e0e087b34ada18c0241ae61232fb5ad797909de49c41b1cbc6852e
+DIST github.com%2Fmuesli%2Ftermenv%2F@v%2Fv0.7.4.zip 413026 BLAKE2B 9cb627ca507513e34b7736e7ecc94d3fcb9e046e1180193dc26d41aa027428dd567c0436dd2805ec4e04f50213cb4045c14b9b21d1f3f1f18bb52c94eee5a245 SHA512 240b6f2dcd9d71cb10a228ecf3ef6cfcc31656704219154c0479b6a67a6ab55c023c90c0468893009f410006d995a78771ec97d121ebdc467cc7e4571d19821b
DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod 39 BLAKE2B 391eaf696f1a5c764f9e156ae3f6285ae5bf8a4abf2a735fd13fd1591f3bb97737502b79df093156305503ed4b63e0d458900e61fa8717f96ee17a6d43bc2f79 SHA512 9fccb6717f5b37cff2d858cc31f7e16aed120a67498c2f0d24aa30ffac4eba2e87822b12d62f700a0c62d7561708bab2e13e35e89cf5407cfb06a0de5c70808b
DIST github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod 29 BLAKE2B f74d75a495f683f4e9047201721611229ecddc37ed01b5d4b5d81a06220a6385f06d0f99e514bf19cc2030fbdba6de3a08fd38b750e6651a822b10bf69c45327 SHA512 b426d975637bd2b4dddc10d7c88b70f8b946201f311859f22520d53ae0a2d9911ab358460c089771f7900d7a8740bbc0c6d3814ab8f955108fc31b7b602ab5cf
DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.mod 96 BLAKE2B f192300c52fbe1d75a3a9c89e3d808d25f13944940475b8f2654b3e3a1205721f6a9aa553ab6293f7ea4c9e8be3d695bf7fd5fb55c35e3179cef924fd1334273 SHA512 29bf0aa6ae9cc8d66b0e1bf852534dda3a3e0e16c918be357cc8f6fec14f2d2537a94cafa1ca9cd06b64363a8f0f0d3c00dabcb5137699aced8d16af767f6ce8
DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.zip 24551 BLAKE2B 4b7736d36b9c2b2d38decacecef3b6411e190d6504caf1376f6adbb0d4458889eb9c0aca1ff936e0223eaa26c7cc2e077671c490f998e071a6e63cb7645580c0 SHA512 bedaa028d6450dafaa54f17c444b8d2923cbce008bdf73ca442297793b1b5bf60e829cbb6175d5b24fcadb8b91470e07baa369180a61d3e9a43ccee5ba18c150
DIST github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod 45 BLAKE2B 7a7820ed255877b390c76ffd281258a8e70dbb2812b7d2d0bf63bb431e8e4f52faad48d4e6801b301ce35cd6dcd49ceac6ab94b32e35befe2e6df56e1a1e8eec SHA512 13b356ebfd062cecffa1e323aa7768d933c6915c2963eff50b1f743712d48cb24f137ba839a7df211e6e02979a4d1c9d32eec8194227edd995c3d35849edeb54
+DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod 35 BLAKE2B 3db6c40257f2c4b0254a26c6e414fdc87c037f6312d4bf7bbd39420d6df70f50eab84c387b54cc71fe16068e1b25e3fc63a833e11cf5b4346f842bc61328b0dc SHA512 0b378d1e15db4fc5a3d7d711b63dedefd141d607192344c8d1ab2ac755ab9c6e91b2c320378ac8a485cf94deee59e6628e7930017c6d659bead6ba89cd78a802
DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod 36 BLAKE2B a388b7d0db7c8b9a589164ac639887f1e54d3f5d59ed9bfdbb427b88d381d95455cec1f3474d6dadf847925b7b0e9944a3713656f4870db4fadaa1774595c3f1 SHA512 b74e16c113ace53ce6b7a4df1fc73f21a5acdcf3d2343a4c4f1ad7a2cd8d2282ef7ede98de8c1c46f7d35feae28c9f49ba4a2dff1071357cb4e88e93f25b521d
DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
@@ -172,6 +252,7 @@ DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip 14339 BLAKE2B 9332d9cac7dd3aa2f
DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
+DIST github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod 35 BLAKE2B 763a350270dbd9e5a8f735ded2a13c7bde23a356f8f4187b4fe430b1dbf995cc9ca2dad54a38e927c07ba01b5c21f8aadcce69b8a94baaafee013d4a9fd0c988 SHA512 79b29fa26101598261ce7406c81be4fa53d79e89a7bed072abcd572d7f35f3a408da45055f1b05c7ace8acdb0ac2ea005d79a4766e7657087ca46327ebce842c
DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3.mod 379 BLAKE2B 6a6db2bee0b69257e5c4d37b1d5395693ba6a88bce129a580b8c0ac986a7702729ebfaec726caa3b6c4d2537bd62a7d728705dd0cc6f6d8b6c9a4460c9bb33e2 SHA512 fe6b74b26571ed4afb49f8f2c6745644cb7db7b5fe95138761c78effdd05d9948c09aded96218ca0cf9d8da6372705901048c14290a4faca56b1d05ca3d74130
DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
@@ -184,8 +265,11 @@ DIST github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod 1346 BLAKE2B a46e52b7acf7f
DIST github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.mod 39 BLAKE2B c619b92efed318039eb06878b084372e8f3f45426623a9c1f045f21bf44f86347472a28a4164f607cb9fca3c253d4c9df0dd33d1dd8baaa02230af9feb8dc7f6 SHA512 d6089badd618722b8d3584965f1a10290097f259024a444744f625fe5b439fef62c7e14f060fb8593197d003ecd6c29f0cb85700de0bdfbf2511ca66729db3bc
DIST github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.zip 45664 BLAKE2B 300a1f32c514f6857be8cffe884b9fc29091a709746c83567f82413b0e64d7f42ff3aa6bc34846745489f98e10045736e3571797e715fad87cec937df28d0fc9 SHA512 f9a98001ee97894e319b82f4c190f93ce7a60e109b991691f3a90cd51818596b1baefcc1c24793aa3c8c9d4505f809fbc689037b1a929e21e17fcf134134118b
DIST github.com%2Frogpeppe%2Ffastuuid%2F@v%2Fv0.0.0-20150106093220-6724a57986af.mod 36 BLAKE2B 6faef3be0b5f137ecc89a7875bed1f576d144f11623905c04cc44f93812b80f3e5b56f05ddb3343848e7fde7fc439f49627f4fbd10730b1e9c2c9153a2d3067c SHA512 8cedf150caf05299c5b9f8b4fcaa17e4771c613fa06bac434586048ffee22ba9501e0fa540da90a3a24f3e4f662c9517571a23a0353fbb29c881d6d6c26d5f1d
+DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738
DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip 110026 BLAKE2B 862c858d51e59569c38e1304de08c256752db260cde7f7f44fab41d22695999fe73483d3854166f4e8d3da9b4f8e41b7999d7e44510ab8c2ca6c0120173b77e3 SHA512 992df87104aa66dec048d39496c85819cab19bc890cb2c60326660d011642f49cd926b082d3eb4136b229a6e4893ed023a133e4bf83a4993c534b24e14d77b4d
+DIST github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod 37 BLAKE2B 6f0d51a83cccf661003d3c9a10b10fca12a5933730c676a4279c47a0b8563ae5d897845ac84079070bf47b32ea1c2ec80879b85bf8ac72b91f1a63239292758f SHA512 0af9557d073093339188a1d8f226798eccb05d43e1394ac9d207118ada9449332077161e2d6ba2327d9b736aafae79d4a08abad233ae9aca9917c677809ce2c7
+DIST github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod 29 BLAKE2B 8f509981164937fb0aab63b0344ddbf25c183b926a6e87400e745f6aee9dcc478f0ed455c62a9753722954acb3506be5f7810915a15d03647668e7bb707c09c0 SHA512 c7dc34c7a73c5899ca207c0cac88dd38ddebaffa04b5dd511a86dd10160e60be2806dfc6e079a5871b0cb6142f53d7d7dc87ddbe3fb19240bf894430feac5875
DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod 32 BLAKE2B 9c0be7f17fe7a9156f124f7f67c3e15e14719d0b271f36d5d41ccfa5ff6c1b7887e0051df6eb3b29f29b40357d8e438598088b3c4f4df28fb81f030c8efa7ff3 SHA512 8b8b8958405a188b93adcdda0634aaa2961b5b8e0d3b3e1f768fb9c49c02b73cf3bb39027431e0c1d209abea6cb72a651c5776bf26391e81f4dc18c7bafa692c
DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.zip 52931 BLAKE2B e511ef9edf7d968d848e021658001daefe7c8cc7169b1c6984ca5388fc4d6a5f54def9060483e57392711617892d21322d9de099234901bd1c251e57e6489f6b SHA512 e3d8a20d1cc351b8944579988feff39cb0aa3e1f2aacf2e2307180c25c153a0473f2a5a3ebda9d96868cb1f477ccccffdce06b117be7fa5409b2d1926b4c270a
DIST github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20191127044304-8f68eb5628d0.mod 36 BLAKE2B 19a3b0b506a7f4875e610433af954e9bd97d20f99a8bc8fd13d60786a202fc103855325f48638a835ddc849c1ad07f7ff8ff24be1dad1ffd1c542ac98428f30d SHA512 5e94f8cf9ffc1a7423bdf63d4fe3e6b9ae651643c8852010691f80890cf6f474f34b9be6e0213446f597c6648286ecda37ddf4e16a6b7beffae475b8ca0e4a07
@@ -196,11 +280,15 @@ DIST github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200627185320-e003124d66e4
DIST github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200627185320-e003124d66e4.zip 46033 BLAKE2B 59549b4f19c4fd761b4135263a814c1bc61f881e2d45bf906f2aec010eaf890e93fd02c9521f760d9f1ca7d6fe324b964fdb73326e160f79e867f6a236a06913 SHA512 c8d68af95fd6ced0708a9704fcad645a9b964b1e567c961108e57fcdc3f3866a753b70d912f87477eb2651da01d0502818c2af33e94d27529db9539bec6a5187
DIST github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200802174311-f27d2ca7f6d5.mod 36 BLAKE2B 19a3b0b506a7f4875e610433af954e9bd97d20f99a8bc8fd13d60786a202fc103855325f48638a835ddc849c1ad07f7ff8ff24be1dad1ffd1c542ac98428f30d SHA512 5e94f8cf9ffc1a7423bdf63d4fe3e6b9ae651643c8852010691f80890cf6f474f34b9be6e0213446f597c6648286ecda37ddf4e16a6b7beffae475b8ca0e4a07
DIST github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200802174311-f27d2ca7f6d5.zip 46371 BLAKE2B 2f5c65a91c534f7ab58e2593dd0b17bb7f8758a8fedce35cd77eb7ab97faff1d15b0bdf4fa6b1dc0247aa8fa07f3820d9cccc8f26f88583b326533e2c24fc076 SHA512 d889227fa22c06934e9a5169abcf25620d4aa97e9ff35520b427a1ead2c306697020d904d8b31a22c0166d9a5b4e5c4ade7e0e7a07905d4c1123207799858d6c
+DIST github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200928013246-d292edc3691b.mod 36 BLAKE2B 19a3b0b506a7f4875e610433af954e9bd97d20f99a8bc8fd13d60786a202fc103855325f48638a835ddc849c1ad07f7ff8ff24be1dad1ffd1c542ac98428f30d SHA512 5e94f8cf9ffc1a7423bdf63d4fe3e6b9ae651643c8852010691f80890cf6f474f34b9be6e0213446f597c6648286ecda37ddf4e16a6b7beffae475b8ca0e4a07
+DIST github.com%2Fshurcoo!l%2Fgithubv4%2F@v%2Fv0.0.0-20200928013246-d292edc3691b.zip 46247 BLAKE2B 076a9097d8b814a9adc9d0d7139f3543ed4ebb19944d40e78de4032502fa5e0edfa608fb789b26faecd0ff9de2c40b05c6c266949ccc9eb1659a40e72516f6d9 SHA512 b35c5139ac1af16afecb0d1b89c19032613dd7f4ff4843bea89fa7aff01d2d43ee9ad000367d467fe80dd7e2bc0f35a0cb357597f307e144245bf418bb8bf16c
DIST github.com%2Fshurcoo!l%2Fgraphql%2F@v%2Fv0.0.0-20181231061246-d48a9a75455f.mod 35 BLAKE2B 5203f9130c17196d735630eeea5f692c85ad9cb9c1f2884507fd31715329724313b852c5182ea175cd9ba8ba61d0b26259f42d83f46bf6bbd24c3e0a0864b141 SHA512 9a08a375efbecd30f4d479810be1dc4bba52e1f7254ff4a527a390628e2396b6b1838d305a7f417b932f82c53a4f45df7938c0d30aceb3d478790233bb0028d7
DIST github.com%2Fshurcoo!l%2Fgraphql%2F@v%2Fv0.0.0-20181231061246-d48a9a75455f.zip 24322 BLAKE2B c3cdee6186b0847db90eeeb6e21ce38d0f14227db33d9ac4787ac22325e942a5b9882da4a47d0786e11c4f0967a4776f2434cbfbd44e18dcce95eb5be0da0f85 SHA512 b4a8986187ca882557f6780663433eaadf51ea0395924590773396ed89b0aeff2d2b31a6a63419e16cc4231cfd7f07817d6e51254238f42893ba47ebbb405ea7
DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip 3399 BLAKE2B 348c2171bf3404d8b69166fd412707d8a348e1d808618036de2ae01fce77e3880fc782ef301f9b4135a19d81ca9ded5cc0cc4fd73d36b66b121b7f0baa73df51 SHA512 d02d5e4b8a24b1709c053138c4128d4bd6347d4adef95d1e25141935cf560fdcfd5c2b7837d6e690f175f1cd5a21b0279ce97b8b3b66d5e0a5006e4103b25f46
DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod 393 BLAKE2B b9d712acd24d7a0605c74920733902a8eb1f9151fe0b0c575f01e2f821705ca7323f854c5b88d5bc534ccc9155571c083d4f53c6f6892879c829146bd95729f3 SHA512 c1621afd4618d1027b2d89a8e9653d18dabe098a7004b376ca2be63955ab783879540a890ab1324c2560dae9e6f3198dacc32d5fb0afd4b5a779d29a8c28f035
+DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod 32 BLAKE2B cf220acb07f93b3927afcfb4211e356e17f28dbef71cfdf777366d8cd09440282cd23e7800c7e86949615b90ec60ad4f2601ef21e58d4470349913c348758b0a SHA512 def5f190323350b58be18ef9f1b00e4810987a37e1fa9332be62a638a01df7f070788c75a19a0c11949890ccbc395419de45bf9c5f7fb38fdbef56118c681d32
DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod 30 BLAKE2B 9bf213acd16f9456f4a010a7c300a1fb7bf1ab248d1ac9eed7883deae7f9a6f6d0c761127b7b2c84e8dc46e7b0da2eecac9b334fd5a94d2995d56858d345edb9 SHA512 3166c898d741be502c0b733653cdca0e8ac4999fa6a5d67460b3962799287c9176b7f0243f0c0da394a4b7737ed1d1a6a2ee4f84a8917cf7076c774ba9a2a648
@@ -209,12 +297,15 @@ DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.6.mod 265 BLAKE2B ecbd8f71c2576f7419
DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.6.zip 157199 BLAKE2B 89d593030de5748d0e310af24beb7b2fe51c52e4bacdf0de35e08fad4f02a907a2baf60439d5164e80aa8ef6d9fe67534960674736e642f7125e408622120cec SHA512 8755633ce43afae068a8d5ab6366965a97c08a5fdd5e199fcade8fcd5a00524f668d78b97e70269b59b321d901356ab1d0fa83e11c75bb30705c6b3de85370aa
DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.mod 265 BLAKE2B ecbd8f71c2576f741916c7e6fa4c279c327766a9bf957e019164a1ff8af16ca1fc6810004935e57a3b085f81252549ff0f4ee2b89a5e53dc0110218acba937a6 SHA512 25511d7efe6d605b33c4e142ee073694b95d93b10cf3e9d74a161dfb71171de0accd626587299f41a061f4a3ea34482ec36fe7b9b2b3588d8af6b3545a35a45f
DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.0.0.zip 171286 BLAKE2B efa68ba65ecac895de82fc8f8ae470ed9b2e24e7343f24429a5764fa042f7c91dbe8aedcc0ae003fdfa188bca32e7c4c82481b69736a72df76b50fad3e9094ba SHA512 f311c5ccb68a0b5dfe41f993e0867cbe9742dc3fd50904ed688d4b89777f4739f7a9293f548e7c2ee940d1742e921a3cc82cfe1b9d1b210e435d16c8f0c91880
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.mod 265 BLAKE2B f7a8de886a358b7d2910807ee16a26c210850980541aea7d179b7880ee57af17f0aa62d0bfff1f1116d8b32c9ee05bb6ac7482313e9556494e92c60ccd03ba1e SHA512 383bafdea96d9fb12cb72123ec4c5bfe3669be7867fca80e2cf4dc7a64e5a69948272da4e74851d1464dab1430362efb9a43914985019bec4fcdf942fc21193f
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv1.1.1.zip 186061 BLAKE2B 795662b91cebff6b3c8dadd024f73e29ff310deeb2a48d515ebe1726b6979e38ef7912940b8e6f322dee23da9ccc298f31567fce33d4af60979bb0baf4de0d92 SHA512 e764426cfda39a67fc94424affd4073caf26aca0145f7dae44dd5b8dc9c8fb0a0ed490092e58c07ea9586e4c48d0308a7ab2efca1c7b2e510b4546fa0e39f77b
DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod 42 BLAKE2B 1f0af0f4518708edd09c0f02aec6103960b023a6bc178181276c54cd86b653e8bd1ddd60c5d49fa75a85f1fa0d18f670a9c2ead381da7c4f2d5e611b24f51ca9 SHA512 748b5648bf8bec4d1efe13f4dc37608e7378acc2a7d954e9d3b649a4b170a1e2d1c61338f6bee8d9007ad75a5bde87487612b47a692d6f966bca56490dcb834d
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%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod 39 BLAKE2B c9d700f96874e0a3977c2ffc7fd321acfffd8081aaa70ca50421ca55253fbe0636d48eca8f7093df202861f0a5f908fa00303533232c83c78bdba84e2973bba7 SHA512 8071c316d33aff1d8ffcabaeb42e8f9320465d83600cb57ac5ef071569f948d5cfd69e1bd2e92855c061395c1b814e84d1705f42e37f00d5bc713b6e724f29f5
DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip 88931 BLAKE2B 7adcdaa60d4a3fd99b0f3e7e6888178b0a8d141ebcc0166b12df4bd4566500929bc792c391d33201b1ce215b6ca8ebb578cfcabb027ba453a54986270f5e37a1 SHA512 9a81f0635ca8ac059c48a15cbf625a7c91513f95a9b402ba166d48ab72d5d38cbd941d5309446f5637bd7c23eef35b60fef2f06e8b557f415dd8409a6ddf43e9
DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.4.0.mod 2018 BLAKE2B 516407d1afeaeb665c558a4babcaa35aff28dd9b41298d04b904378159f1978a924323195e4c160cb9cb992c264558c7ae4f07ec157dd8c65fb98853a3cdc53f SHA512 fda6d22c26332038895ea2f2c62458baebededb0df883728dc9a127c10102b9bfd3e8128dfee194d909d645ea652f3ccd5ef737a8cb7ceadab71864b21de117b
+DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.7.0.mod 1694 BLAKE2B 195244bf4042b519551efc149dfbd9fe10ff87e5b2ffe6f9a2d3777516315db8b43968533ff089b257c10f94f99babd076ff0a7203a434a79ea5aa7e39eb9818 SHA512 9f614a57ccae909af00a67e464b04eb91a92eebf1c28de3809351363b441d22a4a6628a1902fde8b67956d0bdedd91423d20158eaa6b9cd994fb7e284a35e061
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.1.zip 37190 BLAKE2B 7c8b79cb736f53337fdd2878cd1d745a6da3d803c3d3f6a0ed53a86f1d4789d2c656c6e7a17f90caed496fac91fdc89fa66b1de7b2caf97409114aa59658efa3 SHA512 b2af82dccd20e9539d72c8629f2d4babd573f711a810fa77e629fec897a614776cc4ff857700c0b6eb32370a13d122504c0a4abdd3d9111eb8ac0938a0e7234f
@@ -228,6 +319,7 @@ DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.mod 188 BLAKE2B e47d78f037db3
DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.5.1.zip 91883 BLAKE2B 8bb8f10ba7a3c719844dbbcbdbb87773487921f493cf6f72d1a9fd1d553f7f7784b01b9795a5c26a352490ed6d75c29a542a0b3d7c18d8888c57e447d9d227eb SHA512 c539cd964718439715caee454b38fdb61eb5d4e20489e10f7f6a030b4b941b2ca52d33f950c0b04149962399f0c3cb5b6a90efa2d79acc0f57a7f49d508c67c7
DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip 98541 BLAKE2B 369a625a7b05ee56619698e8067ee7b99a9d0508db655aefd23cf42f5ee1abb150a6b262be089fce6951f84fe9f1cc0fa46b75830b851888fd17f123852558e7 SHA512 073f44125d4bbce27d69b914385e05028c4d275585e275ff1ee2ffe299059646394163dde2b6b5c175ac9379d388fe34c1c874deda4138121541e2a639d7635f
+DIST github.com%2Fsubosito%2Fgotenv%2F@v%2Fv1.2.0.mod 34 BLAKE2B 85a4e50642e7088ee26b82c69c65e1bb0396d4e8819088fbdf1d93a8348d7aab950630e3bba1747517d01e0cfb9a9dd1b95341df0722480bbecf18399ba84674 SHA512 50b858817db72f0615a74431c9966f969d12a85fccc3f0dde25a72fbda32f77f3ac76cba50b12fdfd87ed7a7b3a337a291b1f9c86e1fbde81d2d0c2890c1c21d
DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
DIST github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.4.mod 29 BLAKE2B 8502924d37d2cb283d252008e9727d55269eace4ec1b9e049294563a1d92b777e7333c946bc69c7f47167a36482c1c2084330dc68e9c33fdcb57113ac55e0ba7 SHA512 787ef0a1ab48d9faf632390dd7a89475a11a3c11d6b557cb9228111dfa7af591deb6a102cff6d6c981ab717f29bcfca64b26fcfd2cc4d213f4dac0ed24c6d625
DIST github.com%2Fxiang90%2Fprobing%2F@v%2Fv0.0.0-20190116061207-43a291ad63a2.mod 34 BLAKE2B da6bd307f61b08eb749a0b2d9a9f445dfc057c8cafaa13f4a7c6d2d2324f7812c9c8269d9747cc21db9c3478f73558da05035b3f1ce9940f5c5befb16dcdd159 SHA512 b9773f617e5b48c6767051fc7dd2faa63a8a9d537ee42fb51efe6db5b3d24060dea0a264568bb5324915de8917a334f3563dc49d35651a4ee7c15042faad2964
@@ -237,13 +329,18 @@ DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.24.zip 260015 BLAKE2B a7f83264cdc1
DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.0.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.0.zip 263448 BLAKE2B 91fc28eb885a3030886862073f55978d2d1d7bd1186d3173f107809d09b0093bb2d4af45e812a4756fb8406bf00eeb6ac0c512fd19390154e91302d75232a6cd SHA512 e67fa8a6dbd35966bd06f6e2fcd346e09417dc3d8f7f093163f2dfeba4523ae567a0cf8dbb491e0a85d1911ba0583b61fbbbeec4b5e3a01847621cd31649b507
DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529
+DIST go.opencensus.io%2F@v%2Fv0.21.0.mod 305 BLAKE2B 73735106ac582b2e9d5f0d739412c3396e0df8627a6adbe810ac560998e4cf2eda12e449b6e336dd6b433eaf57c885b4a927359d0bc1bd6eba9432bb0793c35d SHA512 448e90223b8d67e4d5e4b150055ac83eacf9ef48aa34036c2e59559f21443f796e721df3c0395a829bf5d10d229cdc7beb956c8f90273e50f0989e45a82aace8
+DIST go.opencensus.io%2F@v%2Fv0.22.0.mod 408 BLAKE2B c96dc637d392594cdf710b9542b90504fb090392662ab45208d45abe2cbaac5b64e55f2f62d1afe5542d2747abef1eedfcff97cfc48d6e0649c23b9b8293f7e5 SHA512 823e1ca3a9adedb1a98f5ac900e190bd51480686872bd901cc20a394cf03be6c8fd69cfe7343e42cb6f9d3500282a8097b6c32376aeb3e92bf0b1ce3e75872d1
DIST go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
DIST go.uber.org%2Fmultierr%2F@v%2Fv1.1.0.mod 28 BLAKE2B 4f0c4b42b00093024ef494b1b0a07896ec41eb140fb953affc085921181eab44bab0baa38ab559b9e36e022acf5cb9ebad5ddcc7303f33982d9012e9e150cb03 SHA512 7939dfe977dd42ac3ca8b91824a73046222ac9bed4f9cbcf0f2d332727b92a094540a56dfb19d095df6d5917b30cec86a6e9e1b082581049fb05bb7bb10106a4
DIST go.uber.org%2Fzap%2F@v%2Fv1.10.0.mod 23 BLAKE2B c60cbd3c1e15e71a99909c113b100de3909740d9e0f939da800209ed1ccde49f77be7a8c22e045b9edc663859995859bc7ccd60bb6953846829ca3164115f3fa SHA512 263e322e5615c91e810fb9ba30a601508e1e3e418f87c7c74de962c341f207e703930f2ad41ae1bf7b2ad106831dc37b0b96637b816d130bddc7225d41911946
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.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-20190510104115-cbcb75029529.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190530122614-20be4c3c3ed5.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190530122614-20be4c3c3ed5.zip 1818028 BLAKE2B 780438aca52569a5aa173a84eb785dd1897527ba1df9f2d9721f4abc5691334bc2304f0a159385269891b901b651d65ec1976fa2b78a5c3a8945c7d14d110211 SHA512 da0fa1ae69abd433993ddb19224de1cecbeac65f0fcbf5999fb481cce9a5bfe534ff7790fe29bd15c87021907433b32c1baa55fd146eeeb4d735472f2c0a852b
+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-20200219234226-1ad67e1f0ef4.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200219234226-1ad67e1f0ef4.zip 1867609 BLAKE2B 557c84a0ec76f04d716fd9a3b551d73bc73957b042fc0c55f20f10ee55ce0503edbb32a9c4bd119fff0c6aa32e3239f9b5b028ce032f425477231efe42333dad SHA512 d81eb52177d8cc00238467ce73286fa179c0b99d5c891a6160a5b515cd7f51e29d5dca5d2c3d4f3d2a21a5327a57391459c8db624f596bd502ad34f866c82e0e
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200510223506-06a226fb4e37.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
@@ -252,15 +349,42 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod 155 B
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip 1874261 BLAKE2B d31130353795828e794c9a0fbadafb9d745947d03c7e826fe7cc70f14002f60fb6f2f2699a875fb49b37ac3419b22b484bf95b86522b936b8136d4c627b24c2b SHA512 cdb474720f4b2b0357ac218297be03b967ccf068b05c11bc8eff60cf5383ff8738b0ebb87459a64643f3f8aac2f73967dbf616a51685ba48ecaeb15898851cea
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.zip 1876176 BLAKE2B 84ea067e58783d36780037272d669162fce90fac23d5bb6090898e14ed6753ebd4bafc001b3e3ec792a29a2a802d57763a365a3f89f1acfc37f18e320aee42e6 SHA512 1a94d4b9e787a0f322cf9ee223c3b01d8dbd34b59381330808d2682ae05de0cdad62c31e085c554033e852bc5fe49d789993a668a2d75bd7eb8b2389ac774e65
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.zip 1878103 BLAKE2B 6fd01482411bd53a283186c07bc0b84b11186b0b1ed95b385389d967095fd99924059c3b02fb66bd5392e2c53da2c8c91dc0b41c0507be7a8ca9149a17bfc365 SHA512 4290ed77e7ccfd512faccf2b9a07ba2c8b3770646436f5318cb93b549f798dde3188735595100be1ca4964af378083a662edb872b99e6e7febeb2b6cfd1eb7e8
+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
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190829153037-c13cbed26979.mod 352 BLAKE2B 5e146ef1d6b71ec65511cb06d8392eddb9a126b6194213f3b2ac6b675977dcdc77cbb3e46fc936189269583df4d0d80d2e393523c3ba4c55f1e8f9294e0dcaa1 SHA512 8ea874c371c0a582410e682cf475628b4fe6a0c0f57b05566a03343999da063250dcb987d9a863b96a8e1ee913612f323de296b4ddbcfecb166884bee06a8af9
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20191030013958-a1ab85dbe136.mod 475 BLAKE2B 3be94804cb1c692471ca7f2af890586ef57ed45a306a50fd6d6eaec9c7a161e2e4945ed11640ed30ab6f0e48ca644ec06b6b12e232b0990d4e9a08347c27491a SHA512 4b495d303e08e9bb4b43ff0c82665107a6e0a9cdd33a6d14aea491e634901fedb6341fe9e47c45fca1f89688ea3548f57ac8d62b79ef4ccb596ef4eb2e809241
+DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190227222117-0694c2d4d067.mod 60 BLAKE2B 1c8445e3c9313293a0551c8a2acc31a1738724b96886bdf165c74de6cf2d25b784baefa2c41997a64ff189333a8c59756fac7ac41b0ae1d4f167c38574905351 SHA512 c466f8b348acdc26208bcb782cf330a979d9af086a95f307a785884492430f11fe45d1ddc3abdc1b092654b3880a5e7a456740293935b1912a1d39b658de80e8
+DIST golang.org%2Fx%2Fimage%2F@v%2Fv0.0.0-20190802002840-cff245a6509b.mod 69 BLAKE2B f2318e92793bd626374b94e2917ea05ec2b41285c169f1461365edfa00412a798775a8ce137221e1c280983a62d03bf1cc97eadaf8668661ed4387ef5823963b SHA512 d463167481b44386a011b867d6e26eaf2fe81c750325ea89f631af7b065c5152249084c45e7195a662d9b9ddde0e81a5273d8110f73a18c4d841c155c67ea0f6
DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod 88 BLAKE2B ce393846b227c374753f46fc076385826a6288b0c85095e097c041b844f46b87120774c68924492c4f33c33729103a2d916d2335e24953022630314b63f606d0 SHA512 0097db2957ab98a21a73960d2a37c526e5cabcd5ba4825e44f0ec4851ef83743ae171c8dc4b6c09ea4d931c15879c247e362ca53ef8dc762b484f1ddcc483d04
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
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%2Fmobile%2F@v%2Fv0.0.0-20190312151609-d3739f865fa6.mod 27 BLAKE2B 9bc664bbb78cd778f132bf3504160bf8f6d9950342fa73c461db815f07c0ce2ae5bb2a0ac099457d022e1edf2d07e536566fea043a77aa8b21054254ae854c46 SHA512 a105eb088532321694d3adb5da0b3cdceb7781670a2d4a8a757799e3c8fde02784b981747714cfa8770ed29eb1a0228e0945ad3c363220c39108a7432fc29a32
+DIST golang.org%2Fx%2Fmobile%2F@v%2Fv0.0.0-20190719004257-d2bd2a29d028.mod 222 BLAKE2B 5f1962cf1df6a0e8d748eacc5616c3bf0b8de117d29e57da32017cfe26eafc879d33427deeb888b283eeab56d48b3c72ef1ad0aa3706a1dcaed208026eeb0054 SHA512 6689d7c55fea7d8cfb8d2b1a934ca45793dc8d4cf4fc5b001bafe676367a93b8a8c4964d8131ba145e5e41c4da50a238d6df01dd3fc336eeb18be61b49e62416
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.0.0-20190513183733-4bf6d317e70e.mod 97 BLAKE2B f6c97d5de5c229ab22e047250a7030c201829f8237b63c0b272c0453dd8ea91360f4a73f9d2b56212103c76c36c01699231d9dd31d48ba8624554b5b36499190 SHA512 15deca99c6d866dcffdd51b1334fbe7f33ce88e1fd82badec64f5155782681887e7fd959ec2686fb35adf70afbe08d743e36c6a891f43462074663357e5b309a
+DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.0.mod 97 BLAKE2B 54b5bbd5b0908619326ca8bcebebf13f45b2838737d22008f20d3f40ae52fb4f8fdb8c73cbd98b57873aefc8b37c7328aab2bf02ad82a7d5f83e0d75a9283e81 SHA512 4e955424df3c1cce0b716fc518eed10196feb34ec718c1fe537350ce99efd0676276c2000feca6faaa6f3db8ce626e2d330f700fa43a10c73120dd13f5f1a764
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.zip 1277629 BLAKE2B becbc737f58b56645d8b449a7cdaf786a6bf70ab4db8d1876a4825b2f3d52b85e506fc9caf6a23a5857f992104b662e0f824e6fa23e7c92e27ba0ada574b255d SHA512 0d740cd05300d902cf60f54692cbdf91758457ac21a66738beac133b3a31930b3833b10978750efb59450d75f0b750985e28218d04e1d8e3e68c4c883fadab58
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190501004415-9ce7a6920f09.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190522155817-f3200d17e092.mod 172 BLAKE2B 6c58510adee25cabb2e31dcbd88939145c6c0856ba2fd1f0b78f82ec6f2589fe0dcce736a192d145dbab8f4ba892bebb80cb6cea4ea89fbef72f7822d157c1a1 SHA512 5b9748f38f64301e4895d9d2bc106fc9bd05a29feff5cfb53e248d168af998fd1a501c1a3c27e23af663b283093d2a48393bb0798bea449256d89ae119b225eb
+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-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200219183655-46282727080f.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200219183655-46282727080f.zip 1499823 BLAKE2B 56ae13cf7caccf0e779d9013c54f4abb44492a58b75c9a6891f2a0fbe38e565e2c1f23e275ae9ce32bb11b2ed98dc31bdd98419eb1467eb9b5607e9d19b13e0d SHA512 a1c1e015efd689d7fc8db14196486c4400d4783d70dda7bda5969a996478e2fede5f082cc9f3a67bb11d64f53a7dc3fe616c398d3a3c0e405576454abb3fdaaa
DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
@@ -269,18 +393,30 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod 181 BLAK
DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.zip 1503811 BLAKE2B c8cfe6b14a455a6ad71c42ce03235c650b7efe842131874cf99570716907e02c9fbe42df586e69332189518cbdcf6e2e417caebec84ce928e7ba959b66ab869c SHA512 bc3772a7ae7cd2b50f61ec8d07e7f7e1af9f24e0b737131da375a525be44dc993ee740ce0a11e0baaf0cbd81e819e3ecad889c0c7ece95086cb428e52b10a785
DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.zip 81780 BLAKE2B 48e9b7ec89ad3f9cec88fe6c62ce64348a9217a134aab7306a07fd8cb28eeff91b15cf6f59ffec36df23a086195322f28e76fc16c026f33d2f419dcd3f84de04 SHA512 c7656f3c10140a5cb08620ce0647d0b2026272ec41bcd9df346dd2b5de5bd2236835ea117091646151a991f8f3aeeebd0cdfc1f784015d140162db5dc49f7325
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190604053449-0f29369cfe45.zip 81912 BLAKE2B 647b2edcfc6109ea26a1844c259174eb37e3a97cbf12242716d4cc308b3918b5a0b104c9a5c2f3b4974bd94c28afa7ecaf40e71aae5fdd821cb1a5a15ec978e4 SHA512 62b95055b08c73a87c7ef69b2984eefd061e3f7d71eab8e05ce82a4ab1be2ce200aae7929da77a9ec49051b7c73bcc948fa4ee782afdfb8d74dc2d206636313b
DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.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-20181128092732-4ed8d59d0b35.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-20190222072716-a9d3bda3a223.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-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190530182044-ad28b68e88f1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+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-20190624142023-c5567b49c5d0.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip 1918660 BLAKE2B 015e9ad74f145cdd7cdeb55d7b2d8949d6e7baedaae36089fa53cb257b4fb49830aeb299ea3a1f782b2f033443a18d009cafcf0211d1709d4d37b4b97d5f3d08 SHA512 24a653028d079c52ba8128d9f43452d2ecabd374c8eba36d44704c3f70cac50761597c7b7bb6524ba50fcde696fbcded57c29f04f35e42c62e23a9790852bb56
@@ -290,32 +426,72 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.mod 33 BLAKE
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.zip 1471634 BLAKE2B cd90cd97113e500e5d20b6bb1c9921be7132157089936ca68d862efc531e2e3a8ede741d6c682c8f38122dc33cb65c84a8962eb1eb9cf25277502740639091d6 SHA512 c3fce15b61446dc0805383e55eefcbace75fe1e8149561692624f47ad69d20eb81e6415dc0000beec435a6caf0937b9bbbef67504016a5f77faaf72a46125085
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.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec0627b64cd2301ed4f2819f837807db7a55725950dacb40be899b5148b07ea31b51530818edcccc6444a9800755e1d369ba8f1bce949b0 SHA512 982d78f580a7eac99a0c51e6f1fd2b2c3b91f56cd5e2b96fe960510049f7daf5915264f73f55f05675eee232a52998f9667fa84a9ccba15ed7819e4c93f583a7
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip 7430601 BLAKE2B d2403817cb6b7e32462b90995412c4e63cfdeaf3710fc9386f4b708e0ae2be9593649e923f0d844dc4420b177e42e7abfa7657e03e27fa08be9e98d76da4cb9c SHA512 8d8dad296f1497f352e94c416711dbb1f468901a3fd2dfd0a9c67f2d59306ea611d77917289521d2845f6958f571f6c3fe2d3dab289524d8145489d5b386fbaa
DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip 8010747 BLAKE2B 78d999113a75f84966ffd23356e7cf60811b614754936851f197e547657cb6ff40acd074593c9cb6a2ae39ba625b36731c2fc0bc4b2b5ff68a2d377a6c7192db SHA512 024719305765ca737b225fec6268f84fc4c7d17c04e31eadfacafbb24a5f30af61920f4633e95d74dd2a266de40d1d2d13587881a3c22829ffeafb01fd75959f
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip 8605233 BLAKE2B 3e9c66a40249df3915ab9de2a8de2ae0b92e4f7d645f9753e66e585ebaf86992484fcb933510b3400595182e9bc667434894697953d7078bf43f617f5ea1905d SHA512 26d09376646c1e7d99581f0fe03ea109b00879dc351996f77e6442b0fd72817d056f630a56cc167014acb55532baa4be5437bf40b4a933cfe450854c618b3508
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod 194 BLAKE2B 94f62204dd4fd9b865aca70366a7a7754e2e92ed27591beaf789b268ad272dfb34ca0906d888c608393b4c71bc5c9f975fc86c164528ed7d0390e41b66206ec4 SHA512 8b68acbca48744320e64a70a983a471e9e2fc2249562064b10256269033473fd50264b6544646227fb666f075c4f266df1835ca3f88ee679bb97d34bf62bd195
DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+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-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-20191112195655-aa38f8e97acc.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip 22282 BLAKE2B 68df6b35d9043f23df13432b80074544f46833467294955ae5706713055d0cc9ababda892853c14e99c80a3571fd4a807a019a098fdd2ca695ba90c577ead5c4 SHA512 c72b8b73f89624889a2874c1b2445cb82f0e545fccf6a7761a278f3f659eb19f5f1c8585641b8f89f2bcfc3817ad2c0e267751cfeeab949e287e43af5df57e28
+DIST google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330
+DIST google.golang.org%2Fapi%2F@v%2Fv0.4.0.mod 506 BLAKE2B 6933fe30be88a21cca041b800cb9d095b1daf787f3701c0311da2606287d03799df9b556451d9170d02be8028ce686aaf69eaf941d2a8bdb4769c319c50c9905 SHA512 9fa566a26f8345a101dc94986755468b4782d78689d5a163aa5b960b507d4a0e8e435a8ce84073e07187745a156e2c9f586136895db2f08cfc4cd3329fc1e23a
+DIST google.golang.org%2Fapi%2F@v%2Fv0.7.0.mod 802 BLAKE2B 59277c0ab43500926ae727289dfd892ce524164f7acea3d6ede2f4efceb5e89e71e88c2c9fa3e4785da4d2a69c59e5c81c4d735887a6ab52c0b07a8b6baca88d SHA512 617883d94a4de6e07dfd82d046148ccfc5ab4eaf73840a76a9823e5cf03a60b0e0b4f1b62712620de28895d013f01bcd39477cb87bfb94524a634be8818c268c
+DIST google.golang.org%2Fapi%2F@v%2Fv0.8.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e
+DIST google.golang.org%2Fapi%2F@v%2Fv0.9.0.mod 850 BLAKE2B c338a815e2222182387fe11a60a2eb1e463851f38725da6e7884be1c2dbdea72473ecee4fca65bd50299c5f9095ac5e52848569b7979106da3876205e5cde41f SHA512 37c90eac881c258cb947f9507ae97466b355df015f64ef2d3ecbcbc154216623676340a000362e8229f3e842e68818a73ae64b5f63e3e1820cbff7b1e7b6d89e
DIST google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod 35 BLAKE2B 24fb6ba95138448c45da7f1ecc4c87391485006b54b8e7ff96ec582c2659f9ea77574b4d5fef2442eff9e5564f3c3263ed8e6963c5d21cde8772a7143d82f3ed SHA512 6644c398d639794470e49cad4402d17765422934915b5a13e13e1f84d8890cc8fad9e6ea8c580d114aefea70d894242e05ce3a432ee596f772b98b6b73069fe2
DIST google.golang.org%2Fappengine%2F@v%2Fv1.1.0.zip 391093 BLAKE2B 7e103e9c4be5d953371d0ea553272b8edd9fb180a32708f44b5f97b232498686ab311980d3a01bca53773d8c312307197819223c748adb5b027eeefe60b60efd SHA512 0c4f225732f14c6d205a572b8e289aefa480286a0fe5fa2c6e75e4aaf7443f42fb21866b11e227619cde683c0ca7835adef792178724b25ba9ab035efbe1bb67
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.5.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.1.mod 362 BLAKE2B 2d6d24186c2748c4d8f559feb269b351d4260c9c0e0b9342377f23af9e5ecc02fc7f84f7be299aedb0da1b1a6d6d67c3271a826b776bb7cc034256550479a0f5 SHA512 e3c391dfcc5f14fdc5430d7a1d239d4ebec89399b17851e4d7643b8c0c70077aaec3a1bc1a8dd5e3320d8bc6e1562a26e3fe1121d75ce578f37f5d2e84a4ddf6
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.1.zip 418135 BLAKE2B d3a64e18959e36aa267f235f1636d00ad545cb32a9245641bd771d511d8168c8070a2e517ae2b65d4d5911c1202267ea8cdd8ea8ed009cec3ccdb9013ad9a0ba SHA512 36a2b9842757e17959c520fe02243502017b8a074da8105763de86ba14c61659f49b3bb8b1eaf8b7c93f2ed297889a26dd43f3f87a139e205390cebb36f2e446
DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod 34 BLAKE2B cd6cb61b9f55a3c1e8b33588e98e62c9c27613ac20fb039cd70c9ecbe41c34d11d80246290ab73a9faf3ec809a15fc00267654b0eb00dbf23fe5c9758c705d9c SHA512 1c29af2b4f8b54234f09dfbfad120b4b11d4fe67e9578b0553412f1587cac2fa2bfe5537fbf15e6d52dcb04332413231c250c3c460b04e64326d2eaed3102464
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190911173649-1774047e7e51.mod 339 BLAKE2B 06dd6c875e6235007ea4f4a8350a7f80b3285e21f8ef599ea1e955a6185c5e11658040d073937a4110910c3d21d923487427c0dc626e342e10fef8efbfa95b2b SHA512 8d2fe5cf81319645c17ff8be71f966294976889b7aff74a5b234913dc34a1c7ac03548bcc9ed29120ef651705e7dc6da0c2aff892c9262d67d0044fec5685ac3
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20191108220845-16a3f7862a1a.mod 340 BLAKE2B bb2207855662037de3179be2e667a9cd8798e2d3c1b1eeb939f76095b9c32cca6dacd47439429b5705ad1d5c5597cb4170f17e49bcfa310c0733f1e68ffc1610 SHA512 1095755ae781f0370bb3dd72fca348c5d6640a4f89b6eddfcdd349f320ae117a4da47e48707f66743fc8dc4067285750d816d178b484dee0d21de0b2d1b129b2
DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod 833 BLAKE2B 71052eaeaf40883bff624eecce8fd6f5669fdea9355e6ae0db9c86c841a62f7176d5ab58838d1645f59b9cb4ad4b636048aa3e9f1d7db521104b8f09dc535bc7 SHA512 38c4f75a0121cecd31b2628da3c3d77aeeb9b2c1974eef2d2d2bb7a3eb507d330debb7f14a724c8910174439b38ab54458096aaf665ea4af87a83f866ca0452e
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod 795 BLAKE2B b825f2ab62a96b9b164410f761228575fd9882de37635c09803b9d2ce682ebbec30f301fd874aafaad95a5aa2431ba25962073e1bd4f336d8cb137e5939a8708 SHA512 585d4cf68b50a70d7967ac3941a7a83b83ed5df1a31773589a38348b6fdf247eb49e7778f7054b78ba1a65eef48d004a815abad932876cb1af2c09deea9c0db8
DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62
DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015
DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip 39844 BLAKE2B b3dab69dbd1ebb999938c12595de7007dce9431cfeaeb5e77aba80c49918d1a4edf7fb95279e9b66686cb45deaf57a011c083e55fb66ec2c614582ba323954da SHA512 97c96a92ec86372c2f06141c30bceaa86ed62c1db34696f9542f43f3411cb0a37dea654de923a5ee054e603198179b9048e3b477da140e4092ffadc4525b9241
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%2Ferrgo.v2%2F@v%2Fv2.1.0.mod 133 BLAKE2B c4ac637e2bf2d6635065be5213d73f23a1870054c58e9f1cce93af4627ed6fdefa96798b0fbbd27666573757f8b4a48c694ddf3f86c98e898124294459500771 SHA512 cac59fd7470fc9d3203dab6b9e881d4182cfca5acf0a19207a9aff2964d42f20422f9a164bb52b2fa73c523e3caafd63028189bd4190a1670870154dbf3e8178
+DIST gopkg.in%2Fini.v1%2F@v%2Fv1.51.0.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307538fba456343420c52605d453c6309f256e8062ea4b821d70c926096ae58a8feb33c6b796726d2dcc886c58e8293f99ac92a7 SHA512 7650ff592e6f5a0393f794fbdf17a28ad228a2d29ca79685c9ab8d9ec395554f1691b2a0d061e6248cf542f89be4d9a68884f7b24de7c8ddfef9c02cfeedda73
DIST gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod 86 BLAKE2B a2c81f0cabd00084e6e52de82e9ba9a5bdf42d45123b7a58ebe4baa07b41631498c7590535884282869c4947b4f4f9ea0f41bfd28c1c7bbd516ea5631f207e30 SHA512 84c11a71dfd5f94cbcc79aaa8d387600ea3eec89cdb44bc63e55daad5700dc20aa719ce7a5c960cf97900231bedd118afbd93c408aec449e68ed5d8c5641ff57
DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod 24 BLAKE2B 1cb17a1c6b1eb33cebd983f9e965f6db03f5095441d7cd72aff6df805501eef4dc249c22ecc85da360c27696a7c4ae613f0769a1f89e73f286281de89ffd3ef2 SHA512 89b481cc62ed7a486990ebfcf65cf7a344e5d189deef680e6ddd82dc93f31d166af05fc27b4a95ea27c33fd3ced1b87d4050d617d52008ca059c4a5d3b6c26a9
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
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip 80666 BLAKE2B ff3645b71cedd41b9fef6e5d01f3d89a2db6930f406aded7889530b04689ea34b53fa2a7af352c264681ee40b1d192c86ca2f7dcc33dca825d355694527e4dbf SHA512 19f019e85b8c9a533c3cf2fd492b1813272f00cce06a56ffe43046935e49ccf6e191ce83f1d236f6355bae7126aa722016f05174687ff2faf54f121958266edf
DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200121175148-a6ecf24a6d71.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
@@ -326,3 +502,7 @@ DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200506231410-2ff61e1afc86.zip 101681 BLA
DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.zip 103453 BLAKE2B 493d6289e171d84dded89f11aa89da42aefb6510e1b0a5a2e3a9223b31a6291af42c65b720246e9d632fed7e8a2868a2cd2e4f3e3f4acee99cff535aca0b6899 SHA512 7870ff82dad193b5087a735324705dc4ae3e29e96eff29ecd5b5e7ec38369aebc87151bb806dbd11b023dada74ff0c9fb4b7f0ed36d8f893f1c715909cb2b994
DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190418001031-e561f6794a2a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb
+DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f SHA512 db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
diff --git a/dev-util/github-cli/github-cli-1.4.0.ebuild b/dev-util/github-cli/github-cli-1.4.0.ebuild
new file mode 100644
index 000000000000..7a42da97bc62
--- /dev/null
+++ b/dev-util/github-cli/github-cli-1.4.0.ebuild
@@ -0,0 +1,487 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="GitHub CLI"
+HOMEPAGE="https://github.com/cli/cli"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/cli/cli.git"
+else
+EGO_SUM=(
+ "cloud.google.com/go v0.26.0/go.mod"
+ "cloud.google.com/go v0.34.0/go.mod"
+ "cloud.google.com/go v0.38.0/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/bigquery v1.0.1/go.mod"
+ "cloud.google.com/go/datastore v1.0.0/go.mod"
+ "cloud.google.com/go/firestore v1.1.0/go.mod"
+ "cloud.google.com/go/pubsub v1.0.1/go.mod"
+ "cloud.google.com/go/storage v1.0.0/go.mod"
+ "dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+ "github.com/AlecAivazis/survey/v2 v2.2.3"
+ "github.com/AlecAivazis/survey/v2 v2.2.3/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/MakeNowJust/heredoc v1.0.0"
+ "github.com/MakeNowJust/heredoc v1.0.0/go.mod"
+ "github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8"
+ "github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8/go.mod"
+ "github.com/OneOfOne/xxhash v1.2.2/go.mod"
+ "github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38"
+ "github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod"
+ "github.com/alecthomas/chroma v0.7.3"
+ "github.com/alecthomas/chroma v0.7.3/go.mod"
+ "github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721"
+ "github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod"
+ "github.com/alecthomas/kong v0.2.4/go.mod"
+ "github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897"
+ "github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/go.mod"
+ "github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+ "github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+ "github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+ "github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+ "github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+ "github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+ "github.com/beorn7/perks v1.0.0/go.mod"
+ "github.com/bgentry/speakeasy v0.1.0/go.mod"
+ "github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod"
+ "github.com/briandowns/spinner v1.11.1"
+ "github.com/briandowns/spinner v1.11.1/go.mod"
+ "github.com/cespare/xxhash v1.1.0/go.mod"
+ "github.com/charmbracelet/glamour v0.2.1-0.20200724174618-1246d13c1684"
+ "github.com/charmbracelet/glamour v0.2.1-0.20200724174618-1246d13c1684/go.mod"
+ "github.com/cli/safeexec v1.0.0"
+ "github.com/cli/safeexec v1.0.0/go.mod"
+ "github.com/cli/shurcooL-graphql v0.0.0-20200707151639-0f7232a2bf7e"
+ "github.com/cli/shurcooL-graphql v0.0.0-20200707151639-0f7232a2bf7e/go.mod"
+ "github.com/client9/misspell v0.3.4/go.mod"
+ "github.com/coreos/bbolt v1.3.2/go.mod"
+ "github.com/coreos/etcd v3.3.13+incompatible/go.mod"
+ "github.com/coreos/go-semver v0.3.0/go.mod"
+ "github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+ "github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+ "github.com/cpuguy83/go-md2man/v2 v2.0.0"
+ "github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+ "github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964"
+ "github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/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/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+ "github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+ "github.com/dlclark/regexp2 v1.2.0"
+ "github.com/dlclark/regexp2 v1.2.0/go.mod"
+ "github.com/enescakir/emoji v1.0.0"
+ "github.com/enescakir/emoji v1.0.0/go.mod"
+ "github.com/fatih/color v1.7.0"
+ "github.com/fatih/color v1.7.0/go.mod"
+ "github.com/fsnotify/fsnotify v1.4.7/go.mod"
+ "github.com/ghodss/yaml v1.0.0/go.mod"
+ "github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
+ "github.com/go-kit/kit v0.8.0/go.mod"
+ "github.com/go-logfmt/logfmt v0.3.0/go.mod"
+ "github.com/go-logfmt/logfmt v0.4.0/go.mod"
+ "github.com/go-stack/stack v1.8.0/go.mod"
+ "github.com/gogo/protobuf v1.1.1/go.mod"
+ "github.com/gogo/protobuf v1.2.1/go.mod"
+ "github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+ "github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
+ "github.com/golang/mock v1.1.1/go.mod"
+ "github.com/golang/mock v1.2.0/go.mod"
+ "github.com/golang/mock v1.3.1/go.mod"
+ "github.com/golang/protobuf v1.2.0/go.mod"
+ "github.com/golang/protobuf v1.3.1"
+ "github.com/golang/protobuf v1.3.1/go.mod"
+ "github.com/golang/protobuf v1.3.2"
+ "github.com/golang/protobuf v1.3.2/go.mod"
+ "github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+ "github.com/google/btree v1.0.0/go.mod"
+ "github.com/google/go-cmp v0.2.0"
+ "github.com/google/go-cmp v0.2.0/go.mod"
+ "github.com/google/go-cmp v0.3.0/go.mod"
+ "github.com/google/go-cmp v0.5.2"
+ "github.com/google/go-cmp v0.5.2/go.mod"
+ "github.com/google/goterm v0.0.0-20190703233501-fc88cf888a3f"
+ "github.com/google/goterm v0.0.0-20190703233501-fc88cf888a3f/go.mod"
+ "github.com/google/martian v2.1.0+incompatible/go.mod"
+ "github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+ "github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+ "github.com/google/renameio v0.1.0/go.mod"
+ "github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510"
+ "github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod"
+ "github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+ "github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+ "github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+ "github.com/gorilla/websocket v1.4.2/go.mod"
+ "github.com/graph-gophers/graphql-go v0.0.0-20200622220639-c1d9693c95a6/go.mod"
+ "github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+ "github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+ "github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+ "github.com/hashicorp/consul/api v1.1.0/go.mod"
+ "github.com/hashicorp/consul/sdk v0.1.1/go.mod"
+ "github.com/hashicorp/errwrap v1.0.0/go.mod"
+ "github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+ "github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+ "github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+ "github.com/hashicorp/go-multierror v1.0.0/go.mod"
+ "github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+ "github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+ "github.com/hashicorp/go-syslog v1.0.0/go.mod"
+ "github.com/hashicorp/go-uuid v1.0.0/go.mod"
+ "github.com/hashicorp/go-uuid v1.0.1/go.mod"
+ "github.com/hashicorp/go-version v1.2.1"
+ "github.com/hashicorp/go-version v1.2.1/go.mod"
+ "github.com/hashicorp/go.net v0.0.1/go.mod"
+ "github.com/hashicorp/golang-lru v0.5.0/go.mod"
+ "github.com/hashicorp/golang-lru v0.5.1/go.mod"
+ "github.com/hashicorp/hcl v1.0.0/go.mod"
+ "github.com/hashicorp/logutils v1.0.0/go.mod"
+ "github.com/hashicorp/mdns v1.0.0/go.mod"
+ "github.com/hashicorp/memberlist v0.1.3/go.mod"
+ "github.com/hashicorp/serf v0.8.2/go.mod"
+ "github.com/henvic/httpretty v0.0.6"
+ "github.com/henvic/httpretty v0.0.6/go.mod"
+ "github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174"
+ "github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174/go.mod"
+ "github.com/inconshreveable/mousetrap v1.0.0"
+ "github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+ "github.com/jonboulle/clockwork v0.1.0/go.mod"
+ "github.com/json-iterator/go v1.1.6/go.mod"
+ "github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+ "github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+ "github.com/julienschmidt/httprouter v1.2.0/go.mod"
+ "github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51"
+ "github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod"
+ "github.com/kisielk/errcheck v1.1.0/go.mod"
+ "github.com/kisielk/gotool v1.0.0/go.mod"
+ "github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+ "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/pty v1.1.1/go.mod"
+ "github.com/kr/pty v1.1.4"
+ "github.com/kr/pty v1.1.4/go.mod"
+ "github.com/kr/text v0.1.0"
+ "github.com/kr/text v0.1.0/go.mod"
+ "github.com/lucasb-eyer/go-colorful v1.0.3"
+ "github.com/lucasb-eyer/go-colorful v1.0.3/go.mod"
+ "github.com/magiconair/properties v1.8.1/go.mod"
+ "github.com/mattn/go-colorable v0.0.9/go.mod"
+ "github.com/mattn/go-colorable v0.1.2"
+ "github.com/mattn/go-colorable v0.1.2/go.mod"
+ "github.com/mattn/go-colorable v0.1.6"
+ "github.com/mattn/go-colorable v0.1.6/go.mod"
+ "github.com/mattn/go-colorable v0.1.8"
+ "github.com/mattn/go-colorable v0.1.8/go.mod"
+ "github.com/mattn/go-isatty v0.0.3/go.mod"
+ "github.com/mattn/go-isatty v0.0.8/go.mod"
+ "github.com/mattn/go-isatty v0.0.12"
+ "github.com/mattn/go-isatty v0.0.12/go.mod"
+ "github.com/mattn/go-runewidth v0.0.7"
+ "github.com/mattn/go-runewidth v0.0.7/go.mod"
+ "github.com/mattn/go-runewidth v0.0.9"
+ "github.com/mattn/go-runewidth v0.0.9/go.mod"
+ "github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+ "github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b"
+ "github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod"
+ "github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d"
+ "github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod"
+ "github.com/microcosm-cc/bluemonday v1.0.2"
+ "github.com/microcosm-cc/bluemonday v1.0.2/go.mod"
+ "github.com/miekg/dns v1.0.14/go.mod"
+ "github.com/mitchellh/cli v1.0.0/go.mod"
+ "github.com/mitchellh/go-homedir v1.0.0/go.mod"
+ "github.com/mitchellh/go-homedir v1.1.0"
+ "github.com/mitchellh/go-homedir v1.1.0/go.mod"
+ "github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+ "github.com/mitchellh/gox v0.4.0/go.mod"
+ "github.com/mitchellh/iochan v1.0.0/go.mod"
+ "github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+ "github.com/mitchellh/mapstructure v1.1.2/go.mod"
+ "github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+ "github.com/modern-go/reflect2 v1.0.1/go.mod"
+ "github.com/muesli/reflow v0.1.0"
+ "github.com/muesli/reflow v0.1.0/go.mod"
+ "github.com/muesli/termenv v0.6.0"
+ "github.com/muesli/termenv v0.6.0/go.mod"
+ "github.com/muesli/termenv v0.7.4"
+ "github.com/muesli/termenv v0.7.4/go.mod"
+ "github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+ "github.com/oklog/ulid v1.3.1/go.mod"
+ "github.com/olekukonko/tablewriter v0.0.4"
+ "github.com/olekukonko/tablewriter v0.0.4/go.mod"
+ "github.com/opentracing/opentracing-go v1.1.0/go.mod"
+ "github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+ "github.com/pelletier/go-toml v1.2.0/go.mod"
+ "github.com/pkg/errors v0.8.0/go.mod"
+ "github.com/pkg/errors v0.8.1"
+ "github.com/pkg/errors v0.8.1/go.mod"
+ "github.com/pkg/errors v0.9.1/go.mod"
+ "github.com/pmezard/go-difflib v1.0.0"
+ "github.com/pmezard/go-difflib v1.0.0/go.mod"
+ "github.com/posener/complete v1.1.1/go.mod"
+ "github.com/prometheus/client_golang v0.9.1/go.mod"
+ "github.com/prometheus/client_golang v0.9.3/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/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+ "github.com/prometheus/common v0.4.0/go.mod"
+ "github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+ "github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+ "github.com/prometheus/tsdb v0.7.1/go.mod"
+ "github.com/rivo/uniseg v0.1.0"
+ "github.com/rivo/uniseg v0.1.0/go.mod"
+ "github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+ "github.com/rogpeppe/go-internal v1.3.0/go.mod"
+ "github.com/russross/blackfriday/v2 v2.0.1"
+ "github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+ "github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+ "github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+ "github.com/sergi/go-diff v1.0.0"
+ "github.com/sergi/go-diff v1.0.0/go.mod"
+ "github.com/shurcooL/githubv4 v0.0.0-20200928013246-d292edc3691b"
+ "github.com/shurcooL/githubv4 v0.0.0-20200928013246-d292edc3691b/go.mod"
+ "github.com/shurcooL/sanitized_anchor_name v1.0.0"
+ "github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+ "github.com/sirupsen/logrus v1.2.0/go.mod"
+ "github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+ "github.com/smartystreets/goconvey v1.6.4/go.mod"
+ "github.com/soheilhy/cmux v0.1.4/go.mod"
+ "github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+ "github.com/spf13/afero v1.1.2/go.mod"
+ "github.com/spf13/cast v1.3.0/go.mod"
+ "github.com/spf13/cobra v1.1.1"
+ "github.com/spf13/cobra v1.1.1/go.mod"
+ "github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+ "github.com/spf13/pflag v1.0.3"
+ "github.com/spf13/pflag v1.0.3/go.mod"
+ "github.com/spf13/pflag v1.0.5"
+ "github.com/spf13/pflag v1.0.5/go.mod"
+ "github.com/spf13/viper v1.7.0/go.mod"
+ "github.com/stretchr/objx v0.1.0/go.mod"
+ "github.com/stretchr/objx v0.1.1"
+ "github.com/stretchr/objx v0.1.1/go.mod"
+ "github.com/stretchr/testify v1.2.1/go.mod"
+ "github.com/stretchr/testify v1.2.2/go.mod"
+ "github.com/stretchr/testify v1.3.0"
+ "github.com/stretchr/testify v1.3.0/go.mod"
+ "github.com/stretchr/testify v1.6.1"
+ "github.com/stretchr/testify v1.6.1/go.mod"
+ "github.com/subosito/gotenv v1.2.0/go.mod"
+ "github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+ "github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+ "github.com/yuin/goldmark v1.2.0"
+ "github.com/yuin/goldmark v1.2.0/go.mod"
+ "go.etcd.io/bbolt v1.3.2/go.mod"
+ "go.opencensus.io v0.21.0/go.mod"
+ "go.opencensus.io v0.22.0/go.mod"
+ "go.uber.org/atomic v1.4.0/go.mod"
+ "go.uber.org/multierr v1.1.0/go.mod"
+ "go.uber.org/zap v1.10.0/go.mod"
+ "golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+ "golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
+ "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+ "golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+ "golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5"
+ "golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod"
+ "golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+ "golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9"
+ "golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+ "golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897"
+ "golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/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-20191030013958-a1ab85dbe136/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/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/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+ "golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+ "golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
+ "golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+ "golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+ "golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+ "golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+ "golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+ "golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+ "golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3"
+ "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-20190603091049-60506f45cf65/go.mod"
+ "golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+ "golang.org/x/net v0.0.0-20200707034311-ab3426394381"
+ "golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+ "golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be"
+ "golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+ "golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+ "golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
+ "golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+ "golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+ "golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+ "golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+ "golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+ "golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+ "golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
+ "golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+ "golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+ "golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
+ "golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/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-20190222072716-a9d3bda3a223/go.mod"
+ "golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+ "golang.org/x/sys v0.0.0-20190412213103-97732733099d/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-20190530182044-ad28b68e88f1/go.mod"
+ "golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+ "golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+ "golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+ "golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae"
+ "golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+ "golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd"
+ "golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+ "golang.org/x/sys v0.0.0-20200413165638-669c56c373c4"
+ "golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod"
+ "golang.org/x/text v0.3.0"
+ "golang.org/x/text v0.3.0/go.mod"
+ "golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+ "golang.org/x/text v0.3.2/go.mod"
+ "golang.org/x/text v0.3.4"
+ "golang.org/x/text v0.3.4/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/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+ "golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+ "golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+ "golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+ "golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+ "golang.org/x/tools v0.0.0-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-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-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-20191112195655-aa38f8e97acc/go.mod"
+ "golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+ "golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
+ "golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+ "google.golang.org/api v0.4.0/go.mod"
+ "google.golang.org/api v0.7.0/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.13.0/go.mod"
+ "google.golang.org/appengine v1.1.0"
+ "google.golang.org/appengine v1.1.0/go.mod"
+ "google.golang.org/appengine v1.4.0/go.mod"
+ "google.golang.org/appengine v1.5.0/go.mod"
+ "google.golang.org/appengine v1.6.1"
+ "google.golang.org/appengine v1.6.1/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-20191108220845-16a3f7862a1a/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"
+ "gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+ "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405"
+ "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+ "gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127"
+ "gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+ "gopkg.in/errgo.v2 v2.1.0/go.mod"
+ "gopkg.in/ini.v1 v1.51.0/go.mod"
+ "gopkg.in/resty.v1 v1.12.0/go.mod"
+ "gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+ "gopkg.in/yaml.v2 v2.2.1/go.mod"
+ "gopkg.in/yaml.v2 v2.2.4/go.mod"
+ "gopkg.in/yaml.v2 v2.2.8"
+ "gopkg.in/yaml.v2 v2.2.8/go.mod"
+ "gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+ "gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776"
+ "gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/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.1-2019.2.3/go.mod"
+ "rsc.io/binaryregexp v0.2.0/go.mod"
+ )
+go-module_set_globals
+ SRC_URI="https://github.com/cli/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ ${EGO_SUM_SRC_URI}"
+ KEYWORDS="~amd64"
+ S="${WORKDIR}/cli-${PV}"
+fi
+
+LICENSE="MIT Apache-2.0 BSD BSD-2 MPL-2.0"
+SLOT="0"
+
+RDEPEND=">=dev-vcs/git-1.7.3"
+
+src_unpack() {
+ if [[ ${PV} == *9999 ]]; then
+ git-r3_src_unpack
+ go-module_live_vendor
+ else
+ go-module_src_unpack
+ fi
+}
+
+src_compile() {
+ [[ ${PV} == *9999 ]] || export GH_VERSION="v${PV}"
+ # Go LDFLAGS are not the same as GCC/Binutils LDFLAGS
+ unset LDFLAGS
+ # Once we set up cross compiling, this line will need to be adjusted
+ # to compile for the target.
+ # Everything else in this function happens on the host.
+ emake
+
+ einfo "Building man pages"
+ emake manpages
+
+ einfo "Building completions"
+ go run ./cmd/gh completion -s bash > gh.bash-completion || die
+ go run ./cmd/gh completion -s zsh > gh.zsh-completion || die
+}
+
+src_install() {
+ dobin bin/gh
+ dodoc README.md
+
+ doman share/man/man?/gh*.?
+
+ newbashcomp gh.bash-completion gh
+ insinto /usr/share/zsh/site-functions
+ newins gh.zsh-completion _gh
+}
diff --git a/dev-util/gitlab-runner/Manifest b/dev-util/gitlab-runner/Manifest
index e7ef6521d2d1..93cc336dbea4 100644
--- a/dev-util/gitlab-runner/Manifest
+++ b/dev-util/gitlab-runner/Manifest
@@ -1,4 +1,4 @@
-DIST gitlab-runner-13.5.0.tar.bz2 5672445 BLAKE2B d09c3be01388718e372ffd297302166a5774f74f79ac50fe77daaea5bd9270ee25ee0925b3dfbf4dff46ff38e15210dc2d31caade614e012c24b0d92fb16931f SHA512 bb4b9dc411e64bcadcd0ad1bd3120971a06801da32c594f7f44dee454324f6b270626705c692290afc3c34b12ee05c050b1085a31cfc6fbf2dc8102055221ee4
DIST gitlab-runner-13.6.0.tar.bz2 5886160 BLAKE2B 5d85b3090b114c768b0daeab5556bc1bb3ad13a34a61f49b5fbbe72c8aa3d89a876d6e798b544928bbdf2b09211dcaf68b216872ca692a55d3ee1a99d6329087 SHA512 170668ac86be787ac089fe660ea5d30b5d1536b054cfffecd0e21c0ebb0079e06f5e94393623d2fec19bec27b420f4fd59cf734bef2e44e226491e86c019f9d1
-DIST prebuilt-x86_64-v13.5.0.tar.xz 13089304 BLAKE2B 1ef761886356e2c40d798968e77c9a9d7fc2b0cba1e4b52c076af4f38b44505806b29e47db527f67dc392e013b996389381d7a1c09e4de8f7fcafe07e88d7e35 SHA512 94181b9238bdde74c88e05c37f93d6ce242bb5d8abc45158f7f4bf9bec2e09c9beafa8636f4589f9e917ed7f0aafc0858b3d3ffc13936da70981028703ca4016
+DIST gitlab-runner-13.7.0.tar.bz2 5943215 BLAKE2B 96953ba808ddc6fcf68835f198150a00010ef4df51f047842a243a562e08848f874f0349cf6a79da0831f3b6603ee0d99313fd450644e4ef40b984c86962a8c3 SHA512 f68018a4330b63b366106e52b9107a48110e4b77fdc336e544a45a1aa5b08491aead2bf65bd4d97a0a731274221392e2644b561f70712a9b4a36a52d88897941
DIST prebuilt-x86_64-v13.6.0.tar.xz 14351696 BLAKE2B 4b56c79143e3567bf8e5eb7b1ac33cef1789e3d1f9819e99e0c03c747ce2ebe65c364ccaf3f9cd86adb90c376a7d1873fe801a7570704577a4bdc223e0befe8d SHA512 ab3b953890817e2ac5e6b26e77edbadbc8305b61a4bd8ed4220b3494444f838040ab5ef71a81701c369610dab5e0515d1dd299efd43753d354ce38835a4e739a
+DIST prebuilt-x86_64-v13.7.0.tar.xz 14340568 BLAKE2B b1ccb1070a1b698926dd50b4d1d5046d742873bb3ac00149dd62546aa295db220c21856749fed593528e4e223e97558a6ad14e7e629201d2a3ba9909d45cb52a SHA512 bd125203ecacc638ba8380580721a7377e03e1439ac477819ec327f45c6c3bfdc8a1c2fa84cd313faafa8776a4cb32de1c66d55968b119e27b7854d00ab2dac5
diff --git a/dev-util/gitlab-runner/gitlab-runner-13.5.0.ebuild b/dev-util/gitlab-runner/gitlab-runner-13.7.0.ebuild
index acc32be8af3c..acc32be8af3c 100644
--- a/dev-util/gitlab-runner/gitlab-runner-13.5.0.ebuild
+++ b/dev-util/gitlab-runner/gitlab-runner-13.7.0.ebuild
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index 6336f5dac126..4661caea1521 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -2,3 +2,4 @@ DIST glib-2.62.6.tar.xz 4703424 BLAKE2B 0a27245be2575c574dcc730dd051a8c284f421db
DIST glib-2.64.5.tar.xz 4778456 BLAKE2B 7fdee0e16a7ac820f4c4f7dc66d37add464d3005e89e6013302d3ef103319331811d68e9b42db072b82242c3d7badfbd085b69333e770012def89dc8aae7a2eb SHA512 a87537274619b6de88a0e68555059036ac18c748b5005c8d84728646b0db342fde0b8c5b303b9ad79f64d71ea4ed990d52a4fbd68cda3ca74aed5fe4d497e060
DIST glib-2.66.2.tar.xz 4836456 BLAKE2B 5484a7fe497dbe06df7ce11dbc8836c95dbb01e6e309516b82158f2915eeee36ccbe6e904cb6ae9a5a0223ccc0b52f6e64d61a418bf790538bc90388430977b2 SHA512 30278c066c6b209f45fcfdb9ffc4732236451464506b93c0fff0964ff8aac58c15be85c3793c686d4740d9d97857984bc0ab71e38d5da11c5fd860e569fb6cb9
DIST glib-2.66.3.tar.xz 4837796 BLAKE2B 44632477b56bea5b6324deccc17e2d6b72e00dba518f9fc3ec5edad8b20df59f8bf9087e5de16b587b72c2f143d9ab650c478666132b1564da9bf333f380a4e3 SHA512 ab2670ae4eeb3b561c0e71ff9153908f450e430cd43771bfee09233a65826dc16462537ec64bdfcced867f4c8663341b6b9d17af5ba0fab8564b8f21b04a45d7
+DIST glib-2.66.4.tar.xz 4838124 BLAKE2B de2b8690c9ef9d66378b396ec0abe2bc83380654b3ca2e221678fb6dc9bf449c544a7e2b2a662739f7b400e9ce0a5a0af115ba2f06b8f5597967e518fdec4937 SHA512 b3bc3e6e5cca793139848940e5c0894f1c7e3bd3a770b213a1ea548ac54a2432aebb140ed54518712fb8af36382b3b13d5f7ffd3d87ff63cba9e2f55434f7260
diff --git a/dev-util/glib-utils/glib-utils-2.62.6.ebuild b/dev-util/glib-utils/glib-utils-2.62.6.ebuild
index 25f13cc34a9f..c4093f7a6c29 100644
--- a/dev-util/glib-utils/glib-utils-2.62.6.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.62.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
RDEPEND="${PYTHON_DEPS}
!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/glib-utils/glib-utils-2.64.5.ebuild b/dev-util/glib-utils/glib-utils-2.64.5.ebuild
index 25f13cc34a9f..c4093f7a6c29 100644
--- a/dev-util/glib-utils/glib-utils-2.64.5.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.64.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
RDEPEND="${PYTHON_DEPS}
!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/glib-utils/glib-utils-2.66.2.ebuild b/dev-util/glib-utils/glib-utils-2.66.2.ebuild
index 7823063fcc5f..391351ce55f5 100644
--- a/dev-util/glib-utils/glib-utils-2.66.2.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.66.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
RDEPEND="${PYTHON_DEPS}
!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/glib-utils/glib-utils-2.66.3.ebuild b/dev-util/glib-utils/glib-utils-2.66.3.ebuild
index 7823063fcc5f..391351ce55f5 100644
--- a/dev-util/glib-utils/glib-utils-2.66.3.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.66.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
RDEPEND="${PYTHON_DEPS}
!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/glib-utils/glib-utils-2.66.4.ebuild b/dev-util/glib-utils/glib-utils-2.66.4.ebuild
new file mode 100644
index 000000000000..391351ce55f5
--- /dev/null
+++ b/dev-util/glib-utils/glib-utils-2.66.4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+GNOME_ORG_MODULE="glib"
+
+inherit gnome.org python-single-r1
+
+DESCRIPTION="Build utilities for GLib using projects"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+
+RDEPEND="${PYTHON_DEPS}
+ !<dev-libs/glib-2.56.2:2
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-libs/libxslt
+ app-text/docbook-xsl-stylesheets
+"
+
+src_configure() { :; }
+
+do_xsltproc_command() {
+ # Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/gdbus-codegen)
+ xsltproc \
+ --nonet \
+ --stringparam man.output.quietly 1 \
+ --stringparam funcsynopsis.style ansi \
+ --stringparam man.th.extra1.suppress 1 \
+ --stringparam man.authors.section.enabled 0 \
+ --stringparam man.copyright.section.enabled 0 \
+ -o "${2}" \
+ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
+ "${1}" || die "manpage generation failed"
+}
+
+src_compile() {
+ sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal || die
+ sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums || die
+ sed -e "s:@GLIB_VERSION@:${PV}:g;s:@PYTHON@:python:g" glib/gtester-report.in > glib/gtester-report || die
+ do_xsltproc_command docs/reference/gobject/glib-genmarshal.xml docs/reference/gobject/glib-genmarshal.1
+ do_xsltproc_command docs/reference/gobject/glib-mkenums.xml docs/reference/gobject/glib-mkenums.1
+ do_xsltproc_command docs/reference/glib/gtester-report.xml docs/reference/glib/gtester-report.1
+}
+
+src_install() {
+ python_fix_shebang gobject/glib-genmarshal
+ python_fix_shebang gobject/glib-mkenums
+ python_fix_shebang glib/gtester-report
+ exeinto /usr/bin
+ doexe gobject/glib-genmarshal
+ doexe gobject/glib-mkenums
+ doexe glib/gtester-report
+ doman docs/reference/gobject/glib-genmarshal.1
+ doman docs/reference/gobject/glib-mkenums.1
+ doman docs/reference/glib/gtester-report.1
+}
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index e523354ccd79..ff8fe4a0a0a0 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,5 +1,2 @@
DIST glslang-10.11.0.0_pre20200924.tar.gz 3246618 BLAKE2B e4353a9cf06273f6a5fc79004c5f97df3da3444a793ddefb6adee96cbcf541d6088bf2f2edc65dea53363cbcb254f7da80fefb8a93b8650adf2ed283b243fa24 SHA512 01551b2347f25e6135ef82f5ae838dbf275cb3f20300659b830c85fded334a8dea3928c017ff7d48d58d89ddf93f5429191f0a326f310db9ee989f622e23477f
-DIST glslang-7.12.3353_pre20191027.tar.gz 3119760 BLAKE2B 4a7eda7bf89b1589cb8a712660589e2746ff13ce3cac589a5651486fbdaa149b0fd8fceb791af0e43c9342aa9ca31459f66d0236c31d22959e519e8eb4457018 SHA512 6f247dbf9a50cdfe7b6ffbf79f73c46c57f8f61ef10037e0775ddd6faf4c5fd4b9b6b6761ecf26cc71c3711a650ee8619e2f0a33dfcf8ca8dc2974e497a685a7
-DIST glslang-8.13.3559.tar.gz 3122936 BLAKE2B 856e6068a06407195f97478b3e6bd91aa619213d8468a8c9ff7ee8e7a36a904e4896e34e021e8e4e047fab6ea406d89206849058a659de8075c52a06118b0e7b SHA512 d2f09888dd1b6edb4f324502627aeca0c78411f61ab50e672fa2a6d9ae46611849e1d13b9c6069b77f31092d843abcf3d74ed7cfc3c9144ced80e65876f4b781
-DIST glslang-8.13.3560_pre20200404.tar.gz 3185684 BLAKE2B fac831212b46b22f10657ee44afc788d174779dd36e9d5f045f8e84ab3cca448aee89aab13771a29598b242653d6a29e4eb8fd8965e1c03ceec599e7ab1fafa9 SHA512 ec5b89d918cf55bb0a166f59eeea3662d54f29a986f979a9b04ab35bc8e02e5b01d13c24f336666669115f90d3d97eb91abe7ba4b9108590ec9b8a78e976223f
-DIST glslang-8.13.3743.tar.gz 3183453 BLAKE2B 2e8fc3693477be8bd6f8000a0eb032b314f5903991dc5a73dbd913a92aa0d6878e45f29f0a01ca5e8453b566d8a503a3cf4256def7f90a4cb561391b047c2a1d SHA512 19169c4ffa511113978af8e8efc57b290d4aa962a4c2429dbea1af72204787c6ce20ffbbb452dc04bef5416e00510819d84463a2e76295b9a59b409e12af6792
+DIST glslang-10.11.0.0_pre20201216.tar.gz 3290064 BLAKE2B 46ce951ab6c69eb25dc2490e3eb817c5cc0e2bf2416f29842b45bb1efb83ea439d72c823c981e2f37803e203077ea01d1c84c28391fb78288c107510a47d2241 SHA512 4b9e300152dc2ec3b14657b3a745d5b26b5da49e5ff3da0d75680f84126237ec6af0f7cee5aaa74b2d4a123a386522cd7342b5f25e4c01f114da3d5d92057128
diff --git a/dev-util/glslang/files/glslang-7.12.3353_pre20191027-fix-relative-includes.patch b/dev-util/glslang/files/glslang-7.12.3353_pre20191027-fix-relative-includes.patch
deleted file mode 100644
index 4c44cfbbbedd..000000000000
--- a/dev-util/glslang/files/glslang-7.12.3353_pre20191027-fix-relative-includes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/SPIRV/GlslangToSpv.h b/SPIRV/GlslangToSpv.h
-index 86e1c23b..3907be43 100755
---- a/SPIRV/GlslangToSpv.h
-+++ b/SPIRV/GlslangToSpv.h
-@@ -40,7 +40,7 @@
- #endif
-
- #include "SpvTools.h"
--#include "../glslang/Include/intermediate.h"
-+#include "glslang/Include/intermediate.h"
-
- #include <string>
- #include <vector>
-diff --git a/SPIRV/SpvTools.h b/SPIRV/SpvTools.h
-index 7422d012..59c914da 100644
---- a/SPIRV/SpvTools.h
-+++ b/SPIRV/SpvTools.h
-@@ -46,7 +46,7 @@
- #include <ostream>
- #endif
-
--#include "../glslang/MachineIndependent/localintermediate.h"
-+#include "glslang/MachineIndependent/localintermediate.h"
- #include "Logger.h"
-
- namespace glslang {
diff --git a/dev-util/glslang/files/glslang-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch b/dev-util/glslang/files/glslang-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch
deleted file mode 100644
index 8838a97809d4..000000000000
--- a/dev-util/glslang/files/glslang-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt
-index af4ab587..e0096743 100644
---- a/OGLCompilersDLL/CMakeLists.txt
-+++ b/OGLCompilersDLL/CMakeLists.txt
-@@ -11,5 +11,5 @@ endif(WIN32)
- if(ENABLE_GLSLANG_INSTALL)
- install(TARGETS OGLCompiler EXPORT OGLCompilerTargets
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-- install(EXPORT OGLCompilerTargets DESTINATION lib/cmake)
-+ install(EXPORT OGLCompilerTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
- endif(ENABLE_GLSLANG_INSTALL)
-diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
-index e25ec0a1..364f04cc 100644
---- a/SPIRV/CMakeLists.txt
-+++ b/SPIRV/CMakeLists.txt
-@@ -91,8 +91,8 @@ if(ENABLE_GLSLANG_INSTALL)
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
- endif()
-
-- install(EXPORT SPVRemapperTargets DESTINATION lib/cmake)
-- install(EXPORT SPIRVTargets DESTINATION lib/cmake)
-+ install(EXPORT SPVRemapperTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
-+ install(EXPORT SPIRVTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
-
- install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/)
- endif(ENABLE_GLSLANG_INSTALL)
-diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt
-index 0878965c..d9d71d1a 100644
---- a/StandAlone/CMakeLists.txt
-+++ b/StandAlone/CMakeLists.txt
-@@ -49,12 +49,12 @@ if(ENABLE_GLSLANG_INSTALL)
- install(TARGETS spirv-remap EXPORT spirv-remapTargets
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-
-- install(EXPORT glslangValidatorTargets DESTINATION lib/cmake)
-- install(EXPORT spirv-remapTargets DESTINATION lib/cmake)
-+ install(EXPORT glslangValidatorTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
-+ install(EXPORT spirv-remapTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
-
- if(BUILD_SHARED_LIBS)
- install(TARGETS glslang-default-resource-limits EXPORT glslang-default-resource-limitsTargets
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-- install(EXPORT glslang-default-resource-limitsTargets DESTINATION lib/cmake)
-+ install(EXPORT glslang-default-resource-limitsTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
- endif()
- endif(ENABLE_GLSLANG_INSTALL)
-diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
-index 42df1d1e..446cabb9 100644
---- a/glslang/CMakeLists.txt
-+++ b/glslang/CMakeLists.txt
-@@ -112,7 +112,7 @@ if(ENABLE_GLSLANG_INSTALL)
- install(TARGETS glslang EXPORT glslangTargets
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
- endif()
-- install(EXPORT glslangTargets DESTINATION lib/cmake)
-+ install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
- endif(ENABLE_GLSLANG_INSTALL)
-
- if(ENABLE_GLSLANG_INSTALL)
-diff --git a/glslang/OSDependent/Unix/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt
-index 91fb45a7..9994314f 100644
---- a/glslang/OSDependent/Unix/CMakeLists.txt
-+++ b/glslang/OSDependent/Unix/CMakeLists.txt
-@@ -22,5 +22,5 @@ endif()
- if(ENABLE_GLSLANG_INSTALL)
- install(TARGETS OSDependent EXPORT OSDependentTargets
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-- install(EXPORT OSDependentTargets DESTINATION lib/cmake)
-+ install(EXPORT OSDependentTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
- endif(ENABLE_GLSLANG_INSTALL)
-diff --git a/glslang/OSDependent/Windows/CMakeLists.txt b/glslang/OSDependent/Windows/CMakeLists.txt
-index f6bd4e9d..c050ef61 100644
---- a/glslang/OSDependent/Windows/CMakeLists.txt
-+++ b/glslang/OSDependent/Windows/CMakeLists.txt
-@@ -17,5 +17,5 @@ endif(WIN32)
- if(ENABLE_GLSLANG_INSTALL)
- install(TARGETS OSDependent EXPORT OSDependentTargets
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-- install(EXPORT OSDependentTargets DESTINATION lib/cmake)
-+ install(EXPORT OSDependentTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
- endif(ENABLE_GLSLANG_INSTALL)
-diff --git a/gtests/CMakeLists.txt b/gtests/CMakeLists.txt
-index 77d217f1..aadf9a54 100644
---- a/gtests/CMakeLists.txt
-+++ b/gtests/CMakeLists.txt
-@@ -33,7 +33,7 @@ if(BUILD_TESTING)
- if(ENABLE_GLSLANG_INSTALL)
- install(TARGETS glslangtests EXPORT glslangtestsTargets
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-- install(EXPORT glslangtestsTargets DESTINATION lib/cmake)
-+ install(EXPORT glslangtestsTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
- endif(ENABLE_GLSLANG_INSTALL)
-
- set(GLSLANG_TEST_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../Test")
-diff --git a/hlsl/CMakeLists.txt b/hlsl/CMakeLists.txt
-index 44f9d6a2..ae0d4d4e 100644
---- a/hlsl/CMakeLists.txt
-+++ b/hlsl/CMakeLists.txt
-@@ -41,5 +41,5 @@ if(ENABLE_GLSLANG_INSTALL)
- install(TARGETS HLSL EXPORT HLSLTargets
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
- endif()
-- install(EXPORT HLSLTargets DESTINATION lib/cmake)
-+ install(EXPORT HLSLTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
- endif(ENABLE_GLSLANG_INSTALL)
diff --git a/dev-util/glslang/glslang-10.11.0.0_pre20200924.ebuild b/dev-util/glslang/glslang-10.11.0.0_pre20200924.ebuild
index 458dcf6b6506..5574dbcd3719 100644
--- a/dev-util/glslang/glslang-10.11.0.0_pre20200924.ebuild
+++ b/dev-util/glslang/glslang-10.11.0.0_pre20200924.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
else
SNAPSHOT_COMMIT="bacaef3237c515e40d1a24722be48c0a0b30f75f"
SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 arm arm64 ~ppc ppc64 ~riscv x86"
+ KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
fi
diff --git a/dev-util/glslang/glslang-8.13.3560_pre20200404.ebuild b/dev-util/glslang/glslang-10.11.0.0_pre20201216.ebuild
index 42de81d73f3e..255bf81815b9 100644
--- a/dev-util/glslang/glslang-8.13.3560_pre20200404.ebuild
+++ b/dev-util/glslang/glslang-10.11.0.0_pre20201216.ebuild
@@ -11,9 +11,9 @@ if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git"
inherit git-r3
else
- SNAPSHOT_COMMIT="b5757b95005bbf6b0287096c5b708c5e25645311"
+ SNAPSHOT_COMMIT="c594de23cdd790d64ad5f9c8b059baae0ee2941d"
SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~ppc64 x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
fi
diff --git a/dev-util/glslang/glslang-7.12.3353_pre20191027-r2.ebuild b/dev-util/glslang/glslang-7.12.3353_pre20191027-r2.ebuild
deleted file mode 100644
index 4cab561e6ff4..000000000000
--- a/dev-util/glslang/glslang-7.12.3353_pre20191027-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit cmake-multilib cmake-utils python-any-r1
-
-SNAPSHOT_COMMIT="b131630e7c749a5dc19faa458024260c71fb170f"
-SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 ~ppc64 x86"
-S="${WORKDIR}/glslang-${SNAPSHOT_COMMIT}"
-
-DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
-HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/"
-
-LICENSE="BSD"
-SLOT="0"
-
-PATCHES=(
- "${FILESDIR}/${P}-fix-relative-includes.patch"
- "${FILESDIR}/${PN}-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch"
- )
-
-RDEPEND="!<media-libs/shaderc-2019-r1"
-BDEPEND="${PYTHON_DEPS}"
-
-# Bug 698850
-RESTRICT="test"
diff --git a/dev-util/glslang/glslang-8.13.3559.ebuild b/dev-util/glslang/glslang-8.13.3559.ebuild
deleted file mode 100644
index 1f9306e1eafe..000000000000
--- a/dev-util/glslang/glslang-8.13.3559.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
-HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang"
-
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND="!<media-libs/shaderc-2019-r1"
-BDEPEND="${PYTHON_DEPS}"
-
-# Bug 698850
-RESTRICT="test"
diff --git a/dev-util/glslang/glslang-8.13.3743-r1.ebuild b/dev-util/glslang/glslang-8.13.3743-r1.ebuild
deleted file mode 100644
index 13bc3c342613..000000000000
--- a/dev-util/glslang/glslang-8.13.3743-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git"
- inherit git-r3
-else
- SNAPSHOT_COMMIT="${PV}"
- SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
- S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
-fi
-
-DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
-HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang"
-
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND="!<media-libs/shaderc-2020.1"
-BDEPEND="${PYTHON_DEPS}"
-
-# Bug 698850
-RESTRICT="test"
diff --git a/dev-util/gob/gob-2.0.20.ebuild b/dev-util/gob/gob-2.0.20.ebuild
index 4a1b143cee87..1e11184047df 100644
--- a/dev-util/gob/gob-2.0.20.ebuild
+++ b/dev-util/gob/gob-2.0.20.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.jirka.org/gob.html"
LICENSE="GPL-2+"
SLOT="2"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ppc ~ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ppc ~ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
RDEPEND=">=dev-libs/glib-2.4:2"
diff --git a/dev-util/goland/Manifest b/dev-util/goland/Manifest
index ce8bcc8f213e..8faa0d3d5dbb 100644
--- a/dev-util/goland/Manifest
+++ b/dev-util/goland/Manifest
@@ -1,3 +1 @@
DIST goland-2020.3.tar.gz 484825433 BLAKE2B d3991ca6fdbbe0556ac99f65f5714a9e7b4904782a66904161d6a408ab816b2a44ea2282e51a41e71c827011da099f09e1087c259c42c8cca4e766da4cae0164 SHA512 47d5e91e17a4b3515fb72e9331bf63d69aec36d207822f20e99079d12de0351d8a9d3eca2f201a8a29bfcdc14c2f88015542f94c30be29921d4e12f0db4901f5
-EBUILD goland-2020.3.ebuild 1418 BLAKE2B 6da9cdb952152eea5833b3ae84a5cb77790c52c032c20fa763b8c9d33cb17ff40b7f630505bad2995b5ad1a8c0584bfcdaf1c24b8210022cdef0d26be3e98840 SHA512 cb892b7c5a9aa6c0060836d377d3a5000e65e5788c0501866b3f5a7a75278c6cefd8cacc53bb8cb3b3303a709d78f474f2594b82a10913438382c08a8985cf57
-EBUILD goland-9999.ebuild 1418 BLAKE2B 6da9cdb952152eea5833b3ae84a5cb77790c52c032c20fa763b8c9d33cb17ff40b7f630505bad2995b5ad1a8c0584bfcdaf1c24b8210022cdef0d26be3e98840 SHA512 cb892b7c5a9aa6c0060836d377d3a5000e65e5788c0501866b3f5a7a75278c6cefd8cacc53bb8cb3b3303a709d78f474f2594b82a10913438382c08a8985cf57
diff --git a/dev-util/goland/goland-2020.3.ebuild b/dev-util/goland/goland-2020.3.ebuild
index 09527a08e1a2..d487b813e0a4 100644
--- a/dev-util/goland/goland-2020.3.ebuild
+++ b/dev-util/goland/goland-2020.3.ebuild
@@ -1,68 +1,89 @@
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit gnome2-utils xdg
+inherit desktop eutils
-DESCRIPTION="Capable and ergonomic Go IDE"
-HOMEPAGE="https://www.jetbrains.com/goland"
-LICENSE="JetBrains"
+SLOT=0
-SLOT="0"
+SRC_URI="https://download.jetbrains.com/go/${P}.tar.gz"
+DESCRIPTION="Golang IDE by JetBrains"
+HOMEPAGE="https://www.jetbrains.com/go"
-BDEPEND="
- app-arch/tar
-"
+# JetBrains supports officially only x86_64 even though some 32bit binaries are
+# provided. See https://www.jetbrains.com/go/download/#section=linux
+KEYWORDS="~amd64"
-RDEPEND="
- dev-lang/go
- virtual/jdk
+LICENSE="|| ( JetBrains-business JetBrains-classroom JetBrains-educational JetBrains-individual )
+ Apache-2.0
+ BSD
+ CC0-1.0
+ CDDL
+ CDDL-1.1
+ EPL-1.0
+ GPL-2
+ GPL-2-with-classpath-exception
+ ISC
+ LGPL-2.1
+ LGPL-3
+ MIT
+ MPL-1.1
+ OFL
+ ZLIB
"
-RESTRICT="bindist mirror strip"
+RESTRICT="bindist mirror"
-S="${WORKDIR}/${PN}-${PV}"
+QA_PREBUILT="opt/${P}/*"
-if [[ ${PV} != 9999 ]]; then
- SRC_URI="https://download.jetbrains.com/go/${PN}-${PV}.tar.gz"
- KEYWORDS="*"
-fi
-
-src_unpack() {
- default
- mv "${WORKDIR}"/Go* "${S}" || die "Failed to move/rename source dir"
-}
+S="${WORKDIR}/GoLand-${PV}"
-src_prepare() {
- default
-
- # Remove any bundled Java
- rm -rf {jbr,jre{64}} || die "Failed to remove bundled Java"
-}
+RDEPEND="
+ virtual/jdk
+ dev-lang/go
+"
src_install() {
+ local dir="/opt/${P}"
- insinto "/opt/${PN}"
+ insinto "${dir}"
doins -r *
+ fperms 755 "${dir}"/bin/{${PN}.sh,fsnotifier64}
+ fperms 755 "${dir}"/jbr/bin/{jaotc,java,javac,jdb,jfr,jhsdb,jjs,jrunscript,keytool,pack200,rmid,rmiregistry,serialver,unpack200}
+ fperms 755 "${dir}"/plugins/go/lib/dlv/linux/dlv
- fperms 755 /opt/${PN}/bin/{format.sh,goland.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
-
- dosym ../../opt/${PN}/bin/goland.sh /usr/bin/${PN}
-
+ make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
newicon "bin/${PN}.png" "${PN}.png"
- make_desktop_entry "${PN}" "GoLand" "${PN}" "Development;Programming;IDE;"
-
- # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
- mkdir -p "${D}/etc/sysctl.d/" || die
- echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+ make_desktop_entry "${PN}" "gogland" "${PN}" "Development;IDE;"
}
pkg_postinst() {
- xdg_pkg_postinst
- gnome2_icon_cache_update
-}
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ # This is a new installation, so:
+ echo
+ elog "It is strongly recommended to increase the inotify watch limit"
+ elog "to at least 524288. You can achieve this e.g. by calling"
+ elog "echo \"fs.inotify.max_user_watches = 524288\" > /etc/sysctl.d/30-idea-inotify-watches.conf"
+ elog "and reloading with \"sysctl --system\" (and restarting the IDE)."
+ elog "For details see:"
+ elog " https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit"
+ fi
+
+ local replacing_version
+ for replacing_version in ${REPLACING_VERSIONS} ; do
+ if ver_test "${replacing_version}" -lt "2019.3-r1"; then
+ # This revbump requires user interaction.
+ echo
+ ewarn "Previous versions configured fs.inotify.max_user_watches without user interaction."
+ ewarn "Since version 2019.3-r1 you need to do so manually, e.g. by calling"
+ ewarn "echo \"fs.inotify.max_user_watches = 524288\" > /etc/sysctl.d/30-idea-inotify-watches.conf"
+ ewarn "and reloading with \"sysctl --system\" (and restarting the IDE)."
+ ewarn "For details see:"
+ ewarn " https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit"
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_icon_cache_update
+ # Show this ewarn only once
+ break
+ fi
+ done
}
diff --git a/dev-util/goland/goland-9999.ebuild b/dev-util/goland/goland-9999.ebuild
deleted file mode 100644
index 09527a08e1a2..000000000000
--- a/dev-util/goland/goland-9999.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg
-
-DESCRIPTION="Capable and ergonomic Go IDE"
-HOMEPAGE="https://www.jetbrains.com/goland"
-LICENSE="JetBrains"
-
-SLOT="0"
-
-BDEPEND="
- app-arch/tar
-"
-
-RDEPEND="
- dev-lang/go
- virtual/jdk
-"
-
-RESTRICT="bindist mirror strip"
-
-S="${WORKDIR}/${PN}-${PV}"
-
-if [[ ${PV} != 9999 ]]; then
- SRC_URI="https://download.jetbrains.com/go/${PN}-${PV}.tar.gz"
- KEYWORDS="*"
-fi
-
-src_unpack() {
- default
- mv "${WORKDIR}"/Go* "${S}" || die "Failed to move/rename source dir"
-}
-
-src_prepare() {
- default
-
- # Remove any bundled Java
- rm -rf {jbr,jre{64}} || die "Failed to remove bundled Java"
-}
-
-src_install() {
-
- insinto "/opt/${PN}"
- doins -r *
-
- fperms 755 /opt/${PN}/bin/{format.sh,goland.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
-
- dosym ../../opt/${PN}/bin/goland.sh /usr/bin/${PN}
-
- newicon "bin/${PN}.png" "${PN}.png"
- make_desktop_entry "${PN}" "GoLand" "${PN}" "Development;Programming;IDE;"
-
- # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
- mkdir -p "${D}/etc/sysctl.d/" || die
- echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_icon_cache_update
-}
diff --git a/dev-util/goland/metadata.xml b/dev-util/goland/metadata.xml
new file mode 100644
index 000000000000..dc8c32812e06
--- /dev/null
+++ b/dev-util/goland/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>zx2c4@gentoo.org</email>
+<name>Jason A. Donenfeld</name>
+</maintainer>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-util/gosec/Manifest b/dev-util/gosec/Manifest
index a0ef712c5d65..95c07906a740 100644
--- a/dev-util/gosec/Manifest
+++ b/dev-util/gosec/Manifest
@@ -1,4 +1,11 @@
DIST github.com-go-yaml-yaml-53403b5.tar.gz 72861 BLAKE2B 919445f18a0219550b77904f4ee13c44a809d9a38a02156a1846e97628333d8078c2d1526fb00003810f6445a83e0f1b44df907d35323f2eab66b67fd2cf2d70 SHA512 3f4c94a0aa4c185cdb80835d8624b3e97ac0b8c25cd08e7ba7070649513ba3e2332176d8adf7dccbde8944ac6980ff82b4da7343d00570227f5d3d87c2862b0b
+DIST github.com-go-yaml-yaml-7649d45.tar.gz 73353 BLAKE2B 9209b11394969b5221228358dce0dde675b9c059e02fe8ffc04d233a0f5e25e230dbbe57a47bcc9dee97d48c30b6530003023b68bc115145fea0cdcaea19e9b2 SHA512 2b7b0bd23eda5cd0a61a99b80bdc117bc0ee6630a3432ea7b35c5caad76a7c06f695d20f5c4572b5ad4d29c08684aa9d1957aa252c9f47a7068af97681dbad39
+DIST github.com-golang-mod-3bfbaad.tar.gz 102305 BLAKE2B 7d926fd4d878d6e48e0b6bf98d70241c58f377edbea149064a4d84ee68fba0aa95164f1004a8f2fe729b2703b21407c47613fe22dc24dac078d8074bbf43d95a SHA512 85a5b2a63e7b171a4f4234820f389e61671144c59ea271a4f19632eb9c3fab245fa8d861963890b568d56274ab22a0572747975d6efceade3e98469e00672a96
+DIST github.com-golang-tools-1eed487.tar.gz 2656602 BLAKE2B 06b726de1d1a749ab6e5b3a075474eacb1eb87f197df365358cae7b299801b368b976258ea7a4a43e8ac66a84083df23325512b22a8ef7655a689101ec101f49 SHA512 6239bf1fb704357b518bf19e86247b3f432400c315c7d65329e757913435da52c68721d82408f455071d750d727883106066084c9835a19f5d04c5535e204bd7
DIST github.com-golang-tools-23e62d3.tar.gz 2367133 BLAKE2B 2995fc5582197d63f30fcdd9a21758b7641de849cbc32acaa831016571b1c8806ff8b3eb188e9e8a7a053c603ac0e28ff4dd95b369d4ffa5d2b4fcca79a12a36 SHA512 97613acf95e0d2121843ecb197e9e5a2914d344778770cd792e210096a64bfd3a7e3ffac61ea858040ef430c71329d9afc1427bdf3131e1e284a6630b3937b5d
+DIST github.com-golang-xerrors-5ec99f8.tar.gz 13669 BLAKE2B 8f682918ad53b3849b8304b759066bdb34b48edee67a6d7e940ce26636936b50637357441b87b836196cb2c409cf84fdcb4dab2140f5fb2a3cab27d456d28131 SHA512 d781374ccf578bd5337515ec9d0ee9b85a9169823b8ac464524c8712aef6c8faaaf6a649b3f64b18cf4b6db657501031e7299def1dff9c435f033ca2f79d6efb
+DIST github.com-gookit-color-1ffb695.tar.gz 2135107 BLAKE2B 3cd42a166eb4945b093a2e8c8827fee6ab4e9e027b9840561a3b8df5bd19445ec79b8e5eb22d4722feb732f3d03bb80f71c62c82074f9d7bd6571ef8446d2a73 SHA512 e112bd636ead10a38c7a99709852a6473b17b2a9de33ccc5bc439ca11f0f919c01233d91c0c8bedd9a641f14f4a6706a07fdda2558190c7bee48af52d645d684
DIST github.com-nbutton23-zxcvbn-go-ae427f1.tar.gz 980120 BLAKE2B 53f16a722403baedb4f72e0bf081e2c350df289fe84ea60d9b71dfc914fb0fb93588970c77006d687e3ed0708aa0545e22736d80e2bd370158d74b4d7091a1ae SHA512 b1de4ac3c8e29f5f03652367db3052aee015ade3ebbb3f1b63a4efc10eefb5119cba24c5a57d2a7078e6df46f02fb4f32991335643d23c167fe292b6f077c7ba
+DIST github.com-nbutton23-zxcvbn-go-eafdab6.tar.gz 969223 BLAKE2B afb33486f4cbbe9a0f2ebc28a587683c4a4ff98d159b5c95e7442f4fad11c01265e1b4758ad594a33a78d98fb001cdfdbfaae4f96372611905863533167549e0 SHA512 ed7394cfa5416fede82867fd3f80f7effc54984d56bfd858c465aa2b39d02e65e6bbf916137dc11943e7625e1fd6e29ac822d45649fe028d71adc4bc995d5a80
DIST gosec-2.2.0.tar.gz 72711 BLAKE2B aea1b23e508e090ff7cabb1e113b4b397de8fffd1bb312585866315785fe40e92cd4db58d364959a48c590be2f9bc7f27fb868ba74bc57a15858c13124c9ec4b SHA512 94d734e6dd7ee12771b6e4121ab2cb27337cc5ab5c7ad811f9d81c21bc8c2c14243baba52cbdc363c114b86288daa546dfa82f43257559de8ba0d9ef98fca610
+DIST gosec-2.5.0.tar.gz 81369 BLAKE2B a266eb6e3d60c0efa63f343c2c3196e163f5a4094a7fc3db3b671d16f4f5e4e852864558751c9241fe2f4f86739fdf1aa831505d0e459c9b989e6492a797b1d5 SHA512 2f1946f87b442530af4a343b26224d183af0649b6b23edd98c4f0536cec30410d1bfae0b231853b07fbd876757a954dd41c6345b7ce17ef570cb06cd8fb67b2b
diff --git a/dev-util/gosec/gosec-2.5.0.ebuild b/dev-util/gosec/gosec-2.5.0.ebuild
new file mode 100644
index 000000000000..b0402ed914eb
--- /dev/null
+++ b/dev-util/gosec/gosec-2.5.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2020 Liguros Authors
+# Distributed under the terms of the GNU General Public License v2
+EAPI=7
+
+GOLANG_PKG_IMPORTPATH="github.com/securego"
+GOLANG_PKG_ARCHIVEPREFIX="v"
+GOLANG_PKG_BUILDPATH="/cmd/${PN}"
+GOLANG_PKG_LDFLAGS="-X main.Version=${PV} -X main.GitTag=${PV}"
+
+GOLANG_PKG_DEPENDENCIES=(
+ "github.com/nbutton23/zxcvbn-go:eafdab6" #v0.1
+ "github.com/golang/tools:1eed487 -> golang.org/x" #v0.6.1
+ "github.com/go-yaml/yaml:7649d45 -> gopkg.in/yaml.v2" #v2.4.0
+ "github.com/gookit/color:1ffb695" #v1.3.6
+ "github.com/golang/mod:3bfbaad -> golang.org/x" #v0.4.0
+ "github.com/golang/xerrors:5ec99f8 -> golang.org/x"
+)
+
+inherit golang-single
+
+DESCRIPTION="Inspects golang source code for security problems"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+
+pkg_setup() {
+ GOLANG_PKG_LDFLAGS+=" -X main.BuildDate=$( date +%F )"
+}
diff --git a/dev-util/gperf/gperf-3.1.ebuild b/dev-util/gperf/gperf-3.1.ebuild
index 563152cbc215..a190132ca4d5 100644
--- a/dev-util/gperf/gperf-3.1.ebuild
+++ b/dev-util/gperf/gperf-3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gperf/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
src_prepare() {
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32-r1.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32-r1.ebuild
index 806371020772..9fbccdc79c5b 100644
--- a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32-r1.ebuild
+++ b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.gtk.org/"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
COMMON_DEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild
index 10c4538abc8a..11d4c9b7e440 100644
--- a/dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild
+++ b/dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtk.org/gtk-doc/"
LICENSE="GPL-2 FDL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND=""
DEPEND="${RDEPEND}
diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.33.1.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.33.1.ebuild
index 04df1f0818c7..718c3f4fd20b 100644
--- a/dev-util/gtk-doc-am/gtk-doc-am-1.33.1.ebuild
+++ b/dev-util/gtk-doc-am/gtk-doc-am-1.33.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/DocumentationProject/GtkDoc"
LICENSE="GPL-2 FDL-1.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="!<dev-util/gtk-doc-${GNOME_ORG_PVP}"
PDEPEND="virtual/pkgconfig"
diff --git a/dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild b/dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild
index bae84dcaf82e..9c29ab412759 100644
--- a/dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtk.org/gtk-doc/"
LICENSE="GPL-2 FDL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
IUSE="debug doc emacs"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild b/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild
index 3469678c7999..a5ebf795607c 100644
--- a/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtk.org/gtk-doc/"
LICENSE="GPL-2 FDL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
IUSE="debug doc emacs"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/gtk-doc/gtk-doc-1.33.1-r3.ebuild b/dev-util/gtk-doc/gtk-doc-1.33.1-r3.ebuild
index 66ecd1e7b2fd..6f4c26fef21e 100644
--- a/dev-util/gtk-doc/gtk-doc-1.33.1-r3.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.33.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/DocumentationProject/GtkDoc"
LICENSE="GPL-2 FDL-1.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
IUSE="doc emacs test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.20.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.20.ebuild
index f83602ea880d..e76f297c4a5e 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.20.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+"
SLOT="0"
IUSE=""
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# man page was previously installed by gtk+:3 ebuild
RDEPEND="
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.21.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.21.ebuild
index 74deb5dcb08f..da8468021f13 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.21.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv 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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# man page was previously installed by gtk+:3 ebuild
RDEPEND="
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.24.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.24.ebuild
index 8e95d63ee896..e69d4d6239b5 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.24.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# man page was previously installed by gtk+:3 ebuild
RDEPEND="
diff --git a/dev-util/hermes/hermes-2.8.ebuild b/dev-util/hermes/hermes-2.8.ebuild
index a6b7694d1f6a..4c9b1e1ffdd9 100644
--- a/dev-util/hermes/hermes-2.8.ebuild
+++ b/dev-util/hermes/hermes-2.8.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-LUA_COMPAT=( lua5-{1..3} )
+LUA_COMPAT=( lua5-{1..4} luajit )
inherit lua-single
DESCRIPTION="Lua based testing manager"
diff --git a/dev-util/hfstospell/hfstospell-0.5.2-r1.ebuild b/dev-util/hfstospell/hfstospell-0.5.2-r1.ebuild
new file mode 100644
index 000000000000..3b6cb8750ad9
--- /dev/null
+++ b/dev-util/hfstospell/hfstospell-0.5.2-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="HFST spell checker library and command line tool"
+HOMEPAGE="https://github.com/hfst/hfst-ospell"
+SRC_URI="https://github.com/hfst/hfst-ospell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="clang"
+
+DEPEND="app-arch/libarchive
+ dev-libs/icu:=
+ !clang? (
+ dev-cpp/libxmlpp:2.6
+ dev-libs/tinyxml2
+ )"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/hfst-ospell-${PV}"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ # https://github.com/hfst/hfst-ospell/issues/48
+ if tc-is-clang; then
+ econf --without-libxmlpp --without-tinyxml2
+ else
+ default
+ fi
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -delete -o -name '*.a' -delete || die
+}
diff --git a/dev-util/hfstospell/metadata.xml b/dev-util/hfstospell/metadata.xml
index 54a516b9c74d..b8649249754b 100644
--- a/dev-util/hfstospell/metadata.xml
+++ b/dev-util/hfstospell/metadata.xml
@@ -5,5 +5,8 @@
<email>juippis@gentoo.org</email>
<name>Joonas Niilola</name>
</maintainer>
+ <use>
+ <flag name="clang">Use different logic in ebuild when clang is used</flag>
+ </use>
<origin>gentoo-staging</origin>
</pkgmetadata>
diff --git a/dev-util/hip/Manifest b/dev-util/hip/Manifest
new file mode 100644
index 000000000000..5081a96f35a6
--- /dev/null
+++ b/dev-util/hip/Manifest
@@ -0,0 +1 @@
+DIST rocm-hip-4.0.0.tar.gz 1012154 BLAKE2B 02343239a5b27c42dafd241f2c9b6f5195c50f78bfd717ae72bcb16d384bd6cf97ff6f2b86bfcf323aaaf022d6897f46d0987826c80d6f6279be4cb4792e15be SHA512 cf840dbe28a9a15e3be14351bfa22d3c81e1654813a7aee55f53e71b2ee183f8dd0de14a79791617fabb5b357cadbf2ce2f476f78884b2843d30f206d65088f6
diff --git a/dev-util/hip/files/hip-3.5.1-config-cmake-in.patch b/dev-util/hip/files/hip-3.5.1-config-cmake-in.patch
new file mode 100644
index 000000000000..f3b5ac9c19ef
--- /dev/null
+++ b/dev-util/hip/files/hip-3.5.1-config-cmake-in.patch
@@ -0,0 +1,28 @@
+--- a/hip-config.cmake.in 2020-06-21 21:17:35.576297760 +0200
++++ b/hip-config.cmake.in 2020-06-21 21:17:59.861296628 +0200
+@@ -123,8 +123,10 @@
+ )
+ set_target_properties(hip::device PROPERTIES
+ INTERFACE_COMPILE_DEFINITIONS "__HIP_ROCclr__=1"
+- INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/../include"
+- INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/../include"
++ INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
++ INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
++# INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/../include"
++# INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/../include"
+ )
+ else()
+ set_target_properties(hip::hip_hcc_static PROPERTIES
+@@ -156,9 +158,9 @@
+ INTERFACE_LINK_LIBRARIES --hip-device-lib-path=${AMD_DEVICE_LIBS_PREFIX}/lib --hip-link
+ )
+
+- set_property(TARGET hip::device APPEND PROPERTY
+- INTERFACE_INCLUDE_DIRECTORIES "${HIP_CLANG_INCLUDE_PATH}/.."
+- )
++# set_property(TARGET hip::device APPEND PROPERTY
++# INTERFACE_INCLUDE_DIRECTORIES "${HIP_CLANG_INCLUDE_PATH}/.."
++# )
+
+ set_property(TARGET hip::device APPEND PROPERTY
+ INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${HIP_CLANG_INCLUDE_PATH}/.."
diff --git a/dev-util/hip/files/hip-3.5.1-detect_offload-arch_for_clang-roc.patch b/dev-util/hip/files/hip-3.5.1-detect_offload-arch_for_clang-roc.patch
new file mode 100644
index 000000000000..7997e2929666
--- /dev/null
+++ b/dev-util/hip/files/hip-3.5.1-detect_offload-arch_for_clang-roc.patch
@@ -0,0 +1,21 @@
+diff -uprN HIP-rocm-3.5.1/bin/hipcc patched/bin/hipcc
+--- HIP-rocm-3.5.1/bin/hipcc 2020-07-21 14:29:11.625878447 +0800
++++ patched/bin/hipcc 2020-07-21 14:34:11.454395203 +0800
+@@ -675,7 +675,7 @@ foreach $arg (@ARGV)
+ $prevArg = $arg;
+ }
+
+-if($HIP_PLATFORM eq "hcc"){
++if($HIP_PLATFORM eq "hcc" || $HIP_PLATFORM eq "rocclr"){
+ # No AMDGPU target specified at commandline. So look for HCC_AMDGPU_TARGET
+ if($default_amdgpu_target eq 1) {
+ if (defined $ENV{HCC_AMDGPU_TARGET}) {
+@@ -694,6 +694,8 @@ if($HIP_PLATFORM eq "hcc"){
+
+ if($HIP_COMPILER eq "hcc") {
+ $GPU_ARCH_OPT = " --amdgpu-target=";
++ } elsif($HIP_COMPILER eq "clang") {
++ $GPU_ARCH_OPT = " --offload-arch=";
+ } else {
+ $GPU_ARCH_OPT = " --cuda-gpu-arch=";
+ }
diff --git a/dev-util/hip/files/hip-3.5.1-hip_vector_types.patch b/dev-util/hip/files/hip-3.5.1-hip_vector_types.patch
new file mode 100644
index 000000000000..382ed52f6923
--- /dev/null
+++ b/dev-util/hip/files/hip-3.5.1-hip_vector_types.patch
@@ -0,0 +1,10 @@
+--- a/include/hip/hcc_detail/hip_vector_types.h
++++ b/include/hip/hcc_detail/hip_vector_types.h
+@@ -42,6 +42,7 @@
+ #endif
+
+ #if defined(__cplusplus)
++ #include <new>
+ #include <array>
+ #include <iosfwd>
+ #include <type_traits>
diff --git a/dev-util/hip/files/hip-3.9.0-DisableTest.patch b/dev-util/hip/files/hip-3.9.0-DisableTest.patch
new file mode 100644
index 000000000000..3fc787a7354e
--- /dev/null
+++ b/dev-util/hip/files/hip-3.9.0-DisableTest.patch
@@ -0,0 +1,87 @@
+--- a/CMakeLists.txt 2020-11-15 11:26:09.747793881 +0100
++++ b/CMakeLists.txt 2020-11-15 11:28:45.289793287 +0100
+@@ -676,45 +676,45 @@
+ # Target: test
+ set(HIP_ROOT_DIR ${CMAKE_CURRENT_BINARY_DIR})
+ set(HIP_SRC_PATH ${CMAKE_CURRENT_SOURCE_DIR})
+-if(HIP_PLATFORM STREQUAL "nvcc")
+- execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/include" "${CMAKE_CURRENT_BINARY_DIR}/include" RESULT_VARIABLE RUN_HIT ERROR_QUIET)
+-endif()
+-execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/cmake" "${HIP_ROOT_DIR}/cmake" RESULT_VARIABLE RUN_HIT ERROR_QUIET)
+-if(${RUN_HIT} EQUAL 0)
+- execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/bin" "${HIP_ROOT_DIR}/bin" RESULT_VARIABLE RUN_HIT ERROR_QUIET)
+-endif()
+-if(${RUN_HIT} EQUAL 0)
+- set(CMAKE_MODULE_PATH "${HIP_ROOT_DIR}/cmake" ${CMAKE_MODULE_PATH})
+- include(${HIP_SRC_PATH}/tests/hit/HIT.cmake)
+-
+- # Add tests
+- include_directories(${HIP_SRC_PATH}/tests/src)
+- hit_add_directory_recursive(${HIP_CTEST_CONFIG_DEFAULT} ${HIP_SRC_PATH}/tests/src "directed_tests")
+-
+- # Add unit tests
+- include_directories(${HIP_SRC_PATH}/tests/unit)
+- hit_add_directory_recursive(${HIP_CTEST_CONFIG_DEFAULT} ${HIP_SRC_PATH}/tests/unit "unit_tests")
+-
+- # Add performance tests
+- include_directories(${HIP_SRC_PATH}/tests/performance)
+- hit_add_directory_recursive(${HIP_CTEST_CONFIG_PERFORMANCE} ${HIP_SRC_PATH}/tests/performance "performance_tests")
+-
+- # Add top-level tests to build_tests
+- add_custom_target(build_tests DEPENDS directed_tests unit_tests)
+-
+- # Add top-level tests to build performance_tests.
+- # To build performance tests, just run "make build_perf"
+- add_custom_target(build_perf DEPENDS performance_tests)
+-
+- # Add custom target: perf.
+- # To run performance tests, just run "make perf"
+- add_custom_target(perf COMMAND "${CMAKE_CTEST_COMMAND}" -C "${HIP_CTEST_CONFIG_PERFORMANCE}" -R "performance_tests/" --verbose)
+-
+- # Add custom target: check
+- add_custom_target(check COMMAND "${CMAKE_COMMAND}" --build . --target test DEPENDS build_tests)
+-else()
+- message(STATUS "Testing targets will not be available. To enable them please ensure that the HIP installation directory is writeable. Use -DCMAKE_INSTALL_PREFIX to specify a suitable location")
+-endif()
++#if(HIP_PLATFORM STREQUAL "nvcc")
++# execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/include" "${CMAKE_CURRENT_BINARY_DIR}/include" RESULT_VARIABLE RUN_HIT ERROR_QUIET)
++#endif()
++#execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/cmake" "${HIP_ROOT_DIR}/cmake" RESULT_VARIABLE RUN_HIT ERROR_QUIET)
++#if(${RUN_HIT} EQUAL 0)
++# execute_process(COMMAND "${CMAKE_COMMAND}" -E copy_directory "${HIP_SRC_PATH}/bin" "${HIP_ROOT_DIR}/bin" RESULT_VARIABLE RUN_HIT ERROR_QUIET)
++#endif()
++#if(${RUN_HIT} EQUAL 0)
++# set(CMAKE_MODULE_PATH "${HIP_ROOT_DIR}/cmake" ${CMAKE_MODULE_PATH})
++# include(${HIP_SRC_PATH}/tests/hit/HIT.cmake)
++#
++# # Add tests
++# include_directories(${HIP_SRC_PATH}/tests/src)
++# hit_add_directory_recursive(${HIP_CTEST_CONFIG_DEFAULT} ${HIP_SRC_PATH}/tests/src "directed_tests")
++#
++# # Add unit tests
++# include_directories(${HIP_SRC_PATH}/tests/unit)
++# hit_add_directory_recursive(${HIP_CTEST_CONFIG_DEFAULT} ${HIP_SRC_PATH}/tests/unit "unit_tests")
++#
++# # Add performance tests
++# include_directories(${HIP_SRC_PATH}/tests/performance)
++# hit_add_directory_recursive(${HIP_CTEST_CONFIG_PERFORMANCE} ${HIP_SRC_PATH}/tests/performance "performance_tests")
++#
++# # Add top-level tests to build_tests
++# add_custom_target(build_tests DEPENDS directed_tests unit_tests)
++#
++# # Add top-level tests to build performance_tests.
++# # To build performance tests, just run "make build_perf"
++# add_custom_target(build_perf DEPENDS performance_tests)
++#
++# # Add custom target: perf.
++# # To run performance tests, just run "make perf"
++# add_custom_target(perf COMMAND "${CMAKE_CTEST_COMMAND}" -C "${HIP_CTEST_CONFIG_PERFORMANCE}" -R "performance_tests/" --verbose)
++#
++# # Add custom target: check
++# add_custom_target(check COMMAND "${CMAKE_COMMAND}" --build . --target test DEPENDS build_tests)
++#else()
++# message(STATUS "Testing targets will not be available. To enable them please ensure that the HIP installation directory is writeable. Use -DCMAKE_INSTALL_PREFIX to specify a suitable location")
++#endif()
+
+ #############################
+ # Code analysis
diff --git a/dev-util/hip/files/hip-3.9.0-add-include-directories.patch b/dev-util/hip/files/hip-3.9.0-add-include-directories.patch
new file mode 100644
index 000000000000..42bd9736ee2c
--- /dev/null
+++ b/dev-util/hip/files/hip-3.9.0-add-include-directories.patch
@@ -0,0 +1,13 @@
+--- a/rocclr/CMakeLists.txt 2020-08-23 11:45:13.148817894 +0200
++++ b/rocclr/CMakeLists.txt 2020-08-23 11:50:12.409816752 +0200
+@@ -139,6 +139,10 @@
+ target_compile_definitions(hip64
+ PRIVATE
+ $<TARGET_PROPERTY:amdrocclr_static,INTERFACE_COMPILE_DEFINITIONS>)
++
++ include_directories(/usr/include/rocclr)
++ include_directories(/usr/include/rocclr/elf)
++ include_directories(/usr/include/rocclr/compiler/lib/include/)
+ endif()
+
+ # Enable profiling API
diff --git a/dev-util/hip/files/hip-3.9.0-lpl_ca-add-include.patch b/dev-util/hip/files/hip-3.9.0-lpl_ca-add-include.patch
new file mode 100644
index 000000000000..bebe6f0f4ecc
--- /dev/null
+++ b/dev-util/hip/files/hip-3.9.0-lpl_ca-add-include.patch
@@ -0,0 +1,10 @@
+--- a/lpl_ca/CMakeLists.txt 2020-11-15 11:47:55.091788901 +0100
++++ b/lpl_ca/CMakeLists.txt 2020-11-15 11:49:14.881788597 +0100
+@@ -17,6 +17,7 @@
+ ${PROJECT_SOURCE_DIR}/src
+ PRIVATE
+ $<TARGET_PROPERTY:amdrocclr_static,INTERFACE_INCLUDE_DIRECTORIES>)
++target_include_directories(lpl SYSTEM PUBLIC /usr/include/rocclr/elf)
+
+ target_compile_options(lpl PUBLIC -Wall)
+ target_link_libraries(lpl PUBLIC pthread)
diff --git a/dev-util/hip/hip-4.0.0.ebuild b/dev-util/hip/hip-4.0.0.ebuild
new file mode 100644
index 000000000000..ae96dbdc84e7
--- /dev/null
+++ b/dev-util/hip/hip-4.0.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake flag-o-matic prefix
+
+DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability"
+HOMEPAGE="https://github.com/ROCm-Developer-Tools/HIP"
+SRC_URI="https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-${PV}.tar.gz -> rocm-hip-${PV}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+IUSE="debug profile"
+
+# Don't strip to prevent some tests from failing.
+RESTRICT="strip"
+
+DEPEND=">=dev-libs/rocclr-$(ver_cut 1-2)
+ >=dev-util/rocminfo-$(ver_cut 1-2)
+ =sys-devel/llvm-roc-${PV}*[runtime]"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.9.0-DisableTest.patch"
+ "${FILESDIR}/${PN}-3.9.0-add-include-directories.patch"
+ "${FILESDIR}/${PN}-3.5.1-config-cmake-in.patch"
+ "${FILESDIR}/${PN}-3.5.1-hip_vector_types.patch"
+ "${FILESDIR}/${PN}-3.5.1-detect_offload-arch_for_clang-roc.patch"
+ "${FILESDIR}/${PN}-3.9.0-lpl_ca-add-include.patch"
+)
+
+S="${WORKDIR}/HIP-rocm-${PV}"
+
+src_prepare() {
+ cmake_src_prepare
+ eapply_user
+
+ # disable PCH, because it results in a build error in ROCm 4.0.0
+ sed -e "s:option(__HIP_ENABLE_PCH:#option(__HIP_ENABLE_PCH:" -i "${S}/CMakeLists.txt" || die
+
+ # "hcc" is deprecated and not installed, new platform is "rocclr";
+ # Due to setting HAS_PATH to "/usr", this results in setting "-isystem /usr/include"
+ # which results in a e.g. "stdlib.h" not found when using "#include_next" in header files;
+ sed -e "s:\$HIP_PLATFORM eq \"hcc\" and \$HIP_COMPILER eq \"clang\":\$HIP_PLATFORM eq \"rocclr\" and \$HIP_COMPILER eq \"clang\":" \
+ -e "/FLAGS .= \" -isystem \$HSA_PATH/d" \
+ -e "s:\$ENV{'DEVICE_LIB_PATH'}:'/usr/lib/amdgcn/bitcode':" \
+ -i bin/hipcc || die
+
+ # change --hip-device-lib-path to "/usr/lib/amdgcn/bitcode", must align with "dev-libs/rocm-device-libs"
+ sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:/usr/lib/amdgcn/bitcode:" \
+ -i "${S}/hip-config.cmake.in" || die
+
+ einfo "prefixing hipcc and its utils..."
+ hprefixify $(grep -rl --exclude-dir=build/ "/usr" "${S}")
+}
+
+src_configure() {
+ strip-flags
+ if ! use debug; then
+ append-cflags "-DNDEBUG"
+ append-cxxflags "-DNDEBUG"
+ buildtype="Release"
+ else
+ buildtype="Debug"
+ fi
+
+ # TODO: Currently a GENTOO configuration is build,
+ # this is also used in the cmake configuration files
+ # which will be installed to find HIP;
+ # Other ROCm packages expect a "RELEASE" configuration,
+ # see "hipBLAS"
+ local mycmakeargs=(
+ -DCMAKE_PREFIX_PATH="${EPREFIX}/usr/lib/llvm/roc"
+ -DCMAKE_BUILD_TYPE=${buildtype}
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/hip"
+ -DBUILD_HIPIFY_CLANG=OFF
+ -DHIP_PLATFORM=rocclr
+ -DHIP_RUNTIME=ROCclr
+ -DHIP_COMPILER=clang
+ -DROCM_PATH="${EPREFIX}/usr"
+ -DHSA_PATH="${EPREFIX}/usr"
+ -DUSE_PROF_API=$(usex profile 1 0)
+ -DROCclr_DIR="${EPREFIX}"/usr/include/rocclr
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ echo "HSA_PATH=${EPREFIX}/usr" > 99hip || die
+ echo "ROCM_PATH=${EPREFIX}/usr" >> 99hip || die
+ echo "HIP_PLATFORM=rocclr" >> 99hip || die
+ echo "HIP_RUNTIME=ROCclr" >> 99hip || die
+ echo "HIP_COMPILER=clang" >> 99hip || die
+ echo "HIP_CLANG_PATH=${EPREFIX}/usr/lib/llvm/roc/bin" >> 99hip || die
+
+ echo "PATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die
+ echo "HIP_PATH=${EPREFIX}/usr/lib/hip" >> 99hip || die
+ echo "LDPATH=${EPREFIX}/usr/lib/hip/lib" >> 99hip || die
+ echo "ROOTPATH=${EPREFIX}/usr/lib/hip/bin" >> 99hip || die
+
+ doenvd 99hip
+
+ cmake_src_install
+}
diff --git a/dev-util/hip/metadata.xml b/dev-util/hip/metadata.xml
new file mode 100644
index 000000000000..50bb038f4f1f
--- /dev/null
+++ b/dev-util/hip/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>candrews@gentoo.org</email>
+ <name>Craig Andrews</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>gentoo@holzke.net</email>
+ <name>Wilfried Holzke</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ROCm-Developer-Tools/HIP</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-util/howdoi/Manifest b/dev-util/howdoi/Manifest
index 2f6da919de79..d86f27a70a62 100644
--- a/dev-util/howdoi/Manifest
+++ b/dev-util/howdoi/Manifest
@@ -1,4 +1,2 @@
-DIST howdoi-1.2.1.tar.gz 13112 BLAKE2B 33492547fab53085aebff295202e8ad88d41850503155b944f38382137d6ec8fbcd4f6050583b16c01c3701683ccf18c6929c525b5d8f34bf6f2ed9410668f36 SHA512 83af30118087105392ddb95b05d9e7442f5ee5df981faa9143770dedb8927c164a4f30f37ccd219a826340f0f8cd81fc5eb9a3b12e5d3956786294699b6e2f9b
-DIST howdoi-2.0.5.tar.gz 23910 BLAKE2B aace040311845cd8c958d5186ea804a9b0d746694563e2acebd2dbc5630ccbeff66c8a1848245b0f4c127ca611218a0b56e4051d6991e8cd796017a8b5022c46 SHA512 5ad8a99758774c28b26afe5a5ee0f1d2fd6f8ea1afcae5f29b3a02ab3c25758b8cd8aaeccd3afd10a3d02495c6616966cad5da03327c94979e89fc3c601bd367
-DIST howdoi-2.0.6.tar.gz 25113 BLAKE2B 0b83b28d1d0a75a20e49fea0bdd0b3eebae10fee17b2ca195289b8ed014befa7bf17a3c8221dd90d0a2de166f9fab9be24619aa24c886120f2f1d2ee4afe0d84 SHA512 3153ec28f5c3c1c78b786a50da3a328586dc05f5a6fe0bcb33621baf13ae8cda55e15c3538c772dba309cd5a24f631c36c09924ff535cfc8494743b631e01fb5
DIST howdoi-2.0.7.tar.gz 25167 BLAKE2B 5923aaae6d6aaee4da7e02cd283d6e794c31d600d2834d1354e0d90194ac573d80140517ba7289bbf97b01923b6ed8c9c2ab6abe0beea0534fc41ecf24196c24 SHA512 9f8278e6ea688c40fee5227aa23375cb7dc7339d579953c73dbf7111087550ece412e26508e129f377e2326ce4635c38d96ad99f98c8c6f1131a01bbaf062275
+DIST howdoi-2.0.8.tar.gz 25366 BLAKE2B f444b600f80c60cea658781b2b1e12dbb241b6707f51f419e55099334cd45c8bfda402ada052473b2ef35ffbc77c88d33000b210fada5eb4f09b529589fe8d60 SHA512 c2a62f5e6669fcca41a706cdeec8827e39816d31d37464d061b881ed3731995163cab56322d73362863acf5064d35dc82c383db1fad78434152bd36678ec0794
diff --git a/dev-util/howdoi/howdoi-1.2.1.ebuild b/dev-util/howdoi/howdoi-1.2.1.ebuild
deleted file mode 100644
index bd101d14bd97..000000000000
--- a/dev-util/howdoi/howdoi-1.2.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="A code search tool"
-HOMEPAGE="https://pypi.org/project/howdoi/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
- dev-python/appdirs[${PYTHON_USEDEP}]
- dev-python/cachelib[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- >=dev-python/pyquery-1.4.0[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
-"
diff --git a/dev-util/howdoi/howdoi-2.0.6.ebuild b/dev-util/howdoi/howdoi-2.0.6.ebuild
deleted file mode 100644
index 3168e5bb1b2c..000000000000
--- a/dev-util/howdoi/howdoi-2.0.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="A code search tool"
-HOMEPAGE="https://pypi.org/project/howdoi/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
- dev-python/appdirs[${PYTHON_USEDEP}]
- dev-python/cachelib[${PYTHON_USEDEP}]
- dev-python/keep[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- >=dev-python/pyquery-1.4.1[${PYTHON_USEDEP}]
- >=dev-python/requests-2.24.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-util/howdoi/howdoi-2.0.5.ebuild b/dev-util/howdoi/howdoi-2.0.8.ebuild
index 3168e5bb1b2c..065bb89ead06 100644
--- a/dev-util/howdoi/howdoi-2.0.5.ebuild
+++ b/dev-util/howdoi/howdoi-2.0.8.ebuild
@@ -3,6 +3,7 @@
EAPI=7
+DISTUTILS_USE_SETUPTOOLS="manual"
PYTHON_COMPAT=( python3_{6,7,8,9,10} )
inherit distutils-r1
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index 6c63d4dc3ad3..efa611895f90 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,3 +1,2 @@
-DIST ideaIC-2020.3.tar.gz 738387806 BLAKE2B c2454441ce90fb80d965472b0859389bc2fc4bbc3ae79d022c387a14a56dc8e5c8b30ac720136fdf53d7a9b8912e6e83a07e2f880e7e1f690a2a7374789c9473 SHA512 bb85b4b4708730e04a75aa3bdbe5519a274425e23edc092dc5104966486252f53a75ed81c7c6e657c85822c50f24f1bc8453bff266051302206ec67a1bb6abf3
-EBUILD idea-community-2020.3.ebuild 1562 BLAKE2B ae143a477fe51f8d2710436ceb0ad5c74d32b9bc325b0288351dde4bae7f22a3974f9821deb811b7b7b61c1741895a96393686e3b541dae8a092d3f1af00679a SHA512 76244437043533e0ce3e788363c42c623651f7429697e55599b4ed5082c78a92053ef7a719df66150ed2cf1e3462e543aa6a052c5b4daa28ca60ff60e8605bf1
-EBUILD idea-community-9999.ebuild 1562 BLAKE2B ae143a477fe51f8d2710436ceb0ad5c74d32b9bc325b0288351dde4bae7f22a3974f9821deb811b7b7b61c1741895a96393686e3b541dae8a092d3f1af00679a SHA512 76244437043533e0ce3e788363c42c623651f7429697e55599b4ed5082c78a92053ef7a719df66150ed2cf1e3462e543aa6a052c5b4daa28ca60ff60e8605bf1
+DIST ideaIC-3.1.203.6682.168.tar.gz 577542631 BLAKE2B d47d017b76fa9106a55805b558bd49d6d45dd216ac28151f03cc2a7f3a751707b62fa49623bb04b426d90cfd1cce4e04b2490bb91ec01dfeccdf4a80f1694f7e SHA512 71849f9440c34359a23af1f4735c3b0ac6378f6ab8ddf5799ad7e26036dc87b4abbc234043bd368a7698daf91f83cf989539054db7e1fb9ea95ebf7d756ac068
+DIST jbr-11_0_8-linux-x64-b1098.1.tar.gz 191689225 BLAKE2B 0da0f0e834709c89820f2e7e1c447dc33ea1c59c7dfb573aa47bc205f7920ccf485454f79931d42d4e6eb4de1017589bb908808d6a80cc586659757abc9958d3 SHA512 a455d8bd3332622592186cd7ae3995a9148a47717a81c274497f5408f1e89ef637c7478321b4ccd5dbe97c2e246a16ac8956c5ce475f8a4156232647f0ea7737
diff --git a/dev-util/idea-community/files/idea-community-jdk.patch b/dev-util/idea-community/files/idea-community-jdk.patch
new file mode 100644
index 000000000000..b89e6773fd01
--- /dev/null
+++ b/dev-util/idea-community/files/idea-community-jdk.patch
@@ -0,0 +1,11 @@
+--- a/bin/idea.sh 2020-12-30 15:51:43.743936660 -0500
++++ b/bin/idea.sh 2020-12-30 17:58:16.759719538 -0500
+@@ -66,6 +66,8 @@ PATHS_SELECTOR="IdeaIC2020.3"
+ # shellcheck disable=SC2154
+ if [ -n "$IDEA_JDK" ] && [ -x "$IDEA_JDK/bin/java" ]; then
+ JDK="$IDEA_JDK"
++else
++ JDK="/opt/openjdk-bin-11" && [[ -d "/opt/openjdk-11" ]] && JDK="/usr/lib64/openjdk-bin-11"
+ fi
+
+ if [ -z "$JDK" ] && [ -s "${XDG_CONFIG_HOME:-$HOME/.config}/${PRODUCT_VENDOR}/${PATHS_SELECTOR}/idea.jdk" ]; then
diff --git a/dev-util/idea-community/idea-community-2020.3.1.203.6682.168.ebuild b/dev-util/idea-community/idea-community-2020.3.1.203.6682.168.ebuild
new file mode 100644
index 000000000000..bb95ab1a3858
--- /dev/null
+++ b/dev-util/idea-community/idea-community-2020.3.1.203.6682.168.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils desktop
+
+SLOT="0"
+PV_STRING="$(ver_cut 2-6)"
+MY_PV="$(ver_cut 1-3)"
+MY_PN="idea"
+# Using the most recent Jetbrains Runtime binaries available at the time of writing
+# ( jre 11.0.8 build 1098.1 )
+JRE11_BASE="11_0_8"
+JRE11_VER="1098.1"
+
+# distinguish settings for official stable releases and EAP-version releases
+if [[ "$(ver_cut 7)"x = "prex" ]]
+then
+ # upstream EAP
+ KEYWORDS="~arm64"
+ SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
+else
+ # upstream stable
+ KEYWORDS="~amd64 ~arm64"
+ SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz
+ amd64? ( https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz )"
+fi
+
+DESCRIPTION="A complete toolset for web, mobile and enterprise development"
+HOMEPAGE="https://www.jetbrains.com/idea"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1
+ codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0
+ GPL-2 GPL-2-with-classpath-exception ISC
+ JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT
+ MPL-1.0 MPL-1.1 OFL ZLIB"
+
+DEPEND="!dev-util/${PN}:14
+ !dev-util/${PN}:15
+ || (
+ dev-java/openjdk:11
+ dev-java/openjdk-bin:11
+ )"
+RDEPEND="${DEPEND}
+ dev-java/jansi-native
+ dev-libs/libdbusmenu
+ =dev-util/lldb-10*
+ || (
+ dev-java/openjdk:11
+ dev-java/openjdk-bin:11
+ )"
+BDEPEND="dev-util/patchelf"
+RESTRICT="splitdebug"
+S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
+
+QA_PREBUILT="opt/${PN}-${MY_PV}/*"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-jdk.patch"
+)
+
+src_unpack() {
+ default_src_unpack
+ mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
+}
+
+src_prepare() {
+
+ default_src_prepare
+
+ if use amd64; then
+ JRE_DIR=jre64
+ else
+ JRE_DIR=jre
+ fi
+
+ PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
+
+ rm -vf ${PLUGIN_DIR}/libavplugin*
+ rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi*
+ rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le
+ rm -vf "${S}"/bin/libdbm64*
+ rm -vf "${S}"/lib/pty4j-native/linux/mips64el/libpty.so
+
+ if [[ -d "${S}"/"${JRE_DIR}" ]]; then
+ for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
+ do
+ if [[ -f "$file" ]]; then
+ patchelf --set-rpath '$ORIGIN' $file || die
+ fi
+ done
+ fi
+
+ patchelf --replace-needed liblldb.so liblldb.so.10 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb"
+ if use arm64; then
+ patchelf --replace-needed libc.so libc.so.6 "${S}"/lib/pty4j-native/linux/aarch64/libpty.so || die "Unable to patch libpty for libc"
+ else
+ rm -vf "${S}"/lib/pty4j-native/linux/aarch64/libpty.so
+ fi
+
+ sed -i \
+ -e "\$a\\\\" \
+ -e "\$a#-----------------------------------------------------------------------" \
+ -e "\$a# Disable automatic updates as these are handled through Gentoo's" \
+ -e "\$a# package manager. See bug #704494" \
+ -e "\$a#-----------------------------------------------------------------------" \
+ -e "\$aide.no.platform.update=Gentoo" bin/idea.properties
+
+ eapply_user
+}
+
+src_install() {
+ local dir="/opt/${PN}-${MY_PV}"
+
+ insinto "${dir}"
+ doins -r *
+ fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
+ if use amd64; then
+ JRE_DIR=jre64
+ else
+ JRE_DIR=jre
+ fi
+
+ JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
+ if [[ -d ${JRE_DIR} ]]; then
+ for jrebin in $JRE_BINARIES; do
+ fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
+ done
+ fi
+
+ make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
+ newicon "bin/${MY_PN}.png" "${PN}.png"
+ make_desktop_entry "${PN}" "IntelliJ Idea Community" "${PN}" "Development;IDE;"
+
+ # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+ mkdir -p "${D}/etc/sysctl.d/" || die
+ echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+}
diff --git a/dev-util/idea-community/idea-community-2020.3.ebuild b/dev-util/idea-community/idea-community-2020.3.ebuild
deleted file mode 100644
index bf6dae4f3363..000000000000
--- a/dev-util/idea-community/idea-community-2020.3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg
-
-DESCRIPTION="The most intelligent Java IDE."
-HOMEPAGE="https://www.jetbrains.com/idea"
-LICENSE="Apache-2.0"
-
-SLOT="0"
-
-BDEPEND="
- app-arch/tar
-"
-
-RDEPEND="
- virtual/jdk
- dev-libs/libdbusmenu
-"
-
-RESTRICT="bindist mirror strip"
-
-QA_PREBUILT="
- /opt/${PN}/bin/fsnotifier
- /opt/${PN}/bin/fsnotifier64
- /opt/${PN}/bin/libdbm64.so
-"
-
-MY_PN="idea"
-S="${WORKDIR}/${MY_PN}IC-${PV}"
-
-if [[ ${PV} != 9999 ]]; then
- SRC_URI="https://download.jetbrains.com/${MY_PN}/${MY_PN}IC-${PV}.tar.gz"
- KEYWORDS="*"
-fi
-
-src_unpack() {
- default
- mv "${WORKDIR}"/idea* "${S}" || die "Failed to move/rename source dir"
-}
-
-src_prepare() {
- default
-
- # Remove any bundled Java
- rm -rf {jbr,jre{64}} || die "Failed to remove bundled Java"
-}
-
-src_install() {
-
- insinto "/opt/${PN}"
- doins -r *
-
- fperms 755 /opt/${PN}/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
-
- dosym ../../opt/${PN}/bin/idea.sh /usr/bin/${PN}
-
- newicon "bin/${MY_PN}.png" "${PN}.png"
- make_desktop_entry "${PN}" "IntelliJ IDEA Community" "${PN}" "Development;Programming;IDE;"
-
- # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
- mkdir -p "${D}/etc/sysctl.d/" || die
- echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_icon_cache_update
-}
diff --git a/dev-util/idea-community/idea-community-2021.3.1.203.6682.168.ebuild b/dev-util/idea-community/idea-community-2021.3.1.203.6682.168.ebuild
new file mode 100644
index 000000000000..bb95ab1a3858
--- /dev/null
+++ b/dev-util/idea-community/idea-community-2021.3.1.203.6682.168.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils desktop
+
+SLOT="0"
+PV_STRING="$(ver_cut 2-6)"
+MY_PV="$(ver_cut 1-3)"
+MY_PN="idea"
+# Using the most recent Jetbrains Runtime binaries available at the time of writing
+# ( jre 11.0.8 build 1098.1 )
+JRE11_BASE="11_0_8"
+JRE11_VER="1098.1"
+
+# distinguish settings for official stable releases and EAP-version releases
+if [[ "$(ver_cut 7)"x = "prex" ]]
+then
+ # upstream EAP
+ KEYWORDS="~arm64"
+ SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
+else
+ # upstream stable
+ KEYWORDS="~amd64 ~arm64"
+ SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz
+ amd64? ( https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz )"
+fi
+
+DESCRIPTION="A complete toolset for web, mobile and enterprise development"
+HOMEPAGE="https://www.jetbrains.com/idea"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1
+ codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0
+ GPL-2 GPL-2-with-classpath-exception ISC
+ JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT
+ MPL-1.0 MPL-1.1 OFL ZLIB"
+
+DEPEND="!dev-util/${PN}:14
+ !dev-util/${PN}:15
+ || (
+ dev-java/openjdk:11
+ dev-java/openjdk-bin:11
+ )"
+RDEPEND="${DEPEND}
+ dev-java/jansi-native
+ dev-libs/libdbusmenu
+ =dev-util/lldb-10*
+ || (
+ dev-java/openjdk:11
+ dev-java/openjdk-bin:11
+ )"
+BDEPEND="dev-util/patchelf"
+RESTRICT="splitdebug"
+S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
+
+QA_PREBUILT="opt/${PN}-${MY_PV}/*"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-jdk.patch"
+)
+
+src_unpack() {
+ default_src_unpack
+ mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
+}
+
+src_prepare() {
+
+ default_src_prepare
+
+ if use amd64; then
+ JRE_DIR=jre64
+ else
+ JRE_DIR=jre
+ fi
+
+ PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
+
+ rm -vf ${PLUGIN_DIR}/libavplugin*
+ rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi*
+ rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le
+ rm -vf "${S}"/bin/libdbm64*
+ rm -vf "${S}"/lib/pty4j-native/linux/mips64el/libpty.so
+
+ if [[ -d "${S}"/"${JRE_DIR}" ]]; then
+ for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
+ do
+ if [[ -f "$file" ]]; then
+ patchelf --set-rpath '$ORIGIN' $file || die
+ fi
+ done
+ fi
+
+ patchelf --replace-needed liblldb.so liblldb.so.10 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb"
+ if use arm64; then
+ patchelf --replace-needed libc.so libc.so.6 "${S}"/lib/pty4j-native/linux/aarch64/libpty.so || die "Unable to patch libpty for libc"
+ else
+ rm -vf "${S}"/lib/pty4j-native/linux/aarch64/libpty.so
+ fi
+
+ sed -i \
+ -e "\$a\\\\" \
+ -e "\$a#-----------------------------------------------------------------------" \
+ -e "\$a# Disable automatic updates as these are handled through Gentoo's" \
+ -e "\$a# package manager. See bug #704494" \
+ -e "\$a#-----------------------------------------------------------------------" \
+ -e "\$aide.no.platform.update=Gentoo" bin/idea.properties
+
+ eapply_user
+}
+
+src_install() {
+ local dir="/opt/${PN}-${MY_PV}"
+
+ insinto "${dir}"
+ doins -r *
+ fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
+ if use amd64; then
+ JRE_DIR=jre64
+ else
+ JRE_DIR=jre
+ fi
+
+ JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
+ if [[ -d ${JRE_DIR} ]]; then
+ for jrebin in $JRE_BINARIES; do
+ fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
+ done
+ fi
+
+ make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
+ newicon "bin/${MY_PN}.png" "${PN}.png"
+ make_desktop_entry "${PN}" "IntelliJ Idea Community" "${PN}" "Development;IDE;"
+
+ # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+ mkdir -p "${D}/etc/sysctl.d/" || die
+ echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+}
diff --git a/dev-util/idea-community/idea-community-9999.ebuild b/dev-util/idea-community/idea-community-9999.ebuild
deleted file mode 100644
index bf6dae4f3363..000000000000
--- a/dev-util/idea-community/idea-community-9999.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg
-
-DESCRIPTION="The most intelligent Java IDE."
-HOMEPAGE="https://www.jetbrains.com/idea"
-LICENSE="Apache-2.0"
-
-SLOT="0"
-
-BDEPEND="
- app-arch/tar
-"
-
-RDEPEND="
- virtual/jdk
- dev-libs/libdbusmenu
-"
-
-RESTRICT="bindist mirror strip"
-
-QA_PREBUILT="
- /opt/${PN}/bin/fsnotifier
- /opt/${PN}/bin/fsnotifier64
- /opt/${PN}/bin/libdbm64.so
-"
-
-MY_PN="idea"
-S="${WORKDIR}/${MY_PN}IC-${PV}"
-
-if [[ ${PV} != 9999 ]]; then
- SRC_URI="https://download.jetbrains.com/${MY_PN}/${MY_PN}IC-${PV}.tar.gz"
- KEYWORDS="*"
-fi
-
-src_unpack() {
- default
- mv "${WORKDIR}"/idea* "${S}" || die "Failed to move/rename source dir"
-}
-
-src_prepare() {
- default
-
- # Remove any bundled Java
- rm -rf {jbr,jre{64}} || die "Failed to remove bundled Java"
-}
-
-src_install() {
-
- insinto "/opt/${PN}"
- doins -r *
-
- fperms 755 /opt/${PN}/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
-
- dosym ../../opt/${PN}/bin/idea.sh /usr/bin/${PN}
-
- newicon "bin/${MY_PN}.png" "${PN}.png"
- make_desktop_entry "${PN}" "IntelliJ IDEA Community" "${PN}" "Development;Programming;IDE;"
-
- # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
- mkdir -p "${D}/etc/sysctl.d/" || die
- echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_icon_cache_update
-}
diff --git a/dev-util/idea-community/metadata.xml b/dev-util/idea-community/metadata.xml
new file mode 100644
index 000000000000..741de41b55e7
--- /dev/null
+++ b/dev-util/idea-community/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>mpagano@gentoo.org</email>
+ <name>Mike Pagano</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>alicef@gentoo.org</email>
+ <name>Ferrazzi Alice</name>
+ </maintainer>
+ <longdescription lang="en">
+ Excel at enterprise, mobile and web development with Java, Scala and Groovy, with all the latest modern technologies and frameworks available out of the box.
+ </longdescription>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-util/idea-ultimate/Manifest b/dev-util/idea-ultimate/Manifest
deleted file mode 100644
index 28b78668b4be..000000000000
--- a/dev-util/idea-ultimate/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ideaIU-2020.3.tar.gz 876504666 BLAKE2B facb2fb54c0f462d8c76fe036efb4edf6aa5d2197e0f7af71570eb43ef944fd2f994518e2d0b822a3dd3a41b95fa3e078a857cd360e03390a774e105d5507b9a SHA512 282857aba166ebb4c4e84268d5c7c1d51c4e914ea8efc6a11cd36df972eb5083ccf7d9c260f9f22dc08cacee6cd3de137d483369dae4b3bab0269416d82ce4b1
-EBUILD idea-ultimate-2020.3.ebuild 1586 BLAKE2B c39ca0da9e77b82bddf17352213ca299d5c301a55ee3156d3cac809fdbc5c6d1f92f2d6d90bae9f0a06890d19b020b85b0cb43adf12590fd2d2eba912947e6dd SHA512 e3e9cf8368c4ecc68b23820b2c5b99e077534dd73718f57985f394edd0d522bf1f5f7a8deb44d9f69f829fcc18101310ecddbd57a5d57c94b7047ce284267e5f
-EBUILD idea-ultimate-9999.ebuild 1586 BLAKE2B c39ca0da9e77b82bddf17352213ca299d5c301a55ee3156d3cac809fdbc5c6d1f92f2d6d90bae9f0a06890d19b020b85b0cb43adf12590fd2d2eba912947e6dd SHA512 e3e9cf8368c4ecc68b23820b2c5b99e077534dd73718f57985f394edd0d522bf1f5f7a8deb44d9f69f829fcc18101310ecddbd57a5d57c94b7047ce284267e5f
diff --git a/dev-util/idea-ultimate/idea-ultimate-2020.3.ebuild b/dev-util/idea-ultimate/idea-ultimate-2020.3.ebuild
deleted file mode 100644
index 0f12f6fd55f4..000000000000
--- a/dev-util/idea-ultimate/idea-ultimate-2020.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg
-
-DESCRIPTION="The most intelligent Java IDE."
-HOMEPAGE="https://www.jetbrains.com/idea"
-LICENSE="JetBrains"
-
-SLOT="0"
-
-BDEPEND="
- app-arch/tar
-"
-
-RDEPEND="
- virtual/jdk
- dev-libs/libdbusmenu
-"
-
-RESTRICT="bindist mirror strip"
-
-QA_PREBUILT="
- /opt/${PN}/bin/fsnotifier
- /opt/${PN}/bin/fsnotifier64
- /opt/${PN}/bin/libdbm64.so
-"
-
-#MY_PN="${PN}/-ultimate/"
-MY_PN="idea"
-S="${WORKDIR}/${MY_PN}IU-${PV}"
-
-if [[ ${PV} != 9999 ]]; then
- SRC_URI="https://download.jetbrains.com/${MY_PN}/${MY_PN}IU-${PV}.tar.gz"
- KEYWORDS="*"
-fi
-
-src_unpack() {
- default
- mv "${WORKDIR}"/idea* "${S}" || die "Failed to move/rename source dir"
-}
-
-src_prepare() {
- default
-
- # Remove any bundled Java
- rm -rf {jbr,jre{64}} || die "Failed to remove bundled Java"
-}
-
-src_install() {
-
- insinto "/opt/${PN}"
- doins -r *
-
- fperms 755 /opt/${PN}/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
-
- dosym ../../opt/${PN}/bin/idea.sh /usr/bin/${PN}
-
- newicon "bin/${MY_PN}.png" "${PN}.png"
- make_desktop_entry "${PN}" "IntelliJ IDEA Ultimate" "${PN}" "Development;Programming;IDE;"
-
- # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
- mkdir -p "${D}/etc/sysctl.d/" || die
- echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_icon_cache_update
-}
diff --git a/dev-util/idea-ultimate/idea-ultimate-9999.ebuild b/dev-util/idea-ultimate/idea-ultimate-9999.ebuild
deleted file mode 100644
index 0f12f6fd55f4..000000000000
--- a/dev-util/idea-ultimate/idea-ultimate-9999.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg
-
-DESCRIPTION="The most intelligent Java IDE."
-HOMEPAGE="https://www.jetbrains.com/idea"
-LICENSE="JetBrains"
-
-SLOT="0"
-
-BDEPEND="
- app-arch/tar
-"
-
-RDEPEND="
- virtual/jdk
- dev-libs/libdbusmenu
-"
-
-RESTRICT="bindist mirror strip"
-
-QA_PREBUILT="
- /opt/${PN}/bin/fsnotifier
- /opt/${PN}/bin/fsnotifier64
- /opt/${PN}/bin/libdbm64.so
-"
-
-#MY_PN="${PN}/-ultimate/"
-MY_PN="idea"
-S="${WORKDIR}/${MY_PN}IU-${PV}"
-
-if [[ ${PV} != 9999 ]]; then
- SRC_URI="https://download.jetbrains.com/${MY_PN}/${MY_PN}IU-${PV}.tar.gz"
- KEYWORDS="*"
-fi
-
-src_unpack() {
- default
- mv "${WORKDIR}"/idea* "${S}" || die "Failed to move/rename source dir"
-}
-
-src_prepare() {
- default
-
- # Remove any bundled Java
- rm -rf {jbr,jre{64}} || die "Failed to remove bundled Java"
-}
-
-src_install() {
-
- insinto "/opt/${PN}"
- doins -r *
-
- fperms 755 /opt/${PN}/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
-
- dosym ../../opt/${PN}/bin/idea.sh /usr/bin/${PN}
-
- newicon "bin/${MY_PN}.png" "${PN}.png"
- make_desktop_entry "${PN}" "IntelliJ IDEA Ultimate" "${PN}" "Development;Programming;IDE;"
-
- # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
- mkdir -p "${D}/etc/sysctl.d/" || die
- echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_icon_cache_update
-}
diff --git a/dev-util/indent/Manifest b/dev-util/indent/Manifest
index 6bbfceff8f51..f80f2d3f318e 100644
--- a/dev-util/indent/Manifest
+++ b/dev-util/indent/Manifest
@@ -1,3 +1 @@
-DIST indent-2.2.11.tar.gz 778563 BLAKE2B 8fe0f245fb852613587da8355a4aa8962e09e1614faf61cf7cea62d6922054547d0739cd1373298af08e4e0cca8d5f4bfc654e03d859c0fe560d0ddb0f63a298 SHA512 f5670e5edc76b9d599ef9e8cc498e13ac15e10eb6a8d674e1612918c4b67ffb15c94d73b9590434e0cdea6ead4b8d1f5bcda1c2f3838acbdeb4d732a0bea89be
DIST indent-2.2.12.tar.xz 620280 BLAKE2B c3414ebe58d75b74356b5c37234639dc34998b73e45a4c28ee20ab2932c523b528d577c45c32db88f2ee4aed58d1dceeda2fe68b8975d211dc0dad4a3a20f7c7 SHA512 dbe73bd3729074825f9f5b4241a4c539ad32069df56511963417caf0351ff9ec5edd77e9580338301c8abf89ab9c0592bc7e82c14eec7450c496259d7e9045dd
-DIST indent_2.2.11-5.debian.tar.xz 6540 BLAKE2B c4d0805f39e1af503bcfcc49a8e9e679fb0df1021de9952af5a80c81f0c36c70e8dd6609b7e7ec5e36596f974d9c9ac31a7cad831a431cd9401758981d46a7ec SHA512 f89f04bb3b9772c5428ef6df939b5cbe92761f3a39869020dad4f98a5e48c57c34de526803141258c9d55ba6edaedf05127009530aa09b1a54cfa15c8a421a31
diff --git a/dev-util/indent/files/indent-2.2.11-ac_config_headers.patch b/dev-util/indent/files/indent-2.2.11-ac_config_headers.patch
deleted file mode 100644
index 8728a26a8254..000000000000
--- a/dev-util/indent/files/indent-2.2.11-ac_config_headers.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -3,7 +3,7 @@
- AC_CONFIG_SRCDIR(src/indent.c)
- AC_CONFIG_AUX_DIR(config)
- AM_INIT_AUTOMAKE(indent, 2.2.11)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
-
- AM_MAINTAINER_MODE
-
diff --git a/dev-util/indent/files/indent-2.2.11-linguas.patch b/dev-util/indent/files/indent-2.2.11-linguas.patch
deleted file mode 100644
index d540219b7cd2..000000000000
--- a/dev-util/indent/files/indent-2.2.11-linguas.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- a/po/LINGUAS
-+++ b/po/LINGUAS
-@@ -1 +1 @@
--ca da de eo et fi fr gl hu it ja ko nl pl pt_BR ru sk sv tr zh_TW.Big5
-+ca da de eo et fi fr gl hu it ja ko nl pl pt_BR ru sk sv tr zh_TW
diff --git a/dev-util/indent/files/indent-2.2.11-segfault.patch b/dev-util/indent/files/indent-2.2.11-segfault.patch
deleted file mode 100644
index e91922480951..000000000000
--- a/dev-util/indent/files/indent-2.2.11-segfault.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/man/texinfo2man.c
-+++ b/man/texinfo2man.c
-@@ -287,6 +287,13 @@
- char buf[1024];
- int line_no = 0;
-
-+ if (argc != 3)
-+ {
-+ fprintf(stderr, "Usage: %s <man template> <info file>\n", argv[0]);
-+ fprintf(stderr, " The man page will be written to stdout.\n");
-+ return -1;
-+ }
-+
- texinfoname = argv[2];
-
- in = fopen (argv[2], "r");
diff --git a/dev-util/indent/files/indent-2.2.11-texi2html-5.patch b/dev-util/indent/files/indent-2.2.11-texi2html-5.patch
deleted file mode 100644
index 5bad3da2867b..000000000000
--- a/dev-util/indent/files/indent-2.2.11-texi2html-5.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -34,14 +34,14 @@
- html-split: @PACKAGE@_toc.html
-
- @PACKAGE@.html: version.texi $(@PACKAGE@_TEXINFOS)
-- $(TEXI2HTML) -expandinfo -number -monolithic `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi`
-+ $(TEXI2HTML) -expandinfo -monolithic `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi`
-
- @PACKAGE@_toc.html: version.texi $(@PACKAGE@_TEXINFOS)
- case "$(TEXI2HTML)" in \
- *"/missing texi2html") \
-- $(TEXI2HTML) -expand info -number -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` || exit 0 ;; \
-+ $(TEXI2HTML) -expand info -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` || exit 0 ;; \
- *) $(RM) @PACKAGE@_*.html ; \
-- $(TEXI2HTML) -expand info -number -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` ;; \
-+ $(TEXI2HTML) -expand info -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` ;; \
- esac
-
- install-html-monolithic: @PACKAGE@.html
---- a/doc/Makefile.in
-+++ b/doc/Makefile.in
-@@ -663,14 +663,14 @@
- html-split: @PACKAGE@_toc.html
-
- @PACKAGE@.html: version.texi $(@PACKAGE@_TEXINFOS)
-- $(TEXI2HTML) -expandinfo -number -monolithic `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi`
-+ $(TEXI2HTML) -expandinfo -monolithic `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi`
-
- @PACKAGE@_toc.html: version.texi $(@PACKAGE@_TEXINFOS)
- case "$(TEXI2HTML)" in \
- *"/missing texi2html") \
-- $(TEXI2HTML) -expand info -number -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` || exit 0 ;; \
-+ $(TEXI2HTML) -expand info -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` || exit 0 ;; \
- *) $(RM) @PACKAGE@_*.html ; \
-- $(TEXI2HTML) -expand info -number -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` ;; \
-+ $(TEXI2HTML) -expand info -nomenu -split section `if test -f @PACKAGE@.texinfo; then echo @PACKAGE@.texinfo; else echo $(srcdir)/@PACKAGE@.texinfo; fi` ;; \
- esac
-
- install-html-monolithic: @PACKAGE@.html
diff --git a/dev-util/indent/indent-2.2.11-r1.ebuild b/dev-util/indent/indent-2.2.11-r1.ebuild
deleted file mode 100644
index c9f84d2ad06b..000000000000
--- a/dev-util/indent/indent-2.2.11-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Indent program source files"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="nls"
-
-DEPEND="
- nls? ( sys-devel/gettext )
- app-text/texi2html
-"
-RDEPEND="
- nls? ( virtual/libintl )
-"
-
-src_prepare() {
- # Fix bug #94837
- local pofile
- for pofile in po/zh_TW*; do
- mv ${pofile} ${pofile/.Big5} || die
- done
- sed -i po/LINGUAS -e 's|zh_TW\.Big5|zh_TW|g' || die
-
- epatch \
- "${FILESDIR}"/${P}-segfault.patch \
- "${FILESDIR}"/${P}-texi2html-5.patch
- sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
-
- eautoreconf
-}
-
-src_configure() {
- econf $(use_enable nls)
-}
-
-src_test() {
- emake -C regression/
-}
-
-src_install() {
- # htmldir as set in configure is ignored in doc/Makefile*
- emake DESTDIR="${D}" htmldir="${EPREFIX}/usr/share/doc/${PF}/html" install
- dodoc AUTHORS NEWS README ChangeLog ChangeLog-1990 ChangeLog-1998 ChangeLog-2001
-}
diff --git a/dev-util/indent/indent-2.2.11_p5.ebuild b/dev-util/indent/indent-2.2.11_p5.ebuild
deleted file mode 100644
index 4b76c2fb0708..000000000000
--- a/dev-util/indent/indent-2.2.11_p5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils
-
-DESCRIPTION="Indent program source files"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="
- https://dev.gentoo.org/~jer/${P/_p*/}.tar.gz
- http://http.debian.net/debian/pool/main/i/${PN}/${PN}_${PV/_p*/}-${PV/*_p/}.debian.tar.xz
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="nls"
-
-DEPEND="
- nls? ( sys-devel/gettext )
- app-text/texi2html
-"
-RDEPEND="
- nls? ( virtual/libintl )
-"
-PATCHES=(
- "${FILESDIR}"/${P/_p*/}-segfault.patch
- "${FILESDIR}"/${P/_p*/}-texi2html-5.patch
- "${FILESDIR}"/${P/_p*/}-ac_config_headers.patch
- "${FILESDIR}"/${P/_p*/}-linguas.patch
-)
-S=${WORKDIR}/${P/_p*/}
-
-src_prepare() {
- default
-
- eapply "${WORKDIR}"/debian/patches/*.patch
-
- local pofile
- for pofile in po/zh_TW*; do
- mv ${pofile} ${pofile/.Big5} || die
- done
-
- eautoreconf
-}
-
-src_configure() {
- strip-linguas -i po/
-
- econf $(use_enable nls)
-}
-
-src_test() {
- emake -C regression/
-}
-
-src_install() {
- # htmldir as set in configure is ignored in doc/Makefile*
- emake DESTDIR="${D}" htmldir="${EPREFIX}/usr/share/doc/${PF}/html" install
- dodoc AUTHORS NEWS README ChangeLog ChangeLog-1990 ChangeLog-1998 ChangeLog-2001
-}
diff --git a/dev-util/indent/indent-2.2.12.ebuild b/dev-util/indent/indent-2.2.12.ebuild
index f147dca41c81..ab0455d550ad 100644
--- a/dev-util/indent/indent-2.2.12.ebuild
+++ b/dev-util/indent/indent-2.2.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="nls"
DEPEND="
diff --git a/dev-util/intltool/intltool-0.51.0-r2.ebuild b/dev-util/intltool/intltool-0.51.0-r2.ebuild
index 66c7df8f5517..2965449e0eda 100644
--- a/dev-util/intltool/intltool-0.51.0-r2.ebuild
+++ b/dev-util/intltool/intltool-0.51.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="
diff --git a/dev-util/itstool/itstool-2.0.6-r1.ebuild b/dev-util/itstool/itstool-2.0.6-r1.ebuild
index d807c5b3b6ec..54f8ee91a219 100644
--- a/dev-util/itstool/itstool-2.0.6-r1.ebuild
+++ b/dev-util/itstool/itstool-2.0.6-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://files.itstool.org/itstool/${P}.tar.bz2"
# files in /usr/share/itstool/its are under a special exception || GPL-3+
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/japi-compliance-checker/metadata.xml b/dev-util/japi-compliance-checker/metadata.xml
index 1177b60edb5f..be48a79b6efc 100644
--- a/dev-util/japi-compliance-checker/metadata.xml
+++ b/dev-util/japi-compliance-checker/metadata.xml
@@ -3,7 +3,7 @@
<pkgmetadata>
<maintainer type="person">
<email>fordfrog@gentoo.org</email>
- <description>Miroslav Å ulc</description>
+ <name>Miroslav Å ulc</name>
</maintainer>
<origin>gentoo-staging</origin>
</pkgmetadata>
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 430ab9c107e4..64a6eeb71829 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -1,6 +1,4 @@
-DIST jenkins-bin-2.249.2.war 67399569 BLAKE2B df3d954988370a47d90363a01de97f17a92cb4d93049ceacea80f7d2a92195cd1e95b1f3780521efa166aee1058949f0e8861b887d6da5b0f0126a2579d22595 SHA512 0300369b3c427420a9c41ee17f3e098c77f14b25597059d740fdbea03f3679ce56d9e154d7765601274cd9dc866939595f7728bc2b8b8a0ef3ea131378648a98
-DIST jenkins-bin-2.249.3.war 67400032 BLAKE2B eb9ffde454bf9ee2140655a985c6f383cb2e3d21f172075cf19171871564d356afd38b8ed6119cb3bd43801843d499242c0ae99087c5c4f7cb2db1b8b80b70a4 SHA512 5d65dee8c128ba2a307ade0750a0ad9b71136b1102a36df0a34a1217ce62df9c0c60449e0f5dd8861369b553000ef65f8bb0afb54a3c8e4315400dede58e779b
DIST jenkins-bin-2.263.1.war 67270143 BLAKE2B 2c59b2d58632c741a0ce9ba66e4d177779899be01d3e0b9f7ba2e8fa5ff8bac667c2e2c98b9c199a8d55f9c873c1937b80f4aa6ea5f7ff6bbf256047c9a6ee94 SHA512 320dc0d4b365c0b9e11e76d6753b5ba3fbdf81e1acb9a7bbb4082fba1c57f22126810b75c563c4aa75ef3ff1633f2fe1a953c8aa1a25af5f3a0a9b2bc3a104d9
-DIST jenkins-bin-2.264.war 67272894 BLAKE2B 8cf8afc038420bbf101bf8c81cdb37e9ba25f631ccbe0f98d8897f12a93abf8355dca1ec23f254e14b16dbd8e88507a37b545c4854f2e8f3684bda871d8e171f SHA512 9bf29d7ae084c30c02931ba065e7d712a3cab4e4519587a1edc68e7205dac7a91934ca910536dd8d2c268575547fea2cdcc43229c726ed495658210cea7747a5
-DIST jenkins-bin-2.267.war 70971700 BLAKE2B 1470144d6be6cfc33d7b84c51ebb3f762b3e590427a362596302b87510d694b479608ff290b64a433aa98266d3c47b1294a505525cfdeae3547e58cc65f0d172 SHA512 39c042b3ca9d48c040d0a9d9ac9d65aff2f579888e24b800bc1e1b77b7175528aed31f2675b3417577b0b0eef7c17b6faa2d7b794360a17a6a4c8ba867007185
+DIST jenkins-bin-2.263.2.war 67285886 BLAKE2B 6bb4922536370744b5e69ebc50b79937865bef13183d48b0cd725e78921bab4433fd63ab1a1a32d52903bd448c31acf29a47a3c03bda8ef2cc2fcdaed673d985 SHA512 f25158373963fd4dfa988381dbb6c84b16129899a596a447ae35dbce5ebed27a796d0b1aea0c4213032ee37a17df7b3dc50d393cf13156944813cbed1e598351
DIST jenkins-bin-2.268.war 70969355 BLAKE2B e24424c8cd0535c04134cd22b8fc5e73de80c8eaa090e9fdf512dfeda4a9d029b0657e7ecaed4934ff996c1f5e8e59e9f10a7bfc31a313792cf759017780aeeb SHA512 b0e55310a21039fc57a7bdcc3b190ec61141f253d084a8279d279cff1778a3a4edc281bcc2cd1f872389d160a77dd2c9ebdf1b6cbc5d90272f2aedd66296535a
+DIST jenkins-bin-2.275.war 70809238 BLAKE2B 876d7215f55c80352336f4b3a8b47ff655930666e545bf81701c311e7b2ef756e9afbf286fdb8cc33d9dc64502dde3ec4d84c6b9c636d8503df79b8176ea8b9a SHA512 6c473e8d117ba99fa6a25820f0e0793f5b95f2d4c8ae2969c3e6c38fa076cbce91003d9d3e5c41c158a6d9ac69c192addbd3c0487af8b220878a1c08435b2a5a
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.249.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.249.3.ebuild
deleted file mode 100644
index 8ab8d5db213a..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.249.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="https://jenkins.io/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="lts"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="media-fonts/dejavu
- media-libs/freetype
- !dev-util/jenkins-bin:0
- >=virtual/jre-1.8.0"
-
-S=${WORKDIR}
-
-JENKINS_DIR=/var/lib/jenkins
-
-pkg_setup() {
- enewgroup jenkins
- enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
-}
-
-src_install() {
- keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
- insinto /opt/jenkins
- newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
- newinitd "${FILESDIR}"/${PN}.init2 jenkins
- newconfd "${FILESDIR}"/${PN}.confd jenkins
-
- systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
-
- fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.249.2.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.263.2.ebuild
index 8ab8d5db213a..e24da02245e6 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.249.2.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.263.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.267.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.267.ebuild
deleted file mode 100644
index 231d58c8748f..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.267.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="https://jenkins.io/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="media-fonts/dejavu
- media-libs/freetype
- !dev-util/jenkins-bin:lts
- >=virtual/jre-1.8.0"
-
-S=${WORKDIR}
-
-JENKINS_DIR=/var/lib/jenkins
-
-pkg_setup() {
- enewgroup jenkins
- enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
-}
-
-src_install() {
- keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
- insinto /opt/jenkins
- newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
- newinitd "${FILESDIR}"/${PN}.init2 jenkins
- newconfd "${FILESDIR}"/${PN}.confd jenkins
-
- systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
-
- fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.264.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.275.ebuild
index 231d58c8748f..2eea44d52656 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.264.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.275.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index 34202325db4d..bf534b4e3215 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,2 +1 @@
-DIST kdev-php-5.6.0.tar.xz 1063760 BLAKE2B 72b3a6e77d6f569877687490f654daf79c14e2f7b374aadabbf54d7cad129c15051e72d816073d961582efa33d8354c51b2d3efa77a930ed2c81db4c5cd6668c SHA512 b6838e8eb44df1a0b2d94503c28636ce36dd63e91a8476b1f523b7457f1f831987eb3d079cbb7ed629c5c8143cd6a6f5832579ab7dc38f38162198c2cc068cdc
DIST kdev-php-5.6.1.tar.xz 1063372 BLAKE2B 4c7d3897c67629b6aafb8a2e04d080a3ab5fd3bbbd836fe09d41cbdc29a14367fc2b1dc790375e761917b81bce08b88737a1b4a03163743fad71eea1410a5d29 SHA512 45e84c7ecf293dfa48805c3a80804f468a5fb8019ea3ced6b8cc1cb9042d84774635bc58e2d61945c3e5a2e77d1bc139ecdf9ebc408157c640ccbcaa2c26f189
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.6.0.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.6.0.ebuild
deleted file mode 100644
index 6b995a558833..000000000000
--- a/dev-util/kdevelop-php/kdevelop-php-5.6.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_HANDBOOK_DIR="docs"
-ECM_TEST="true"
-KDE_ORG_CATEGORY="kdevelop"
-KDE_ORG_NAME="kdev-php"
-KFMIN=5.70.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="PHP plugin for KDevelop"
-HOMEPAGE="https://www.kdevelop.org/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
- KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="5"
-IUSE=""
-
-BDEPEND="
- test? ( dev-util/kdevelop:5[test] )
-"
-DEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- dev-util/kdevelop-pg-qt:5
- dev-util/kdevelop:5=
- >=kde-frameworks/kcmutils-${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/ktexteditor-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/threadweaver-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-# remaining tests fail for some, bug 668530
-RESTRICT+=" test"
-
-src_test() {
- # tests hang, bug 667922
- local myctestargs=(
- -E "(completionbenchmark|duchain_multiplefiles)"
- )
- ecm_src_test
-}
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.6.1.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.6.1.ebuild
index e732610f5639..bdb5acce0f7b 100644
--- a/dev-util/kdevelop-php/kdevelop-php-5.6.1.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-5.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,7 +17,7 @@ DESCRIPTION="PHP plugin for KDevelop"
HOMEPAGE="https://www.kdevelop.org/"
if [[ ${KDE_BUILD_TYPE} = release ]]; then
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
LICENSE="GPL-2 LGPL-2"
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index d35708f52d87..5982fab7f67e 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,2 +1 @@
-DIST kdev-python-5.6.0.tar.xz 1069480 BLAKE2B 0ceb8c1a4bd279b621844eb94eeecef4272b13e77764afeb6403d8a757d6873caf2cc5ad5a1a1eef901365c90dc11298bab21274b684c6b49c8e55388c9504bb SHA512 c6a866a563f3304aab860f66d752a617f8a0822c2e3b0f4131b8e8603f2ed86b5141ad308f967ffc5e9458693f389281a8918feea9fc584d7b4213fa265479be
DIST kdev-python-5.6.1.tar.xz 1071080 BLAKE2B f9972f6460723bc4822b00e49ab35f74eecc86cfb642fe76d98f551519f8ab690d6c5b6bbd7db778a3a62a1d11e81f8a0ea39fda91120b951b0fb80667d52b64 SHA512 bdf05ed098cfbca395c8c82650c278f33bd5878a08527f43d555e905142b3b486267d37789cbe9bf4924162fb9c3024c13e445a2f1d408626861b96c96103e12
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.6.0.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.6.0.ebuild
deleted file mode 100644
index 1ef4a94eb209..000000000000
--- a/dev-util/kdevelop-python/kdevelop-python-5.6.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KDE_ORG_CATEGORY="kdevelop"
-KDE_ORG_NAME="kdev-python"
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-KFMIN=5.70.0
-QTMIN=5.12.3
-inherit ecm kde.org python-single-r1
-
-DESCRIPTION="Python plugin for KDevelop"
-HOMEPAGE="https://www.kdevelop.org/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
- KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- dev-util/kdevelop:5=
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/ktexteditor-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/threadweaver-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
- $(python_gen_cond_dep '
- dev-python/pycodestyle[${PYTHON_MULTI_USEDEP}]
- ')
-"
-
-RESTRICT+=" test"
-
-pkg_setup() {
- python-single-r1_pkg_setup
- ecm_pkg_setup
-}
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.6.1.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.6.1.ebuild
index bdb877d7d3e5..3876e83c2701 100644
--- a/dev-util/kdevelop-python/kdevelop-python-5.6.1.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-5.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ DESCRIPTION="Python plugin for KDevelop"
HOMEPAGE="https://www.kdevelop.org/"
if [[ ${KDE_BUILD_TYPE} = release ]]; then
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
LICENSE="GPL-2" # TODO: CHECK
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 2c775f16899f..5b543a0ef759 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,2 +1 @@
-DIST kdevelop-5.6.0.tar.xz 7116544 BLAKE2B c548c695dab41c93aef31549bd479f1ca832a3fac9cde044523bf590d536473f36a87521ac678d37008ff451c091b843f65ccce154d9b1ca59efac2b48a81515 SHA512 c96a79d92972d606778d76f74f9dfddb9a0da9f41b462ada1a52842aa14306ad3cb183cda8103a9a3cf56d0dd5c1f18d5fad6b65cd8ae42f2fc407aaa6dc88f7
DIST kdevelop-5.6.1.tar.xz 7130284 BLAKE2B 989218ec07d437d641033b7895b533a4f92b8c557e73bac0e3671a34335aac02936eeb3b73b95d1a7bbab6ad8b32a21f15db1d5af0485999fa2f7eb24b9e8bb6 SHA512 a03e22d57b5d556489e3e140e4cad6939170087a36afa8c755318ff6b5101806b8df82bd402e32daa715f4a72352dada1c2ce3ff4455dcac0debe6456c0bc7cd
diff --git a/dev-util/kdevelop/kdevelop-5.6.0-r1.ebuild b/dev-util/kdevelop/kdevelop-5.6.0-r1.ebuild
deleted file mode 100644
index 78c011af5798..000000000000
--- a/dev-util/kdevelop/kdevelop-5.6.0-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KDE_ORG_CATEGORY="kdevelop"
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
-HOMEPAGE="https://kdevelop.org/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
- KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="5/56" # look at KDEVELOP_SOVERSION inside CMakeLists.txt
-IUSE="+gdbui hex +plasma +qmake reviewboard subversion"
-
-COMMON_DEPEND="
- dev-libs/grantlee:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qthelp-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qttest-${QTMIN}:5
- >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=dev-util/astyle-3.1:=
- kde-apps/libkomparediff2:5
- >=kde-frameworks/karchive-${KFMIN}:5
- >=kde-frameworks/kbookmarks-${KFMIN}:5
- >=kde-frameworks/kcmutils-${KFMIN}:5
- >=kde-frameworks/kcodecs-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdeclarative-${KFMIN}:5
- >=kde-frameworks/kguiaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kitemviews-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/knotifyconfig-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/ktexteditor-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/sonnet-${KFMIN}:5
- >=kde-frameworks/threadweaver-${KFMIN}:5
- >=sys-devel/clang-6.0:=
- gdbui? ( kde-plasma/libksysguard:5= )
- hex? ( app-editors/okteta:5 )
- plasma? (
- >=kde-frameworks/krunner-${KFMIN}:5
- >=kde-frameworks/plasma-${KFMIN}:5
- )
- qmake? ( dev-util/kdevelop-pg-qt:5 )
- reviewboard? ( >=kde-frameworks/purpose-${KFMIN}:5 )
- subversion? (
- dev-libs/apr:1
- dev-libs/apr-util:1
- dev-vcs/subversion
- )
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/boost
- >=dev-qt/qtconcurrent-${QTMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
- >=dev-qt/qdbus-${QTMIN}:5
- >=dev-qt/qtquickcontrols-${QTMIN}:5
- >=dev-qt/qtquickcontrols2-${QTMIN}:5
- dev-util/ninja
- kde-apps/kapptemplate:5
- kde-apps/kio-extras:5
- >=sys-devel/gdb-7.0[python]
- reviewboard? ( kde-apps/ktp-accounts-kcm:5 )
- !dev-util/kdevelop-clang-tidy
-"
-
-RESTRICT+=" test"
-# see bug 366471
-
-src_configure() {
- local clang_version=$(best_version sys-devel/clang)
- local llvm_root="/usr/lib/llvm/$(ver_cut 1 ${clang_version##sys-devel/clang-})"
-
- local mycmakeargs=(
- -DLLVM_ROOT=${llvm_root}
- $(cmake_use_find_package gdbui KSysGuard)
- -DBUILD_executeplasmoid=$(usex plasma)
- $(cmake_use_find_package plasma KF5Plasma)
- $(cmake_use_find_package hex OktetaKastenControllers)
- $(cmake_use_find_package qmake KDevelop-PG-Qt)
- $(cmake_use_find_package reviewboard KF5Purpose)
- $(cmake_use_find_package subversion SubversionLibrary)
- )
-
- use gdbui || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5SysGuard=ON )
- use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
-
- ecm_src_configure
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- elog "Optional dependencies:"
- optfeature "konsole view" kde-apps/konsole
- optfeature "Static C++ Qt code analysis" dev-util/clazy
- optfeature "Static C/C++ code analysis" dev-util/cppcheck
- optfeature "Heap memory profiling" dev-util/heaptrack[qt5]
- optfeature "Meson Project manager plugin" dev-util/meson
- fi
- ecm_pkg_postinst
-}
diff --git a/dev-util/kdevelop/kdevelop-5.6.1.ebuild b/dev-util/kdevelop/kdevelop-5.6.1.ebuild
index 262a77ad4251..d1befe2159c6 100644
--- a/dev-util/kdevelop/kdevelop-5.6.1.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and mu
HOMEPAGE="https://kdevelop.org/"
if [[ ${KDE_BUILD_TYPE} = release ]]; then
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm64 x86"
fi
LICENSE="GPL-2 LGPL-2"
diff --git a/dev-util/kup/kup-0.3.4-r1.ebuild b/dev-util/kup/kup-0.3.4-r1.ebuild
index 69cedadab94e..7ce7f1f22b51 100644
--- a/dev-util/kup/kup-0.3.4-r1.ebuild
+++ b/dev-util/kup/kup-0.3.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
diff --git a/dev-util/linklint/linklint-2.3.5.ebuild b/dev-util/linklint/linklint-2.3.5.ebuild
index 1984f1ef0432..ee11f8b11b78 100644
--- a/dev-util/linklint/linklint-2.3.5.ebuild
+++ b/dev-util/linklint/linklint-2.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -9,7 +9,7 @@ SRC_URI="http://www.linklint.org/download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
DEPEND=""
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index d36c99982c35..07cacd71fa2f 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,4 +1,5 @@
DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
-DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c6171d60356c9167d5b94012929e6e547c526cda1a6177c295ed19592dfb83b020f63b2cef4cabc70ce9a2a8e098fe654a3cd SHA512 605c7bbff1610f335be8ea4f1204df797fed21185a54c77565f6ff2d00794d1967e9c5fab7c87633e242f2f999bdffb76da83f756d261c1ca476114599409ae1
+DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
+DIST llvmorg-11.1.0-rc1.tar.gz 122793491 BLAKE2B f4777455f5903cffea284eaffd872be6c287c6c1ebbd0c4b5b5473f146d7f5476f3551998a58d3e976ab90cde7b0d05db2b3be97f4e8e2c3474755ff38739268 SHA512 44e281486c44fa1611042ab658b9833a75f9613b7f896863613cfb99de66d13607fb1e9064f42ea3d89ca7951113465a90fd96ca4544262f165f78bd5261f5a8
DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
diff --git a/dev-util/lldb/lldb-11.0.1.9999.ebuild b/dev-util/lldb/lldb-11.0.1.ebuild
index f65ff812420b..d80f6d5b01d7 100644
--- a/dev-util/lldb/lldb-11.0.1.9999.ebuild
+++ b/dev-util/lldb/lldb-11.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,10 +11,10 @@ HOMEPAGE="https://llvm.org/"
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="libedit lzma ncurses +python test"
REQUIRED_USE=${PYTHON_REQUIRED_USE}
-RESTRICT="!test? ( test )"
+RESTRICT="test"
RDEPEND="
libedit? ( dev-libs/libedit:0= )
@@ -22,7 +22,7 @@ RDEPEND="
ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
python? (
$(python_gen_cond_dep '
- dev-python/six[${PYTHON_MULTI_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
')
${PYTHON_DEPS}
)
@@ -35,7 +35,8 @@ BDEPEND="
python? ( >=dev-lang/swig-3.0.11 )
test? (
$(python_gen_cond_dep "
- ~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}]
+ ~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
+ dev-python/psutil[\${PYTHON_USEDEP}]
")
sys-devel/lld
)
@@ -76,9 +77,6 @@ src_configure() {
)
use test && mycmakeargs+=(
-DLLVM_BUILD_TESTS=$(usex test)
- # compilers for lit tests
- -DLLDB_TEST_COMPILER="$(type -P clang)"
-
-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-DLLVM_LIT_ARGS="$(get_lit_flags)"
diff --git a/dev-util/lldb/lldb-11.0.1_rc1.ebuild b/dev-util/lldb/lldb-11.1.0_rc1.ebuild
index f65ff812420b..ae93495f0c83 100644
--- a/dev-util/lldb/lldb-11.0.1_rc1.ebuild
+++ b/dev-util/lldb/lldb-11.1.0_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SLOT="0"
KEYWORDS=""
IUSE="libedit lzma ncurses +python test"
REQUIRED_USE=${PYTHON_REQUIRED_USE}
-RESTRICT="!test? ( test )"
+RESTRICT="test"
RDEPEND="
libedit? ( dev-libs/libedit:0= )
@@ -22,7 +22,7 @@ RDEPEND="
ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
python? (
$(python_gen_cond_dep '
- dev-python/six[${PYTHON_MULTI_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
')
${PYTHON_DEPS}
)
@@ -35,7 +35,8 @@ BDEPEND="
python? ( >=dev-lang/swig-3.0.11 )
test? (
$(python_gen_cond_dep "
- ~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}]
+ ~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
+ dev-python/psutil[\${PYTHON_USEDEP}]
")
sys-devel/lld
)
@@ -76,9 +77,6 @@ src_configure() {
)
use test && mycmakeargs+=(
-DLLVM_BUILD_TESTS=$(usex test)
- # compilers for lit tests
- -DLLDB_TEST_COMPILER="$(type -P clang)"
-
-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-DLLVM_LIT_ARGS="$(get_lit_flags)"
diff --git a/dev-util/lldb/lldb-12.0.0.9999.ebuild b/dev-util/lldb/lldb-12.0.0.9999.ebuild
index 303907129af3..3c03ee37c9f7 100644
--- a/dev-util/lldb/lldb-12.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-12.0.0.9999.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
python? (
$(python_gen_cond_dep '
- dev-python/six[${PYTHON_MULTI_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
')
${PYTHON_DEPS}
)
@@ -35,7 +35,8 @@ BDEPEND="
python? ( >=dev-lang/swig-3.0.11 )
test? (
$(python_gen_cond_dep "
- ~dev-python/lit-${PV}[\${PYTHON_MULTI_USEDEP}]
+ ~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
+ dev-python/psutil[\${PYTHON_USEDEP}]
")
sys-devel/lld
)
@@ -76,9 +77,6 @@ src_configure() {
)
use test && mycmakeargs+=(
-DLLVM_BUILD_TESTS=$(usex test)
- # compilers for lit tests
- -DLLDB_TEST_COMPILER="$(type -P clang)"
-
-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-DLLVM_LIT_ARGS="$(get_lit_flags)"
diff --git a/dev-util/lttng-tools/Manifest b/dev-util/lttng-tools/Manifest
index 7e230f463099..33ae296a49ad 100644
--- a/dev-util/lttng-tools/Manifest
+++ b/dev-util/lttng-tools/Manifest
@@ -1,3 +1,2 @@
-DIST lttng-tools-2.10.9.tar.bz2 1254174 BLAKE2B 1666aab83bbdeb48a0c5764b359760346cfd9b55ee1677eac87a5d16f00c6c9e0f0952bf84486e0cbf9052ac1b485b276e230b36097b5366040db4e3112a3086 SHA512 2e390eb53bfbc874afd1c0c8273f9546fbe08da79fd2c9430eee8e348c05afba34bb6fe365165bf7468b284f7d88dcc16c37803d807109042c51cac1d8c2df1a
-DIST lttng-tools-2.11.0.tar.bz2 1479411 BLAKE2B 5abe2613c8a35b18587c75d75be8af85a37b52daa9ff36bf0126385e5f736f7084cac7815e858e48c26c1e3fe4bc9b00b8ebaf0ce339689bd9a0e177a518d51e SHA512 2b183296201cc62faa1f5afef3fdb67f089996479987d9e6e52e6286301f57a1015f017cc8b743496c30500579fcabde2945db3b7879ae5bd0a6723cfbdf99fb
+DIST lttng-tools-2.12.0.tar.bz2 1544515 BLAKE2B 642047348ef7bfe72c5ec718b4029c628fe2e23fd0a82517a8d5bb15a8cc3b84965d21b2f528a20530fb6ca8213e320d0dd6f36de09b34a53863c46ee272a470 SHA512 87613de34141c75b7ff0eb7b4292d26eea5381a7f298130cf5e802255aa7b0e55f43268dffed71b51d1e5dcd96b92cd517e13557fe64ee121bf1b419b2935a24
DIST lttng-tools-2.7.1.tar.bz2 984351 BLAKE2B 51d61857c56c3bffcaec80d8b57c18c96c3125d56f7feaa70e3ad44d108987a663734c17cf2553b1979061ae400c1e5bd0a30de4bf3bf5af28846403a3e055c1 SHA512 b0cafa5b74182a077232dbe2b73ed4e2267a921a62163367f0e7e14463e176d4538fc6ec27b8737f55fc417734677e5d22efc65685f885fa5f892f7900ee0e2d
diff --git a/dev-util/lttng-tools/lttng-tools-2.10.9.ebuild b/dev-util/lttng-tools/lttng-tools-2.10.9.ebuild
deleted file mode 100644
index fb1f24e3f845..000000000000
--- a/dev-util/lttng-tools/lttng-tools-2.10.9.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info
-
-MY_P="${P/_rc/-rc}"
-MY_SLOT="$(ver_cut 1-2)"
-
-DESCRIPTION="Linux Trace Toolkit - next generation"
-HOMEPAGE="https://lttng.org"
-SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+ust"
-
-DEPEND="dev-libs/userspace-rcu:=
- dev-libs/popt
- dev-libs/libxml2
- ust? ( dev-util/lttng-ust:= )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
- if kernel_is -lt 2 6 27; then
- ewarn "${PN} require Linux kernel >= 2.6.27"
- ewarn " pipe2(), epoll_create1() and SOCK_CLOEXEC are needed to run"
- ewarn " the session daemon. There were introduce in the 2.6.27"
- fi
-}
-
-src_configure() {
- econf $(usex ust "" --without-lttng-ust)
-}
diff --git a/dev-util/lttng-tools/lttng-tools-2.11.0.ebuild b/dev-util/lttng-tools/lttng-tools-2.12.0.ebuild
index fb1f24e3f845..be88227c25ae 100644
--- a/dev-util/lttng-tools/lttng-tools-2.11.0.ebuild
+++ b/dev-util/lttng-tools/lttng-tools-2.12.0.ebuild
@@ -20,20 +20,17 @@ IUSE="+ust"
DEPEND="dev-libs/userspace-rcu:=
dev-libs/popt
dev-libs/libxml2
- ust? ( dev-util/lttng-ust:= )
+ ust? ( >=dev-util/lttng-ust-2.12.0:= )
"
RDEPEND="${DEPEND}"
S="${WORKDIR}/${MY_P}"
-pkg_pretend() {
- if kernel_is -lt 2 6 27; then
- ewarn "${PN} require Linux kernel >= 2.6.27"
- ewarn " pipe2(), epoll_create1() and SOCK_CLOEXEC are needed to run"
- ewarn " the session daemon. There were introduce in the 2.6.27"
- fi
+src_configure() {
+ econf $(usex ust "" --without-lttng-ust) --disable-static
}
-src_configure() {
- econf $(usex ust "" --without-lttng-ust)
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
}
diff --git a/dev-util/lttng-ust/Manifest b/dev-util/lttng-ust/Manifest
index 855e45f3d722..c19ca7642412 100644
--- a/dev-util/lttng-ust/Manifest
+++ b/dev-util/lttng-ust/Manifest
@@ -1,4 +1,3 @@
-DIST lttng-ust-2.10.6.tar.bz2 804912 BLAKE2B e320cad821f143392a95e98cf99f5a23597c25f7d570ac5ce3206cb5b4b7bd931e5eb765a133e421e78307fbd882e33ba291cc2c19e37250a87844308d1af2f3 SHA512 a689838a621e99408bea0e5b6ccd4a930dc2103ecb05c8b472974eda9387b813b1b9e59d3aeb4d04434754cfab170723baf961cd5063116916da471c04165c50
DIST lttng-ust-2.11.0.tar.bz2 824285 BLAKE2B 161d50282a95cce47ab3811216241ade73e2002d8f03aa2266b5add36d06552f5620b912eeecff1173f43eec107b385f1b93783905f36a42baf5a63c37ea35fc SHA512 fb7258961a7e913487806a7e0129c95becff8c631382b119ff1d78f95cdd7460ec24e62671642160fdb006a3a292b2b10f35c8424f0367ce7c6a41cbcca77a09
-DIST lttng-ust-2.7.1.tar.bz2 643906 BLAKE2B 2ef4be03ce3b2bcc8e781c2b6e798ee00bb85d7f7039ad34fc49b3bfda46142d65fc98d19fefefb3e375e6f0de95292a1e15de25318b2da62b51d9fb017b43a1 SHA512 80ba4b79df2a0ba0606a31145a427c8c5b30e2a4ace20f9e4602738ace99fe88146569de549288ff33c809a606b6973c17c3effcf9699b5dca3383b8da5b10ee
+DIST lttng-ust-2.12.0.tar.bz2 853127 BLAKE2B 6a6655a4aa33ec6318255d05d0e000c19fb66d4049873f091b8e19f3f9ea0c15731db70af77dbab1d597edcafcd745f1dae2670cd38759c9b54ea38b1135b590 SHA512 d69772170f57b9669b99cea372ca537777151a31b82002e1e5ec80da3ceb302c23f0f85d63a2c95c90a375b879e266aa5297e7d6444050dd40feb1253d863801
DIST lttng-ust-2.8.1.tar.bz2 743271 BLAKE2B d6adac00525ab747306288dd71f27ce982dd93e4ff42b9938064ae1435ad1c0867acebe3030a33748dc9aa78b6200ba2c47631e4359a963772fc4685472d21ae SHA512 15c459620cb73ef5be8c7df2ef02663ef650555b973a3d1ed976ae38068b53a8c83143a611bcb53e91a3f211361c44cd2a331cb41dd53d28a69924f7ac44cc95
diff --git a/dev-util/lttng-ust/lttng-ust-2.10.6.ebuild b/dev-util/lttng-ust/lttng-ust-2.12.0.ebuild
index 576350634db5..a0aab3946489 100644
--- a/dev-util/lttng-ust/lttng-ust-2.10.6.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.12.0.ebuild
@@ -14,10 +14,12 @@ SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0/${MY_SLOT}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="examples"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples numa"
-DEPEND="dev-libs/userspace-rcu:="
+DEPEND="
+ dev-libs/userspace-rcu:=
+ numa? ( sys-process/numactl )"
RDEPEND="${DEPEND}"
S="${WORKDIR}"/${MY_P}
@@ -29,3 +31,12 @@ src_prepare() {
fi
eautoreconf
}
+
+src_configure() {
+ econf $(use_enable numa)
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-util/lttng-ust/lttng-ust-2.7.1.ebuild b/dev-util/lttng-ust/lttng-ust-2.7.1.ebuild
deleted file mode 100644
index c440ff6af2ce..000000000000
--- a/dev-util/lttng-ust/lttng-ust-2.7.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools versionator
-
-MY_P="${P/_rc/-rc}"
-MY_SLOT="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Linux Trace Toolkit - UST library"
-HOMEPAGE="https://lttng.org"
-SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/${MY_SLOT}"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="examples"
-
-DEPEND="dev-libs/userspace-rcu:="
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
- if ! use examples; then
- sed -i -e '/SUBDIRS/s:examples::' doc/Makefile.am || die
- fi
- eautoreconf
-}
diff --git a/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild b/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild
index 457768dbdee7..a09a68a5beaf 100644
--- a/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0/${MY_SLOT}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
IUSE="examples"
DEPEND="dev-libs/userspace-rcu:="
diff --git a/dev-util/meson-format-array/files/meson-format-array b/dev-util/meson-format-array/files/meson-format-array
new file mode 100644
index 000000000000..d2bf49ba8e59
--- /dev/null
+++ b/dev-util/meson-format-array/files/meson-format-array
@@ -0,0 +1,26 @@
+#!/usr/bin/env python3
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+import itertools
+import shlex
+import sys
+
+def quote(s):
+ return "'" + s.replace("\\", "\\\\").replace("'", "\\'") + "'"
+
+def main(args):
+ # Split each argument according to shell rules
+ args = (shlex.split(x) for x in args)
+
+ # Flatten the resulting list of lists
+ args = itertools.chain.from_iterable(args)
+
+ # Add quotes and escape embedded quotes
+ args = (quote(x) for x in args)
+
+ # Format the result
+ print("[" + ", ".join(args) + "]")
+
+if __name__ == "__main__":
+ main(sys.argv[1:])
diff --git a/dev-util/meson-format-array/meson-format-array-0.ebuild b/dev-util/meson-format-array/meson-format-array-0.ebuild
new file mode 100644
index 000000000000..32243a0fcdc2
--- /dev/null
+++ b/dev-util/meson-format-array/meson-format-array-0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit python-r1
+
+DESCRIPTION="Format shell expressions into a meson array"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RDEPEND="${PYTHON_DEPS}"
+S="${WORKDIR}"
+
+src_install() {
+ python_foreach_impl python_doscript "${FILESDIR}"/meson-format-array
+}
diff --git a/dev-util/eric/metadata.xml b/dev-util/meson-format-array/metadata.xml
index 106b71e3454b..c28990030fe5 100644
--- a/dev-util/eric/metadata.xml
+++ b/dev-util/meson-format-array/metadata.xml
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>qt@gentoo.org</email>
- <name>Gentoo Qt Project</name>
+ <maintainer type="person">
+ <email>floppym@gentoo.org</email>
+ <name>Mike Gilbert</name>
</maintainer>
- <upstream>
- <remote-id type="sourceforge">eric-ide</remote-id>
- </upstream>
+ <stabilize-allarches/>
<origin>gentoo-staging</origin>
</pkgmetadata>
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 56d8beb192ce..5f7789ec8134 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1 +1,2 @@
DIST meson-0.55.3.tar.gz 1740465 BLAKE2B 7d121f5d2bf487ae3c38be5ddccde6900134b9d0ea47868aac5625449e18a1a97ae0012849b795187221632cd3ac343097ef29b282753a1e8bd871c393d5c0e8 SHA512 afb0bb25b367e681131d920995124df4b06f6d144ae1a95ebec27be13e06fefbd95840e0287cd1d84bdbb8d9c115b589a833d847c60926f55e0f15749cf66bae
+DIST meson-0.56.2.tar.gz 1794847 BLAKE2B 350427e2ff4b4fe688220ca6279ff3361e1b2c7c573e1e0185ea9014fda73bc68929256073fe05855e3403638257e26477868d0a5683a5b91f6a74ee55a01f0e SHA512 3b6cc5cae31d756b251ecde3483d3710bceff50cfd03ef6cf6f939d9e599998e61fcb03a2ee09d6a6f9bfa2198f43e7f20447359de3bff1055febcf03e82e514
diff --git a/dev-util/meson/meson-0.55.3.ebuild b/dev-util/meson/meson-0.55.3.ebuild
index 87a8a5d001bd..99241b7a52c0 100644
--- a/dev-util/meson/meson-0.55.3.ebuild
+++ b/dev-util/meson/meson-0.55.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2020 Gentoo Authors
+# Copyright 2016-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999* ]]; then
inherit git-r3
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/meson/meson-0.56.2.ebuild b/dev-util/meson/meson-0.56.2.ebuild
new file mode 100644
index 000000000000..e584a34285b9
--- /dev/null
+++ b/dev-util/meson/meson-0.56.2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2016-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="https://github.com/mesonbuild/meson"
+ inherit git-r3
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="https://mesonbuild.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ test? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ dev-util/ninja
+ dev-vcs/git
+ sys-libs/zlib[static-libs(+)]
+ virtual/pkgconfig
+ )
+"
+
+python_prepare_all() {
+ local disable_unittests=(
+ # ASAN and sandbox both want control over LD_PRELOAD
+ # https://bugs.gentoo.org/673016
+ -e 's/test_generate_gir_with_address_sanitizer/_&/'
+
+ # ASAN is unsupported on some targets
+ # https://bugs.gentoo.org/692822
+ -e 's/test_pch_with_address_sanitizer/_&/'
+
+ # https://github.com/mesonbuild/meson/issues/7203
+ -e 's/test_templates/_&/'
+
+ # Broken due to python2 wrapper
+ -e 's/test_python_module/_&/'
+ )
+
+ sed -i "${disable_unittests[@]}" run_unittests.py || die
+
+ # Broken due to python2 script created by python_wrapper_setup
+ rm -r "test cases/frameworks/1 boost" || die
+
+ distutils-r1_python_prepare_all
+}
+
+src_test() {
+ tc-export PKG_CONFIG
+ if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
+ ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
+ else
+ # https://bugs.gentoo.org/687792
+ unset PKG_CONFIG
+ distutils-r1_src_test
+ fi
+}
+
+python_test() {
+ (
+ # test_meson_installed
+ unset PYTHONDONTWRITEBYTECODE
+
+ # test_cross_file_system_paths
+ unset XDG_DATA_HOME
+
+ ${EPYTHON} -u run_tests.py
+ ) || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ insinto /usr/share/vim/vimfiles
+ doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
+ insinto /usr/share/zsh/site-functions
+ doins data/shell-completions/zsh/_meson
+}
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index 8497a92cb9e3..e584a34285b9 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2020 Gentoo Authors
+# Copyright 2016-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999* ]]; then
inherit git-r3
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index d3e6796734cf..e26b0dbbb811 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -1,3 +1,3 @@
-DIST netbeans-12.0.zip 374859809 BLAKE2B d7f9d98e20c73218e93ef7d03840e67a6524bac6e4908bc23b7534fea6502a5d0cd9d1582da9f91b625b78e47f76ca5517ed945f9f98f673b92e7994e7ac3067 SHA512 91030c9628a08acd85f1a58a7f71eec2e57dc85841c1c475cc6311335b5d8cdc10c1198274b9668b7f61a28d04b07661247dc1c3e36b8e29214aec3748e499e4
-EBUILD netbeans-12.0.ebuild 1245 BLAKE2B 55866d59fb813714f6b773f7bc6421a0e9a939c7488dd4f381598eba59b9fc0f843dcf5d85d90d710aa7df823c6fd4aa13288016fc9e9ba1e8ea8269e1158b62 SHA512 32b5136b415408dc50abf0fd99fb61156b99837252155b9e7a0c418f519fcdc3c3cc9a6cda3997ae7a57b46c055392c1026b65de86afbd9704b3a70125281fa5
+DIST netbeans-12.2.zip 398020745 BLAKE2B e35f1a02491437a77826ee7c2a9d51922b0f1bbafe2cc205de23708849b9109f2aa15735d1df7c78650e3bca0705c831d92c32f22e39ffe59905ebcc60120cf0 SHA512 b25cda9830e8fe1d05687b08cc5fa9bcac7e8e6d12776998a4da7e483b3be0d04493345e56be7e6198fa8f86428d57d4459bfa7372c2e3f918f4a1101d0a31a7
+EBUILD netbeans-12.2.ebuild 1245 BLAKE2B 55866d59fb813714f6b773f7bc6421a0e9a939c7488dd4f381598eba59b9fc0f843dcf5d85d90d710aa7df823c6fd4aa13288016fc9e9ba1e8ea8269e1158b62 SHA512 32b5136b415408dc50abf0fd99fb61156b99837252155b9e7a0c418f519fcdc3c3cc9a6cda3997ae7a57b46c055392c1026b65de86afbd9704b3a70125281fa5
EBUILD netbeans-9999.ebuild 1245 BLAKE2B 55866d59fb813714f6b773f7bc6421a0e9a939c7488dd4f381598eba59b9fc0f843dcf5d85d90d710aa7df823c6fd4aa13288016fc9e9ba1e8ea8269e1158b62 SHA512 32b5136b415408dc50abf0fd99fb61156b99837252155b9e7a0c418f519fcdc3c3cc9a6cda3997ae7a57b46c055392c1026b65de86afbd9704b3a70125281fa5
diff --git a/dev-util/netbeans/netbeans-12.0.ebuild b/dev-util/netbeans/netbeans-12.2.ebuild
index a213700b6c9a..a213700b6c9a 100644
--- a/dev-util/netbeans/netbeans-12.0.ebuild
+++ b/dev-util/netbeans/netbeans-12.2.ebuild
diff --git a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.8-r1.ebuild b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.8-r1.ebuild
index 43ec99bcda5a..a7c8e561fd64 100644
--- a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.8-r1.ebuild
+++ b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.8-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~m68k-mint"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.9.ebuild b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.9.ebuild
index 70b4b63fad4f..93a0b894709c 100644
--- a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.9.ebuild
+++ b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~m68k-mint"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/ninja/ninja-1.10.0.ebuild b/dev-util/ninja/ninja-1.10.0.ebuild
index dbf45ecaf5fa..76cc35699dbc 100644
--- a/dev-util/ninja/ninja-1.10.0.ebuild
+++ b/dev-util/ninja/ninja-1.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2012-2020 Gentoo Authors
+# Copyright 2012-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
else
SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/ninja/ninja-1.10.1.ebuild b/dev-util/ninja/ninja-1.10.1.ebuild
index 896491b7fc78..0bfa8a2d7a82 100644
--- a/dev-util/ninja/ninja-1.10.1.ebuild
+++ b/dev-util/ninja/ninja-1.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2012-2020 Gentoo Authors
+# Copyright 2012-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
else
SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/ninja/ninja-1.10.2-r1.ebuild b/dev-util/ninja/ninja-1.10.2-r1.ebuild
new file mode 100644
index 000000000000..6c6df7aabade
--- /dev/null
+++ b/dev-util/ninja/ninja-1.10.2-r1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 2012-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
+else
+ SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A small build system similar to make"
+HOMEPAGE="https://ninja-build.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+IUSE="doc emacs test vim-syntax"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-util/re2c
+ doc? (
+ app-text/asciidoc
+ app-doc/doxygen
+ dev-libs/libxslt
+ )
+ test? ( dev-cpp/gtest )
+"
+RDEPEND="
+ emacs? ( >=app-editors/emacs-23.1:* )
+ vim-syntax? (
+ || (
+ app-editors/vim
+ app-editors/gvim
+ )
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/ninja-cflags.patch
+)
+
+run_for_build() {
+ if tc-is-cross-compiler; then
+ local -x AR=$(tc-getBUILD_AR)
+ local -x CXX=$(tc-getBUILD_CXX)
+ local -x CFLAGS=
+ local -x CXXFLAGS=${BUILD_CXXFLAGS}
+ local -x LDFLAGS=${BUILD_LDFLAGS}
+ fi
+ echo "$@" >&2
+ "$@"
+}
+
+src_compile() {
+ tc-export AR CXX
+
+ # configure.py appends CFLAGS to CXXFLAGS
+ unset CFLAGS
+
+ # enable LFS, bug #760848
+ export CXXFLAGS+=" -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+ BUILD_CXXFLAGS+=" -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+
+ run_for_build ${EPYTHON} configure.py --bootstrap --verbose || die
+
+ if tc-is-cross-compiler; then
+ mv ninja ninja-build || die
+ ${EPYTHON} configure.py || die
+ ./ninja-build -v ninja || die
+ else
+ ln ninja ninja-build || die
+ fi
+
+ if use doc; then
+ ./ninja-build -v doxygen manual || die
+ fi
+
+ if use emacs; then
+ elisp-compile misc/ninja-mode.el || die
+ fi
+}
+
+src_test() {
+ if ! tc-is-cross-compiler; then
+ # Bug 485772
+ ulimit -n 2048
+ ./ninja -v ninja_test || die
+ ./ninja_test || die
+ fi
+}
+
+src_install() {
+ dodoc README.md CONTRIBUTING.md
+ if use doc; then
+ docinto html
+ dodoc -r doc/doxygen/html/.
+ dodoc doc/manual.html
+ fi
+ dobin ninja
+
+ newbashcomp misc/bash-completion "${PN}"
+
+ if use vim-syntax; then
+ insinto /usr/share/vim/vimfiles/syntax/
+ doins misc/ninja.vim
+
+ echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/ninja.vim"
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins "${T}/ninja.vim"
+ fi
+
+ insinto /usr/share/zsh/site-functions
+ newins misc/zsh-completion _ninja
+
+ if use emacs; then
+ cd misc || die
+ elisp-install ninja ninja-mode.el* || die
+ fi
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/dev-util/ninja/ninja-1.10.2.ebuild b/dev-util/ninja/ninja-1.10.2.ebuild
index 7a9b934dae96..df4ef43ea0bd 100644
--- a/dev-util/ninja/ninja-1.10.2.ebuild
+++ b/dev-util/ninja/ninja-1.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2012-2020 Gentoo Authors
+# Copyright 2012-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
else
SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild
index d0b59e0d15b7..7756f850f661 100644
--- a/dev-util/ninja/ninja-9999.ebuild
+++ b/dev-util/ninja/ninja-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2012-2020 Gentoo Authors
+# Copyright 2012-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
else
SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
fi
DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/nvidia-cuda-sdk/Manifest b/dev-util/nvidia-cuda-sdk/Manifest
index 621bbc650147..6ecb53f880f4 100644
--- a/dev-util/nvidia-cuda-sdk/Manifest
+++ b/dev-util/nvidia-cuda-sdk/Manifest
@@ -1,10 +1,3 @@
-DIST cuda_10.1.243_418.87.00_linux.run 2572375299 BLAKE2B df9cb4faeeeeecc536e72697c6c73d544219f1b23cacb7fed646b0908fc7e573e85920861d56f76776ba637d84964cd1c789a0fe0d6541a4e0adf618b6c74d3c SHA512 f92b19d0242969a65a6e6db43bc293e442abc07a9e168c9e995692e1a401679504598c782e511be3879e1650b90f71a50bbc63c9ee45654c26b5007cdf33c4fe
DIST cuda_10.2.89_440.33.01_linux.run 2645419389 BLAKE2B 236aa70a7b45e3636c2c229fffa7d1ca0699ab4365865a73edab607a209c42c2899133dd6a83c61c5929fa754668ad15aec4d847639af1c00a8e6657c8487c77 SHA512 ad8da539ff5df7caf411d1e497ff3d6978cfa8a1fd9150fa4846089e92a604ea56be8631f3efdfe7229a655b8d2d28e6edb32f5731530a77d6f00241cc7aab6e
-DIST cuda_6.5.19_linux_32.run 81882112 BLAKE2B cf55ef7c969503c156431fc56301ed4e9a1234ae0cb867f12649636069f35e56bf6fc9df7482b6baade45d78c8baa2d98c41a28696da59294e0f575c4a0344ce SHA512 1ce9bd6b472b7e4f1fb181eb340dfcb757714d59a89aaa02146cfe1a97c8ccb7eb7699b4ec823276f277eb4d82d95050eaba17e7ed5fd2e47b9b5d78531c5d4e
-DIST cuda_6.5.19_linux_64.run 982446238 BLAKE2B 517ac07d4717f4f5d9427616a387dbe01fe35b7b6845b5d9e29aad18814243d38cc9a3cd0ff9042c027fcb056618e9a8535d560c16a6ac7998ff39fcf3ada654 SHA512 06854f020a5f72cf4bd714859e6966248ac2f589284113674e869fdaa1254cae27d4101940758ecda5df4724ad3e448a1f6d0c053b6cbc28107750872b6a5797
-DIST cuda_7.5.18_linux.run 1195424633 BLAKE2B 35933c3c3355231cd59e579e6ac6a30cca57ed0e3de26ce5cac368ff22595f39cb041c9696415d4d76a49e772b7828eacab24a3e581c1e9a8ef7981e1b044eee SHA512 97459dfd124060200f1c43f763e5bce0bea53e35ed4bef72bee6c8ba1c04ecffb8695af11755443513316f91fdb5cb4d35662f7b87bca7e3de85d562d4e49363
-DIST cuda_8.0.44_linux.run 1457082926 BLAKE2B a6408ddf8984dc4b0725cc4f53549c4d4fc4b3bd4de2771896953dbe023aa6d04ad38f5d6bf1ab3ff5752d2c18b400f478c9dbb263755267836c5de79e4f8f51 SHA512 1bf9d8e6b853c2a971b8d908a043adc5b11ec7033faed04a773c42680882753f98bc33b46f6b301c24c0f780f74bc237dce5766fc857f1a905e6c1f200728d86
DIST cuda_8.0.61_375.26_linux.run 1465528129 BLAKE2B d52ddf1dcf5246f230f210d10d1f6e7b540c892dea5a8cd770f0d062b30b01f5c8467d930430b383464d40a9b4a14eaaf22a365e081955e4452ec4f55e08da0b SHA512 d22303719a9feff64f95bf6a966f1caa2bf0cf8c955e475ce08ce54faa5e098d336c2db223ef0185c1f23b9c52b7d2f81a63515485219cfc016d72bda979248b
-DIST cuda_9.0.176_384.81_linux.run 1643293725 BLAKE2B 4155de544f877f6c420c2463bc68679cc89774f0516d1885d5c3f483ad86e7f25ecf6042b8240431b814230136f3026196a013bb18184fa2ec9af555bb7ea723 SHA512 00e24638c02d049c575732dee5237db21f7c451b606f37cf95e44e89d47d0cb055255e9f70dc013298c9e0d224147f239488558904556b68572e3f31935489a9
-DIST cuda_9.1.85_387.26_linux.run 1639829845 BLAKE2B c9f6544893b8e4d0b4c51d66f1cf17a593e65af6e7748e2994abda8ffcb839a7bb19cb0eebfbc52347293296025f000241d1c9842af0c41d31928770c4639b79 SHA512 492a5fa58fc93ac718ca093f24bb5e74dd2586338c42f2e11e328c7f16756e3511a1c555b12cb1990bb782d0d1600976f4c9e5b3d4857e371b0431daf06b2827
DIST cuda_9.2.88_396.26_linux.run 1758421686 BLAKE2B 5068b2dfae87e43c124a6a72ac98b7c562aebc7161e7c977cfba68342127e99705228be531aa5bb8af0318e17c4ef8fe36257452d0f507fc3b82e3fbd0184bdc SHA512 2d0d87926e11a1b21d6d3377138753df458a53ba9539d8399f9f252e0784cb41e2c63a5c724ca81ded82b9657b97fda51d812b467b0827e7d361aa2ad73b2dba
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-10.1.243.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-10.1.243.ebuild
deleted file mode 100644
index e63a0c26df91..000000000000
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-10.1.243.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cuda flag-o-matic portability toolchain-funcs unpacker
-
-MYD=$(ver_cut 1-2 ${PV})
-DRIVER_PV="418.87.00"
-
-DESCRIPTION="NVIDIA CUDA Software Development Kit"
-HOMEPAGE="https://developer.nvidia.com/cuda-zone"
-SRC_URI="https://developer.download.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run -> cuda_${PV}_${DRIVER_PV}_linux.run"
-
-LICENSE="CUDPP"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="+cuda debug +doc +examples opencl mpi"
-
-RDEPEND="
- ~dev-util/nvidia-cuda-toolkit-${PV}
- media-libs/freeglut
- examples? (
- media-libs/freeimage
- media-libs/glew:0=
- !prefix? ( >=x11-drivers/nvidia-drivers-${DRIVER_PV}[uvm] )
- mpi? ( virtual/mpi )
- )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S=${WORKDIR}/builds/cuda-samples
-
-QA_EXECSTACK=(
- opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
- opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
- opt/cuda/sdk/bin/x86_64/linux/release/cdpSimplePrint
- opt/cuda/sdk/bin/x86_64/linux/release/cdpSimpleQuicksort
- )
-
-src_prepare() {
- cuda_src_prepare
-
- export RAWLDFLAGS="$(raw-ldflags)"
-# epatch "${FILESDIR}"/${P}-asneeded.patch
-
- local file
- while IFS="" read -d $'\0' -r file; do
- sed \
- -e 's:-O[23]::g' \
- -e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
- -e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
- -e "/CC/s:gcc:$(tc-getCC):g" \
- -e "/GCC/s:g++:$(tc-getCXX):g" \
- -e "/NVCC /s|\(:=\).*|:= ${EPREFIX}/opt/cuda/bin/nvcc|g" \
- -e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
- -e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
- -e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
- -e 's:-Wimplicit::g' \
- -e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
- -e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
- -e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
- -i "${file}" || die
- # -e "/ALL_LDFLAGS/s|:=|:= ${RAWLDFLAGS} |g" \
- done < <(find . -type f -name 'Makefile' -print0)
-
- rm -rf common/inc/GL || die
- find . -type f -name '*.a' -delete || die
-
- eapply_user
-}
-
-src_compile() {
- use examples || return
- local myopts=("verbose=1")
- use debug && myopts+=("dbg=1")
- export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
- emake \
- cuda-install="${EPREFIX}/opt/cuda" \
- CUDA_PATH="${EPREFIX}/opt/cuda/" \
- MPI_GCC=10 \
- "${myopts[@]}"
-}
-
-src_test() {
- addwrite /dev/nvidiactl
- addwrite /dev/nvidia0
-
- local i
- for i in {0..9}*/*; do
- emake -C "${i}" run
- done
-}
-
-src_install() {
- local f t crap=( *.txt Samples.htm* )
-
- if use doc; then
- ebegin "Installing docs ..."
- while IFS="" read -d $'\0' -r f; do
- treecopy "${f}" "${ED}"/usr/share/doc/${PF}/
- done < <(find -type f \( -name 'readme.txt' -o -name '*.pdf' \) -print0)
-
- while IFS="" read -d $'\0' -r f; do
- docompress -x "${f#${ED}}"
- done < <(find "${ED}"/usr/share/doc/${PF}/ -type f -name 'readme.txt' -print0)
- eend
- fi
-
- ebegin "Cleaning before installation..."
- for f in "${crap[@]}"; do
- rm -f "${f}" || die
- done
- find -type f \( -name '*.o' -o -name '*.pdf' -o -name 'readme.txt' \) -delete || die
- eend
-
- ebegin "Moving files..."
- while IFS="" read -d $'\0' -r f; do
- t="$(dirname ${f})"
- if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
- continue
- fi
- if [[ -x ${f} ]]; then
- exeinto /opt/cuda/sdk/"${t}"
- doexe "${f}"
- else
- insinto /opt/cuda/sdk/"${t}"
- doins "${f}"
- fi
- done < <(find . -type f -print0)
- eend
-}
-
-pkg_postinst() {
- if use examples && use prefix; then
- ewarn "Gentoo Prefix does not manage kernel modules. You need to make certain"
- ewarn "the function counterpart to >=x11-drivers/nvidia-drivers-${DRIVER_PV}[uvm]"
- ewarn "is available from the host"
- fi
-}
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.19.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.19.ebuild
deleted file mode 100644
index db16051ffe39..000000000000
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-6.5.19.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cuda eutils flag-o-matic portability toolchain-funcs unpacker versionator
-
-MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
-
-DESCRIPTION="NVIDIA CUDA Software Development Kit"
-HOMEPAGE="https://developer.nvidia.com/cuda"
-CURI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel/installers"
-SRC_URI="
- amd64? ( ${CURI}/cuda_${PV}_linux_64.run )
- x86? ( ${CURI}/cuda_${PV}_linux_32.run )"
-
-LICENSE="CUDPP"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +doc +examples opencl +cuda"
-
-RDEPEND="
- ~dev-util/nvidia-cuda-toolkit-${PV}
- media-libs/freeglut
- examples? (
- media-libs/freeimage
- media-libs/glew:0=
- virtual/mpi
- >=x11-drivers/nvidia-drivers-340.32[uvm]
- x86? ( <x11-drivers/nvidia-drivers-346.35[uvm] )
- )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S=${WORKDIR}/cuda-samples
-
-QA_EXECSTACK=(
- opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
- opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
- opt/cuda/sdk/bin/x86_64/linux/release/cdpSimplePrint
- opt/cuda/sdk/bin/x86_64/linux/release/cdpSimpleQuicksort
- )
-
-src_unpack() {
- unpacker
- unpacker run_files/cuda-samples*run
-}
-
-pkg_setup() {
- if use cuda || use opencl; then
- cuda_pkg_setup
- fi
-
- if use x86; then
- ewarn "Starting with version 6.5 NVIDIA dropped more and more"
- ewarn "the support for 32bit linux."
- ewarn "Be aware that bugfixes and new features may not be available."
- ewarn "https://dev.gentoo.org/~jlec/distfiles/CUDA_Toolkit_Release_Notes.pdf"
- fi
-}
-
-src_prepare() {
- export RAWLDFLAGS="$(raw-ldflags)"
-# epatch "${FILESDIR}"/${P}-asneeded.patch
-
- sed \
- -e 's:-O2::g' \
- -e 's:-O3::g' \
- -e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
- -e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
- -e "/CC/s:gcc:$(tc-getCC):g" \
- -e "/GCC/s:g++:$(tc-getCXX):g" \
- -e "/NVCC /s|\(:=\).*|:= ${EPREFIX}/opt/cuda/bin/nvcc|g" \
- -e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
- -e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
- -e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
- -e 's:-Wimplicit::g' \
- -e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$(pkg-config --libs glew)|g" \
- -e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$(pkg-config --libs glew)|g" \
- -e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$(pkg-config --libs glew)|g" \
- -i $(find . -type f -name "Makefile") || die
-
-# -e "/ALL_LDFLAGS/s|:=|:= ${RAWLDFLAGS} |g" \
- find common/inc/GL -delete || die
- find . -type f -name "*\.a" -delete || die
-
- eapply_user
-}
-
-src_compile() {
- use examples || return
- local myopts verbose="verbose=1"
- use debug && myopts+=" dbg=1"
- export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
- emake \
- cuda-install="${EPREFIX}/opt/cuda" \
- CUDA_PATH="${EPREFIX}/opt/cuda/" \
- MPI_GCC=10 \
- ${myopts} ${verbose}
-}
-
-src_test() {
- local _dir _subdir
-
- addwrite /dev/nvidiactl
- addwrite /dev/nvidia0
-
- for _dir in {0..9}*; do
- pushd ${_dir} > /dev/null
- for _subdir in *; do
- emake -C ${_subdir} run
- done
- popd > /dev/null
- done
-}
-
-src_install() {
- local i j f t crap=""
-
- if use doc; then
- ebegin "Installing docs ..."
- treecopy $(find -type f \( -name readme.txt -o -name "*.pdf" \)) "${ED}"/usr/share/doc/${PF}/
- docompress -x $(find "${ED}"/usr/share/doc/${PF}/ -type f -name readme.txt | sed -e "s:${ED}::")
- eend
- fi
-
- crap+=" *.txt Samples.htm*"
-
- ebegin "Cleaning before installation..."
- for i in ${crap}; do
- if [[ -e ${i} ]]; then
- find ${i} -delete || die
- fi
- done
- find -type f \( -name "*.o" -o -name "*.pdf" -o -name "readme.txt" \) -delete || die
- eend
-
- ebegin "Moving files..."
- for f in $(find .); do
- local t="$(dirname ${f})"
- if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
- continue
- fi
- if [[ ! -d ${f} ]]; then
- if [[ -x ${f} ]]; then
- exeinto /opt/cuda/sdk/${t}
- doexe ${f}
- else
- insinto /opt/cuda/sdk/${t}
- doins ${f}
- fi
- fi
- done
- eend
-}
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-7.5.18.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-7.5.18.ebuild
deleted file mode 100644
index f3d256ec6cd5..000000000000
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-7.5.18.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cuda eutils flag-o-matic portability toolchain-funcs unpacker versionator
-
-MYD=$(get_version_component_range 1-2)
-
-DESCRIPTION="NVIDIA CUDA Software Development Kit"
-HOMEPAGE="https://developer.nvidia.com/cuda-downloads"
-SRC_URI="http://developer.download.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_linux.run"
-
-LICENSE="CUDPP"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="debug +doc +examples opencl +cuda"
-
-RDEPEND="
- ~dev-util/nvidia-cuda-toolkit-${PV}
- media-libs/freeglut
- examples? (
- media-libs/freeimage
- media-libs/glew:0=
- virtual/mpi
- >=x11-drivers/nvidia-drivers-352.39[uvm]
- )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S=${WORKDIR}/samples
-
-QA_EXECSTACK=(
- opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
- opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
- opt/cuda/sdk/bin/x86_64/linux/release/cdpSimplePrint
- opt/cuda/sdk/bin/x86_64/linux/release/cdpSimpleQuicksort
- )
-
-src_unpack() {
- unpacker
- unpacker run_files/cuda-samples*run
-}
-
-pkg_setup() {
- if use cuda || use opencl; then
- cuda_pkg_setup
- fi
-}
-
-src_prepare() {
- export RAWLDFLAGS="$(raw-ldflags)"
-# epatch "${FILESDIR}"/${P}-asneeded.patch
-
- sed \
- -e 's:-O2::g' \
- -e 's:-O3::g' \
- -e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
- -e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
- -e "/CC/s:gcc:$(tc-getCC):g" \
- -e "/GCC/s:g++:$(tc-getCXX):g" \
- -e "/NVCC /s|\(:=\).*|:= ${EPREFIX}/opt/cuda/bin/nvcc|g" \
- -e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
- -e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
- -e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
- -e 's:-Wimplicit::g' \
- -e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
- -e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
- -e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
- -i $(find . -type f -name "Makefile") || die
-
-# -e "/ALL_LDFLAGS/s|:=|:= ${RAWLDFLAGS} |g" \
- find common/inc/GL -delete || die
- find . -type f -name "*\.a" -delete || die
-}
-
-src_compile() {
- use examples || return
- local myopts verbose="verbose=1"
- use debug && myopts+=" dbg=1"
- export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
- emake \
- cuda-install="${EPREFIX}/opt/cuda" \
- CUDA_PATH="${EPREFIX}/opt/cuda/" \
- MPI_GCC=10 \
- ${myopts} ${verbose}
-}
-
-src_test() {
- local _dir _subdir
-
- addwrite /dev/nvidiactl
- addwrite /dev/nvidia0
-
- for _dir in {0..9}*; do
- pushd ${_dir} > /dev/null
- for _subdir in *; do
- emake -C ${_subdir} run
- done
- popd > /dev/null
- done
-}
-
-src_install() {
- local i j f t crap=""
-
- if use doc; then
- ebegin "Installing docs ..."
- treecopy $(find -type f \( -name readme.txt -o -name "*.pdf" \)) "${ED}"/usr/share/doc/${PF}/
- docompress -x $(find "${ED}"/usr/share/doc/${PF}/ -type f -name readme.txt | sed -e "s:${ED}::")
- eend
- fi
-
- crap+=" *.txt Samples.htm*"
-
- ebegin "Cleaning before installation..."
- for i in ${crap}; do
- if [[ -e ${i} ]]; then
- find ${i} -delete || die
- fi
- done
- find -type f \( -name "*.o" -o -name "*.pdf" -o -name "readme.txt" \) -delete || die
- eend
-
- ebegin "Moving files..."
- for f in $(find .); do
- local t="$(dirname ${f})"
- if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
- continue
- fi
- if [[ ! -d ${f} ]]; then
- if [[ -x ${f} ]]; then
- exeinto /opt/cuda/sdk/${t}
- doexe ${f}
- else
- insinto /opt/cuda/sdk/${t}
- doins ${f}
- fi
- fi
- done
- eend
-}
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-8.0.44-r1.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-8.0.44-r1.ebuild
deleted file mode 100644
index 4015cff5dca8..000000000000
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-8.0.44-r1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cuda eutils flag-o-matic portability toolchain-funcs unpacker versionator
-
-MYD=$(get_version_component_range 1-2)
-
-DESCRIPTION="NVIDIA CUDA Software Development Kit"
-HOMEPAGE="https://developer.nvidia.com/cuda-zone"
-SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/prod/local_installers/cuda_${PV}_linux-run -> cuda_${PV}_linux.run"
-
-LICENSE="CUDPP"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="+cuda debug +doc +examples opencl mpi"
-
-RDEPEND="
- ~dev-util/nvidia-cuda-toolkit-${PV}
- media-libs/freeglut
- examples? (
- media-libs/freeimage
- media-libs/glew:0=
- >=x11-drivers/nvidia-drivers-367.44[uvm]
- mpi? ( virtual/mpi )
- )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S=${WORKDIR}/samples
-
-QA_EXECSTACK=(
- opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
- opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
- opt/cuda/sdk/bin/x86_64/linux/release/cdpSimplePrint
- opt/cuda/sdk/bin/x86_64/linux/release/cdpSimpleQuicksort
- )
-
-src_unpack() {
- # We first need to unpack the cuda_${PV}_linux.run file
- # which includes the cuda-samples*run file.
- unpacker
- unpacker run_files/cuda-samples*run
-}
-
-pkg_setup() {
- if use cuda || use opencl; then
- cuda_pkg_setup
- fi
-}
-
-src_prepare() {
- export RAWLDFLAGS="$(raw-ldflags)"
-# epatch "${FILESDIR}"/${P}-asneeded.patch
-
- local file
- while IFS="" read -d $'\0' -r file; do
- sed \
- -e 's:-O[23]::g' \
- -e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
- -e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
- -e "/CC/s:gcc:$(tc-getCC):g" \
- -e "/GCC/s:g++:$(tc-getCXX):g" \
- -e "/NVCC /s|\(:=\).*|:= ${EPREFIX}/opt/cuda/bin/nvcc|g" \
- -e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
- -e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
- -e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
- -e 's:-Wimplicit::g' \
- -e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
- -e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
- -e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
- -i "${file}" || die
- # -e "/ALL_LDFLAGS/s|:=|:= ${RAWLDFLAGS} |g" \
- done < <(find . -type f -name 'Makefile' -print0)
-
- rm -rf common/inc/GL || die
- find . -type f -name '*.a' -delete || die
-
- eapply_user
-}
-
-src_compile() {
- use examples || return
- local myopts=("verbose=1")
- use debug && myopts+=("dbg=1")
- export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
- emake \
- cuda-install="${EPREFIX}/opt/cuda" \
- CUDA_PATH="${EPREFIX}/opt/cuda/" \
- MPI_GCC=10 \
- "${myopts[@]}"
-}
-
-src_test() {
- addwrite /dev/nvidiactl
- addwrite /dev/nvidia0
-
- local i
- for i in {0..9}*/*; do
- emake -C "${i}" run
- done
-}
-
-src_install() {
- local f t crap=( *.txt Samples.htm* )
-
- if use doc; then
- ebegin "Installing docs ..."
- while IFS="" read -d $'\0' -r f; do
- treecopy "${f}" "${ED%/}"/usr/share/doc/${PF}/
- done < <(find -type f \( -name 'readme.txt' -o -name '*.pdf' \) -print0)
-
- while IFS="" read -d $'\0' -r f; do
- docompress -x "${f#${ED%/}}"
- done < <(find "${ED%/}"/usr/share/doc/${PF}/ -type f -name 'readme.txt' -print0)
- eend
- fi
-
- ebegin "Cleaning before installation..."
- for f in "${crap[@]}"; do
- rm -f "${f}" || die
- done
- find -type f \( -name '*.o' -o -name '*.pdf' -o -name 'readme.txt' \) -delete || die
- eend
-
- ebegin "Moving files..."
- while IFS="" read -d $'\0' -r f; do
- t="$(dirname ${f})"
- if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
- continue
- fi
- if [[ -x ${f} ]]; then
- exeinto /opt/cuda/sdk/"${t}"
- doexe "${f}"
- else
- insinto /opt/cuda/sdk/"${t}"
- doins "${f}"
- fi
- done < <(find . -type f -print0)
- eend
-}
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.0.176.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.0.176.ebuild
deleted file mode 100644
index d70ad3f42d8f..000000000000
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.0.176.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cuda eutils flag-o-matic portability toolchain-funcs unpacker versionator
-
-MYD=$(get_version_component_range 1-2)
-DRIVER_PV="384.81"
-
-DESCRIPTION="NVIDIA CUDA Software Development Kit"
-HOMEPAGE="https://developer.nvidia.com/cuda-zone"
-SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux-run -> cuda_${PV}_${DRIVER_PV}_linux.run"
-
-LICENSE="CUDPP"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="+cuda debug +doc +examples opencl mpi"
-
-RDEPEND="
- ~dev-util/nvidia-cuda-toolkit-${PV}
- media-libs/freeglut
- examples? (
- media-libs/freeimage
- media-libs/glew:0=
- >=x11-drivers/nvidia-drivers-384.81[uvm]
- mpi? ( virtual/mpi )
- )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S=${WORKDIR}/samples
-
-QA_EXECSTACK=(
- opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
- opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
- opt/cuda/sdk/bin/x86_64/linux/release/cdpSimplePrint
- opt/cuda/sdk/bin/x86_64/linux/release/cdpSimpleQuicksort
- )
-
-src_unpack() {
- # We first need to unpack the cuda_${PV}_linux.run file
- # which includes the cuda-samples*run file.
- unpacker
- unpacker run_files/cuda-samples*run
-}
-
-pkg_setup() {
- if use cuda || use opencl; then
- cuda_pkg_setup
- fi
-}
-
-src_prepare() {
- export RAWLDFLAGS="$(raw-ldflags)"
-# epatch "${FILESDIR}"/${P}-asneeded.patch
-
- local file
- while IFS="" read -d $'\0' -r file; do
- sed \
- -e 's:-O[23]::g' \
- -e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
- -e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
- -e "/CC/s:gcc:$(tc-getCC):g" \
- -e "/GCC/s:g++:$(tc-getCXX):g" \
- -e "/NVCC /s|\(:=\).*|:= ${EPREFIX}/opt/cuda/bin/nvcc|g" \
- -e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
- -e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
- -e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
- -e 's:-Wimplicit::g' \
- -e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
- -e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
- -e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
- -i "${file}" || die
- # -e "/ALL_LDFLAGS/s|:=|:= ${RAWLDFLAGS} |g" \
- done < <(find . -type f -name 'Makefile' -print0)
-
- rm -rf common/inc/GL || die
- find . -type f -name '*.a' -delete || die
-
- eapply_user
-}
-
-src_compile() {
- use examples || return
- local myopts=("verbose=1")
- use debug && myopts+=("dbg=1")
- export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
- emake \
- cuda-install="${EPREFIX}/opt/cuda" \
- CUDA_PATH="${EPREFIX}/opt/cuda/" \
- MPI_GCC=10 \
- "${myopts[@]}"
-}
-
-src_test() {
- addwrite /dev/nvidiactl
- addwrite /dev/nvidia0
-
- local i
- for i in {0..9}*/*; do
- emake -C "${i}" run
- done
-}
-
-src_install() {
- local f t crap=( *.txt Samples.htm* )
-
- if use doc; then
- ebegin "Installing docs ..."
- while IFS="" read -d $'\0' -r f; do
- treecopy "${f}" "${ED%/}"/usr/share/doc/${PF}/
- done < <(find -type f \( -name 'readme.txt' -o -name '*.pdf' \) -print0)
-
- while IFS="" read -d $'\0' -r f; do
- docompress -x "${f#${ED%/}}"
- done < <(find "${ED%/}"/usr/share/doc/${PF}/ -type f -name 'readme.txt' -print0)
- eend
- fi
-
- ebegin "Cleaning before installation..."
- for f in "${crap[@]}"; do
- rm -f "${f}" || die
- done
- find -type f \( -name '*.o' -o -name '*.pdf' -o -name 'readme.txt' \) -delete || die
- eend
-
- ebegin "Moving files..."
- while IFS="" read -d $'\0' -r f; do
- t="$(dirname ${f})"
- if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
- continue
- fi
- if [[ -x ${f} ]]; then
- exeinto /opt/cuda/sdk/"${t}"
- doexe "${f}"
- else
- insinto /opt/cuda/sdk/"${t}"
- doins "${f}"
- fi
- done < <(find . -type f -print0)
- eend
-}
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.1.85.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.1.85.ebuild
deleted file mode 100644
index 1f648f706dc4..000000000000
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.1.85.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cuda flag-o-matic portability toolchain-funcs unpacker versionator
-
-MYD=$(get_version_component_range 1-2)
-DRIVER_PV="387.26"
-
-DESCRIPTION="NVIDIA CUDA Software Development Kit"
-HOMEPAGE="https://developer.nvidia.com/cuda-zone"
-SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod2/local_installers/cuda_${PV}_${DRIVER_PV}_linux -> cuda_${PV}_${DRIVER_PV}_linux.run"
-
-LICENSE="CUDPP"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="+cuda debug +doc +examples opencl mpi"
-
-RDEPEND="
- ~dev-util/nvidia-cuda-toolkit-${PV}
- media-libs/freeglut
- examples? (
- media-libs/freeimage
- media-libs/glew:0=
- >=x11-drivers/nvidia-drivers-${DRIVER_PV}[uvm]
- mpi? ( virtual/mpi )
- )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S=${WORKDIR}/samples
-
-QA_EXECSTACK=(
- opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
- opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
- opt/cuda/sdk/bin/x86_64/linux/release/cdpSimplePrint
- opt/cuda/sdk/bin/x86_64/linux/release/cdpSimpleQuicksort
- )
-
-src_unpack() {
- # We first need to unpack the cuda_${PV}_linux.run file
- # which includes the cuda-samples*run file.
- unpacker
- unpacker run_files/cuda-samples*run
-}
-
-pkg_setup() {
- if use cuda || use opencl; then
- cuda_pkg_setup
- fi
-}
-
-src_prepare() {
- export RAWLDFLAGS="$(raw-ldflags)"
-# epatch "${FILESDIR}"/${P}-asneeded.patch
-
- local file
- while IFS="" read -d $'\0' -r file; do
- sed \
- -e 's:-O[23]::g' \
- -e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
- -e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
- -e "/CC/s:gcc:$(tc-getCC):g" \
- -e "/GCC/s:g++:$(tc-getCXX):g" \
- -e "/NVCC /s|\(:=\).*|:= ${EPREFIX}/opt/cuda/bin/nvcc|g" \
- -e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
- -e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
- -e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
- -e 's:-Wimplicit::g' \
- -e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
- -e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
- -e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
- -i "${file}" || die
- # -e "/ALL_LDFLAGS/s|:=|:= ${RAWLDFLAGS} |g" \
- done < <(find . -type f -name 'Makefile' -print0)
-
- rm -rf common/inc/GL || die
- find . -type f -name '*.a' -delete || die
-
- eapply_user
-}
-
-src_compile() {
- use examples || return
- local myopts=("verbose=1")
- use debug && myopts+=("dbg=1")
- export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
- emake \
- cuda-install="${EPREFIX}/opt/cuda" \
- CUDA_PATH="${EPREFIX}/opt/cuda/" \
- MPI_GCC=10 \
- "${myopts[@]}"
-}
-
-src_test() {
- addwrite /dev/nvidiactl
- addwrite /dev/nvidia0
-
- local i
- for i in {0..9}*/*; do
- emake -C "${i}" run
- done
-}
-
-src_install() {
- local f t crap=( *.txt Samples.htm* )
-
- if use doc; then
- ebegin "Installing docs ..."
- while IFS="" read -d $'\0' -r f; do
- treecopy "${f}" "${ED%/}"/usr/share/doc/${PF}/
- done < <(find -type f \( -name 'readme.txt' -o -name '*.pdf' \) -print0)
-
- while IFS="" read -d $'\0' -r f; do
- docompress -x "${f#${ED%/}}"
- done < <(find "${ED%/}"/usr/share/doc/${PF}/ -type f -name 'readme.txt' -print0)
- eend
- fi
-
- ebegin "Cleaning before installation..."
- for f in "${crap[@]}"; do
- rm -f "${f}" || die
- done
- find -type f \( -name '*.o' -o -name '*.pdf' -o -name 'readme.txt' \) -delete || die
- eend
-
- ebegin "Moving files..."
- while IFS="" read -d $'\0' -r f; do
- t="$(dirname ${f})"
- if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
- continue
- fi
- if [[ -x ${f} ]]; then
- exeinto /opt/cuda/sdk/"${t}"
- doexe "${f}"
- else
- insinto /opt/cuda/sdk/"${t}"
- doins "${f}"
- fi
- done < <(find . -type f -print0)
- eend
-}
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 5786f5d6306f..f94ce96c1c31 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -6,6 +6,7 @@ DIST cuda_10.2.89_440.33.01_linux.run 2645419389 BLAKE2B 236aa70a7b45e3636c2c229
DIST cuda_11.0.3_450.51.06_linux.run 3112522594 BLAKE2B f458aeebee3f7145f46c5607d1743d350ed96e9b8fd824fd94d2c998bcd8ccf3ef924cf37e95ce002ba92f464edd5004164497e820084953613ec2deb6edb144 SHA512 e7014c868c0bf40c000b1fd14d156265773a399782937cc85a2b09cd62abddcacdc20b412e1cc91c3877d01563cf054b1e021f047b32cfff4ab516e7167382dd
DIST cuda_11.1.0_455.23.05_linux.run 3498245611 BLAKE2B 754d974acf309a0f2f969bb3312949aa5469b3ec6ebfc4a89f244420cecebc22dc19fb9f63ec7d5c177eeb533a8984cb6bfa8d271ba36d02aacce22d42442ba4 SHA512 b5d64f20dbb51f12c558be4a724c18ddcd6d18670036efb63d19bb8009300463b8051dd1a2d2d7768bf3076681954ea690af399651da832ba00867a3f4a9acdf
DIST cuda_11.1.1_455.32.00_linux.run 3532172082 BLAKE2B f4af6bd87c419c002b4913ea7cfcbc84c78e3da485a7ac7dff0da483347cb38bde020e70c7352fe995a2efe0b8e97a156e0536f87aef69ff13fdf6e75fa634d1 SHA512 3da629e6f63548d06050a77d6ad2dbf314db33b2bf4e7d1659f039b3d9ad2ad3f87a6e506ec54db9ca2d21ac7b5ec576748082684bbab3b6642c03d2793d73a9
+DIST cuda_11.2.0_460.27.04_linux.run 3046790184 BLAKE2B 5330bc2e12ff131eb993610c95b22e6358b11d6a7a952625a4e88ed856769256c02e165ac7bf6cc43236052c8427cee17bf1e7346995dc2eba84d93c5d444eb3 SHA512 0aa7390490b93be7f359327a8fe364a44b538e742c7ccd560e9bbb40ed8613539c37fcb4aa71a2fbfa0bfdb0416ab43bbdcc09cd0c81db3f1a07b37318d6b2b3
DIST cuda_6.5.14_linux_32.run 76788277 BLAKE2B 75e79dce6cac5155bde8a3cafa945047c489b10272f8a3b94bf55d499df4b9c8b82506a81a20f9fd816bd4fd0514e515a6435399db1cb62b027c76490bd4dfae SHA512 89649ee0f4543b37037b7c8f5ed0b8bd502512afb4d93e3158b3df4786123be05a5288986b5abbfe15c14eb010777d2527b715225bea96a354a898c34e4a2fcc
DIST cuda_6.5.14_linux_64.run 972320904 BLAKE2B 4a4361fb7a90989ec4b4aa433189e7b358e5a2272fb9b9c59429e0014ac14e3b8de1b247ee98dc30c3f3ee4cc009eca4fdd86027bd3b9527a683353d60bdf5c6 SHA512 fecca731b86955f5bc7b09d88b02951e3ee5d4b1f1cf5f92658227a029b87cd35d6ac22956a5fa0afe62dcdc57191f1d12bb08c9f7cc05128727cd8455947b1e
DIST cuda_6.5.19_linux_32.run 81882112 BLAKE2B cf55ef7c969503c156431fc56301ed4e9a1234ae0cb867f12649636069f35e56bf6fc9df7482b6baade45d78c8baa2d98c41a28696da59294e0f575c4a0344ce SHA512 1ce9bd6b472b7e4f1fb181eb340dfcb757714d59a89aaa02146cfe1a97c8ccb7eb7699b4ec823276f277eb4d82d95050eaba17e7ed5fd2e47b9b5d78531c5d4e
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.0.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.0.ebuild
new file mode 100644
index 000000000000..d288d25c6596
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.2.0.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit check-reqs cuda toolchain-funcs unpacker
+
+DRIVER_PV="460.27.04"
+
+DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
+HOMEPAGE="https://developer.nvidia.com/cuda-zone"
+SRC_URI="https://developer.download.nvidia.com/compute/cuda/${PV}/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run"
+
+LICENSE="NVIDIA-CUDA"
+SLOT="0/${PV}"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="debugger nsight profiler vis-profiler sanitizer"
+RESTRICT="bindist mirror"
+
+BDEPEND=""
+RDEPEND="
+ <sys-devel/gcc-11_pre[cxx]
+ >=x11-drivers/nvidia-drivers-${DRIVER_PV}[X,uvm]
+ debugger? (
+ dev-libs/openssl-compat:1.0.0
+ sys-libs/libtermcap-compat
+ sys-libs/ncurses-compat:5[tinfo]
+ )
+ vis-profiler? (
+ dev-libs/openssl-compat:1.0.0
+ >=virtual/jre-1.6
+ )"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/cuda/*"
+
+CHECKREQS_DISK_BUILD="6800M"
+
+pkg_setup() {
+ # We don't like to run cuda_pkg_setup as it depends on us
+ check-reqs_pkg_setup
+}
+
+src_prepare() {
+ local cuda_supported_gcc
+
+ # ATTENTION: change requires revbump
+ cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3 8.2 8.3 8.4 9.2 9.3 10.2"
+
+ sed \
+ -e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
+ "${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
+
+ default
+}
+
+src_install() {
+ local cudadir=/opt/cuda
+ local ecudadir="${EPREFIX}${cudadir}"
+ dodir ${cudadir}
+ into ${cudadir}
+
+ # Install standard sub packages
+ local builddirs=(
+ builds/cuda_{cudart,cuobjdump,memcheck,nvcc,nvdisasm,nvml_dev,nvprune,nvrtc,nvtx}
+ builds/lib{cublas,cufft,curand,cusolver,cusparse,npp,nvjpeg}
+ $(usex profiler "builds/cuda_nvprof builds/cuda_cupti" "")
+ $(usex vis-profiler "builds/cuda_nvvp" "")
+ $(usex debugger "builds/cuda_gdb" "")
+ )
+
+ local d
+ for d in "${builddirs[@]}"; do
+ ebegin "Installing ${d}"
+ [[ -d ${d} ]] || die "Directory does not exist: ${d}"
+
+ if [[ -d ${d}/bin ]]; then
+ local f
+ for f in ${d}/bin/*; do
+ if [[ -f ${f} ]]; then
+ dobin "${f}"
+ else
+ insinto ${cudadir}/bin
+ doins -r "${f}"
+ fi
+ done
+ fi
+
+ insinto ${cudadir}
+ if [[ -d ${d}/targets ]]; then
+ doins -r "${d}"/targets
+ fi
+ if [[ -d ${d}/share ]]; then
+ doins -r "${d}"/share
+ fi
+ if [[ -d ${d}/extras ]]; then
+ doins -r "${d}"/extras
+ fi
+ eend
+ done
+ dobin "${T}"/cuda-config
+
+ doins builds/EULA.txt
+ # nvml and nvvm need special handling
+ ebegin "Installing nvvm"
+ doins -r builds/cuda_nvcc/nvvm
+ exeinto ${cudadir}/nvvm/bin
+ doexe builds/cuda_nvcc/nvvm/bin/cicc
+ eend
+
+ ebegin "Installing nvml"
+ doins -r builds/cuda_nvml_dev/nvml
+ eend
+
+ if use sanitizer; then
+ ebegin "Installing sanitizer"
+ dobin builds/integration/Sanitizer/compute-sanitizer
+ doins -r builds/cuda_sanitizer_api/Sanitizer
+ # special handling for the executable
+ exeinto ${cudadir}/Sanitizer
+ doexe builds/cuda_sanitizer_api/Sanitizer/compute-sanitizer
+ eend
+ fi
+
+ if use vis-profiler; then
+ ebegin "Installing libnvvp"
+ doins -r builds/cuda_nvvp/libnvvp
+ # special handling for the executable
+ exeinto ${cudadir}/libnvvp
+ doexe builds/cuda_nvvp/libnvvp/nvvp
+ eend
+ fi
+
+ if use nsight; then
+ local ncu_dir=$(grep -o 'nsight-compute-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
+ ebegin "Installing ${ncu_dir}"
+ mv builds/nsight_compute builds/${ncu_dir} || die
+ doins -r builds/${ncu_dir}
+
+ exeinto ${cudadir}/${ncu_dir}
+ doexe builds/${ncu_dir}/{ncu,ncu-ui,nv-nsight-cu,nv-nsight-cu-cli}
+
+ exeinto ${cudadir}/${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64
+ doexe builds/${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/{ncu-ui,ncu-ui.bin,CrashReporter}
+ dobin builds/integration/nsight-compute/{ncu,ncu-ui,nv-nsight-cu,nv-nsight-cu-cli}
+ eend
+
+ local nsys_dir=$(grep -o 'nsight-systems-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
+ ebegin "Installing ${nsys_dir}"
+ mv builds/nsight_systems builds/${nsys_dir} || die
+ doins -r builds/${nsys_dir}
+ exeinto ${cudadir}/${nsys_dir}/target-linux-x64
+ doexe builds/${nsys_dir}/target-linux-x64/nsys
+
+ exeinto ${cudadir}/${nsys_dir}/host-linux-x64
+ doexe builds/${nsys_dir}/host-linux-x64/{nsight-sys,nsight-sys.bin,nsys-ui,CrashReporter,ImportNvtxt,QdstrmImporter,ResolveSymbols}
+ dobin builds/integration/nsight-systems/{nsight-sys,nsys,nsys-exporter,nsys-ui}
+ eend
+ # TODO: unbundle qt5
+ # TODO: unbundle boost
+ # TODO: unbundle icu
+ # TODO: unbundle openssl
+ # TODO: unbundle mesa
+ # TODO: unbundle libz
+ # TODO: unbundle libstdc++
+ # TODO: unbundle libSshClient
+ # TODO: unbundle sqlite
+ # TODO: unbundle libpfm ?
+ fi
+
+ # Add include and lib symlinks
+ dosym "targets/x86_64-linux/include" ${cudadir}/include
+ dosym "targets/x86_64-linux/lib" ${cudadir}/lib64
+
+ newenvd - 99cuda <<-EOF
+ PATH=${ecudadir}/bin$(usex vis-profiler ":${ecudadir}/libnvvp" "")
+ ROOTPATH=${ecudadir}/bin
+ LDPATH=${ecudadir}/lib64:${ecudadir}/nvvm/lib64$(usex profiler ":${ecudadir}/extras/CUPTI/lib64" "")
+ EOF
+
+ # Cuda prepackages libraries, don't revdep-build on them
+ insinto /etc/revdep-rebuild
+ newins - 80${PN} <<-EOF
+ SEARCH_DIRS_MASK="${ecudadir}"
+ EOF
+ # TODO: Find a better way to add +x permission to installed executables
+ # TODO: Add pkgconfig files for installed libraries
+}
+
+pkg_postinst_check() {
+ local a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
+ local b="0.0"
+ local v
+ for v in ${a}; do
+ ver_test "${v}" -gt "${b}" && b="${v}"
+ done
+
+ # if gcc and if not gcc-version is at least greatest supported
+ if tc-is-gcc && \
+ ver_test $(gcc-version) -gt "${b}"; then
+ ewarn
+ ewarn "gcc > ${b} will not work with CUDA"
+ ewarn "Make sure you set an earlier version of gcc with gcc-config"
+ ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
+ ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
+ ewarn "to the nvcc compiler flags"
+ ewarn
+ fi
+}
+
+pkg_postinst() {
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ pkg_postinst_check
+ fi
+
+ if use profiler || use nsight; then
+ einfo
+ einfo "nvidia-drivers restrict access to performance counters."
+ einfo "You'll need to either run profiling tools (nvprof, nsight) "
+ einfo "using sudo (needs cap SYS_ADMIN) or add the following line to "
+ einfo "a modprobe configuration file "
+ einfo "(e.g. /etc/modprobe.d/nvidia-prof.conf): "
+ einfo
+ einfo "options nvidia NVreg_RestrictProfilingToAdminUsers=0"
+ einfo
+ fi
+}
diff --git a/dev-util/ostree/ostree-2020.8.ebuild b/dev-util/ostree/ostree-2020.8.ebuild
index 65675eb0f6bb..e7284c8419d7 100644
--- a/dev-util/ostree/ostree-2020.8.ebuild
+++ b/dev-util/ostree/ostree-2020.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ DESCRIPTION="Operating system and container binary deployment and upgrades"
HOMEPAGE="https://ostreedev.github.io/ostree/"
SRC_URI="https://github.com/ostreedev/ostree/releases/download/v${PV}/lib${P}.tar.xz -> ${P}.tar.xz"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 x86"
LICENSE="LGPL-2+"
SLOT="0"
diff --git a/dev-util/patchutils/patchutils-0.3.3.ebuild b/dev-util/patchutils/patchutils-0.3.3.ebuild
index 66495ecc4a23..582b2373108f 100644
--- a/dev-util/patchutils/patchutils-0.3.3.ebuild
+++ b/dev-util/patchutils/patchutils-0.3.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://cyberelk.net/tim/data/patchutils/stable/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-util/patchutils/patchutils-0.3.4.ebuild b/dev-util/patchutils/patchutils-0.3.4.ebuild
index ac3b19788b00..8bc583dde0e2 100644
--- a/dev-util/patchutils/patchutils-0.3.4.ebuild
+++ b/dev-util/patchutils/patchutils-0.3.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://cyberelk.net/tim/data/patchutils/stable/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-util/peg/metadata.xml b/dev-util/peg/metadata.xml
index 5dce30bef23c..3d4429370ed8 100644
--- a/dev-util/peg/metadata.xml
+++ b/dev-util/peg/metadata.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>rafaelmartins@gentoo.org</email>
- <name>Rafael G. Martins</name>
- </maintainer>
+ <!-- maintainer-needed -->
<origin>gentoo-staging</origin>
</pkgmetadata>
diff --git a/dev-util/perf/perf-5.9.9.ebuild b/dev-util/perf/perf-5.9.9.ebuild
index 6fed645ae9ff..e85465a6b0bd 100644
--- a/dev-util/perf/perf-5.9.9.ebuild
+++ b/dev-util/perf/perf-5.9.9.ebuild
@@ -31,7 +31,7 @@ SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="audit clang crypt debug +demangle +doc gtk java libpfm lzma numa perl python slang systemtap unwind zlib"
# TODO babeltrace
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-util/phpstorm/Manifest b/dev-util/phpstorm/Manifest
index 8bf2cb3857d6..1a8e2495dbba 100644
--- a/dev-util/phpstorm/Manifest
+++ b/dev-util/phpstorm/Manifest
@@ -1,3 +1,3 @@
-DIST PhpStorm-2020.3.tar.gz 473806464 BLAKE2B cace121caa8f1229139abca36268a4dd2e98a67c201ffa607d28b6ffc5f4a2c33a8e0749ea34ad619f2740804109b847ed3bf804f751bf691c8440dd543bf3ca SHA512 86306a6c662455e7f8140a93bf381fe02ff3ece7dd23b9021e8cbacb069fdddc6805980a534f6fe2cab44fd7977f4f96cdbab7565f7b2ea184beebc9357dc8b1
-EBUILD phpstorm-2020.3.ebuild 1429 BLAKE2B 785ffe675f72bd8089eba33bd6da72930f89a375156002befc182405bd63e06aef1985aee69688a59d970713f80dbf2d7ab4b92921f72e81347d52d61eeeca70 SHA512 d567821170a480289165afbd78ad58e60c870fd62a730e66b1d6b386ebf44233ee6475a0b33956d84b8b4354a36d6fddaa2114d23119e277663b6cf9b1f7378b
+DIST PhpStorm-2020.3.1.tar.gz 467390141 BLAKE2B 29b9827c7862cea6e23978d7084e8a89fd71d85fd3ea777ba9160f5a93061ad8a8e33881070e91a347aac3a1ecfd1b4ed5183f596cb4ccde8881ce6aed712fa2 SHA512 17ea8f18653ec9c5ac707ec7fc5749ddde73f5709224985e12a28ed211192f51703b7ba4501ac2beb38e7aef41d17c37116eb3794000113b707469c8301918ef
+EBUILD phpstorm-2020.3.1.ebuild 1429 BLAKE2B 785ffe675f72bd8089eba33bd6da72930f89a375156002befc182405bd63e06aef1985aee69688a59d970713f80dbf2d7ab4b92921f72e81347d52d61eeeca70 SHA512 d567821170a480289165afbd78ad58e60c870fd62a730e66b1d6b386ebf44233ee6475a0b33956d84b8b4354a36d6fddaa2114d23119e277663b6cf9b1f7378b
EBUILD phpstorm-9999.ebuild 1429 BLAKE2B 785ffe675f72bd8089eba33bd6da72930f89a375156002befc182405bd63e06aef1985aee69688a59d970713f80dbf2d7ab4b92921f72e81347d52d61eeeca70 SHA512 d567821170a480289165afbd78ad58e60c870fd62a730e66b1d6b386ebf44233ee6475a0b33956d84b8b4354a36d6fddaa2114d23119e277663b6cf9b1f7378b
diff --git a/dev-util/phpstorm/phpstorm-2020.3.ebuild b/dev-util/phpstorm/phpstorm-2020.3.1.ebuild
index 6fd2a8846e71..6fd2a8846e71 100644
--- a/dev-util/phpstorm/phpstorm-2020.3.ebuild
+++ b/dev-util/phpstorm/phpstorm-2020.3.1.ebuild
diff --git a/dev-util/pkgconf/files/pkgconf-1.7.3-darwin9.patch b/dev-util/pkgconf/files/pkgconf-1.7.3-darwin9.patch
new file mode 100644
index 000000000000..f41de43b97c5
--- /dev/null
+++ b/dev-util/pkgconf/files/pkgconf-1.7.3-darwin9.patch
@@ -0,0 +1,24 @@
+darwin9 does not malloc on NULL resolved_path
+
+https://github.com/pkgconf/pkgconf/pull/208
+
+--- a/libpkgconf/path.c
++++ b/libpkgconf/path.c
+@@ -92,15 +92,11 @@
+ return;
+ if (S_ISLNK(st.st_mode))
+ {
+- char *linkdest = realpath(path, NULL);
++ char pathbuf[PATH_MAX];
++ char *linkdest = realpath(path, pathbuf);
+
+ if (linkdest != NULL && stat(linkdest, &st) == -1)
+- {
+- free(linkdest);
+ return;
+- }
+-
+- free(linkdest);
+ }
+ if (path_list_contains_entry(path, dirlist, &st))
+ return;
diff --git a/dev-util/pkgconf/pkgconf-1.7.3-r1.ebuild b/dev-util/pkgconf/pkgconf-1.7.3-r1.ebuild
index 858af22520ed..3923dd6417ea 100644
--- a/dev-util/pkgconf/pkgconf-1.7.3-r1.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.7.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2012-2020 Gentoo Authors
+# Copyright 2012-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://git.sr.ht/~kaniini/pkgconf"
else
SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~ppc-macos ~x64-macos"
fi
DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
@@ -40,6 +40,8 @@ MULTILIB_CHOST_TOOLS=(
src_prepare() {
default
+ [[ ${CHOST} == *-darwin9 ]] && eapply "${FILESDIR}"/${P}-darwin9.patch
+
[[ ${PV} == "9999" ]] && eautoreconf
if use pkg-config; then
MULTILIB_CHOST_TOOLS+=(
diff --git a/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild b/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild
index eabba5a8f09f..73edc7072dd3 100644
--- a/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="https://anongit.freedesktop.org/git/pkg-config.git"
inherit autotools git-2
else
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
fi
@@ -42,7 +42,7 @@ src_prepare() {
if [[ ${PV} == *9999* ]]; then
eautoreconf
else
- elibtoolize # Required for FreeMiNT wrt #333429
+ elibtoolize
fi
}
diff --git a/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild b/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild
index 66e587988338..6267da5f5304 100644
--- a/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
inherit autotools git-r3
else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
fi
@@ -52,7 +52,7 @@ src_prepare() {
if [[ ${PV} == *9999* ]]; then
eautoreconf
else
- elibtoolize # Required for FreeMiNT wrt #333429
+ elibtoolize
fi
}
diff --git a/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
index 80dfe836e0a4..d2554a4effda 100644
--- a/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
inherit autotools git-r3
else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
fi
@@ -46,7 +46,7 @@ src_prepare() {
if [[ ${PV} == *9999* ]]; then
eautoreconf
else
- elibtoolize # Required for FreeMiNT wrt #333429
+ elibtoolize
fi
if [[ ${CHOST} == *-solaris* ]] ; then
diff --git a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
index 41c441193c98..4b4e246111c5 100644
--- a/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.29.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
inherit autotools git-r3
else
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
fi
@@ -46,15 +46,19 @@ src_prepare() {
if [[ ${PV} == *9999* ]]; then
eautoreconf
else
- elibtoolize # Required for FreeMiNT wrt #333429
+ elibtoolize
fi
if [[ ${CHOST} == *-solaris* ]] ; then
- # fix standards conflicts
- sed -i -e 's/\(_XOPEN_SOURCE\(_EXTENDED\)\?\|__EXTENSIONS__\)/ \1_DISABLED/' \
- glib/configure || die
- sed -i -e '/#define\s\+_POSIX_SOURCE/d' \
- glib/glib/giounix.c || die
+ # fix standards conflict, since gcc-4.5 default is gnu90
+ if tc-is-gcc && [[ $(gcc-major-version) -gt 4 || \
+ ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -ge 5 ) ]] ;
+ then
+ sed -i \
+ -e 's/\<\(_XOPEN_SOURCE_EXTENDED\)\>/\1_DISABLED/' \
+ -e '/\<_XOPEN_SOURCE\>/s/2/600/' \
+ glib/configure || die
+ fi
fi
}
diff --git a/dev-util/pkgconfig/pkgconfig-9999.ebuild b/dev-util/pkgconfig/pkgconfig-9999.ebuild
index 80dfe836e0a4..d2554a4effda 100644
--- a/dev-util/pkgconfig/pkgconfig-9999.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
inherit autotools git-r3
else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
fi
@@ -46,7 +46,7 @@ src_prepare() {
if [[ ${PV} == *9999* ]]; then
eautoreconf
else
- elibtoolize # Required for FreeMiNT wrt #333429
+ elibtoolize
fi
if [[ ${CHOST} == *-solaris* ]] ; then
diff --git a/dev-util/pretrace/Manifest b/dev-util/pretrace/Manifest
index 07fb758cb0f1..12e3801543fe 100644
--- a/dev-util/pretrace/Manifest
+++ b/dev-util/pretrace/Manifest
@@ -1 +1 @@
-DIST libpretrace-0.4.tar.gz 7370 BLAKE2B 08fb2022433af807675ef089dcf1fbd642c165b353959f81547c2f65fd9e60c49b7494c661f81698c738bd27a3cdbd28d6a227589ef7a2906c5fa930d9709fc6 SHA512 64d1041ce398c73342ed371ebac4f656620c9ae4bc6da1b56b43bccd9898564a44dfe7bfaf3d4c865b89c5924b9d03aa21f393dcbafc185f84ac4b9ea2eb17d8
+DIST pretrace-0.4.tar.xz 6988 BLAKE2B a9b05aa106142fa090e09bd6c07d2972be72453e1bfe5a15a0b67c8bb5c3a20c2e19ad03dc738f24b6bcbee5629ad47438cdf04b1eab8c1d757fe4d62ee59a9e SHA512 cdd70b9b06451c0142c79b50f2264c034bdc8d815edaaeb78bbde55127a31a68e49df7ba2d6599bd108f9161f768afca84e85a917ef7353b1ace9e2256be84ef
diff --git a/dev-util/pretrace/files/pretrace-0.4-build.patch b/dev-util/pretrace/files/pretrace-0.4-build.patch
index 4d7056fa83f7..9db1cb241e7b 100644
--- a/dev-util/pretrace/files/pretrace-0.4-build.patch
+++ b/dev-util/pretrace/files/pretrace-0.4-build.patch
@@ -2,8 +2,8 @@ fix building with newer glibc
http://bugs.gentoo.org/227923
---- pretrace.h
-+++ pretrace.h
+--- a/pretrace.h
++++ b/pretrace.h
@@ -20,3 +20,8 @@
#include <sys/time.h>
# define RANDOMIZE(x) { struct timeval tv; gettimeofday(&tv, NULL); x = tv.tv_usec; }
diff --git a/dev-util/pretrace/files/pretrace-0.4-qa.patch b/dev-util/pretrace/files/pretrace-0.4-qa.patch
new file mode 100644
index 000000000000..8cf40e796a12
--- /dev/null
+++ b/dev-util/pretrace/files/pretrace-0.4-qa.patch
@@ -0,0 +1,39 @@
+--- pretrace-0.4/Makefile.orig 2021-01-14 13:31:45.950615134 +0300
++++ pretrace-0.4/Makefile 2021-01-14 13:32:04.940676578 +0300
+@@ -2,14 +2,14 @@
+ # $Id: Makefile,v 1.1 2005/07/27 07:45:37 taviso Exp $
+ #
+
+-VERSION=0.4
++VERSION?=0.4
+ PREFIX=/usr/local
+ DOCDIR=$(PREFIX)/share/doc/pretrace-$(VERSION)
+ LIBDIR=$(PREFIX)/lib
+ BINDIR=$(PREFIX)/bin
+ MANDIR=$(PREFIX)/share/man
+
+-all: libpretrace.so ptgenmap doc
++all: libpretrace.so ptgenmap
+ @echo 'libpretrace.so has been built, please see README for instructions.'
+ @echo 'type `make install` to install to $(PREFIX)'
+
+@@ -26,7 +26,7 @@
+ $(CC) $(CFLAGS) -Wall -g -fPIC -c trie.c
+
+ libpretrace.so: libpretrace.o trie.o
+- $(CC) $(CFLAGS) $(LDFLAGS) -g -shared -o libpretrace.so libpretrace.o trie.o
++ $(CC) $(CFLAGS) $(LDFLAGS) -g -shared -Wl,-soname,libpretrace.so -o libpretrace.so libpretrace.o trie.o
+
+ doc:
+ gzip -9c pretrace.3 > pretrace.3.gz
+@@ -38,8 +41,8 @@
+ install -m 0755 libpretrace.so $(LIBDIR)
+ install -m 0755 ptgenmap $(BINDIR)
+ install -m 0644 README pretrace.conf.example ChangeLog $(DOCDIR)
+- install -m 0644 pretrace.3.gz $(MANDIR)/man3
+- install -m 0644 ptgenmap.8.gz $(MANDIR)/man8
++ install -m 0644 pretrace.3 $(MANDIR)/man3
++ install -m 0644 ptgenmap.8 $(MANDIR)/man8
+
+ clean:
+ -rm -f libpretrace.so libpretrace.o trie.o ptgenmap.o ptgenmap *~
diff --git a/dev-util/pretrace/pretrace-0.4-r1.ebuild b/dev-util/pretrace/pretrace-0.4-r2.ebuild
index cfe9613d202b..c6ff1edc5859 100644
--- a/dev-util/pretrace/pretrace-0.4-r1.ebuild
+++ b/dev-util/pretrace/pretrace-0.4-r2.ebuild
@@ -1,30 +1,28 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit readme.gentoo-r1
DESCRIPTION="start dynamically linked applications under debugging environment"
-HOMEPAGE="https://dev.inversepath.com/trac/pretrace"
-SRC_URI="http://dev.inversepath.com/pretrace/libpretrace-${PV}.tar.gz"
+HOMEPAGE="https://github.com/robholland/pretrace"
+SRC_URI="https://dev.gentoo.org/~bircoph/distfiles/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-S="${WORKDIR}/lib${P}"
DOC_CONTENTS="Remember to execute ptgenmap after modifying pretrace.conf"
PATCHES=(
"${FILESDIR}"/${P}--as-needed.diff
"${FILESDIR}"/${P}-build.patch #227923
+ "${FILESDIR}"/${P}-qa.patch
)
src_install() {
dodir /usr/bin /usr/share/man/man3 /usr/share/man/man8
- emake DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" PREFIX="${D}/usr" install
+ emake DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" PREFIX="${D}/usr" VERSION="${PVR}" install
readme.gentoo_create_doc
}
diff --git a/dev-util/promu/Manifest b/dev-util/promu/Manifest
index 584bf41293f9..acca90b9239e 100644
--- a/dev-util/promu/Manifest
+++ b/dev-util/promu/Manifest
@@ -1,2 +1,3 @@
DIST promu-0.5.0.tar.gz 643970 BLAKE2B b61e8421b5e68f3cd0ec125faadf64c7491f54cfe03de9d6497cb627e5d548b58fafe735c76a5a86a55489aea56dffb6e02d52acd1ca977ea32ec974f34475ac SHA512 b895c0b5b5a33bd0c2372e8c1c698b8548b1b7086849161ffa99bf9718f4b7f3a57bcf218681d84e4cc5ef31ef39df7e6c59345a84441369ec3ec402999ac4de
DIST promu-0.6.1.tar.gz 1704561 BLAKE2B 40947a8a2cd470456db2c47f1208ef7dc009b102fbc0c2a749f99271881ae6f4009d616d977f504a60795e7844271350e5e44423e12bb8633e441dd3ade45b24 SHA512 58983905a0da911f2142e2cf89b241320abfdbe62568378355786f606b3e319322722c25d3fc7b7bd127dc916df9f79684ba3f28455a59b5ee73f7c455fba351
+DIST promu-0.7.0.tar.gz 1706673 BLAKE2B 52dea1bef127dc20fa67b2efee750d9a22c8847fd48ea73b3d03eb0f95f2690977f8082bc71f27215a68c5277d8219ccd4ff93d8af7966fdf9df7286e4f45d03 SHA512 9f332e55c944de1ff87e86b696eb99f24dc1f5350a180ae62e403a798bd6e496d9fe71e18c07a2c870509fae4d6b3ded2274b1b986614f1abe9f74e3ed8e2a60
diff --git a/dev-util/promu/promu-0.7.0.ebuild b/dev-util/promu/promu-0.7.0.ebuild
new file mode 100644
index 000000000000..dc79b2ea8df6
--- /dev/null
+++ b/dev-util/promu/promu-0.7.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+EGIT_COMMIT=b17dc4f71c810678db907367b392a3e7a14c4038
+
+DESCRIPTION="Prometheus Utility Tool"
+HOMEPAGE="https://github.com/prometheus/promu"
+SRC_URI="https://github.com/prometheus/promu/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RESTRICT+=" test"
+
+src_prepare() {
+ default
+ sed -i -e "s/{{.Revision}}/${EGIT_COMMIT}/" .promu.yml || die
+}
+
+src_compile() {
+ go build -mod=vendor . || die "compile failed"
+}
+
+src_install() {
+ dobin ${PN}
+ dodoc -r {doc,{README,CONTRIBUTING}.md}
+}
diff --git a/dev-util/pscan/pscan-20000721-r1.ebuild b/dev-util/pscan/pscan-20000721-r1.ebuild
index 3b971b355092..a77d8089a472 100644
--- a/dev-util/pscan/pscan-20000721-r1.ebuild
+++ b/dev-util/pscan/pscan-20000721-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
# Does NOT contain a testsuite, but does contain a test.c that confuses src_test
RESTRICT="test"
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index d6a5a674467d..d1d8935ba254 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -1,3 +1,4 @@
+DIST pycharm-community-2020.1.1.tar.gz 383138867 BLAKE2B 872c658709cab76636f864caff4be4086f861347f5591cf846f6e2b57593380d796a417a684e935b5d3cc6482d80d60f04553e1c11f31fb63554df6a683512ba SHA512 91465d6754981f88a1175ba7da40eb8aed128897b732ba598caa3dbbd6b928f56857c0e80c7bc6c27bb276ffa9a5529dbdcd4508ea1b038579bc7bf359d83ab4
+DIST pycharm-community-2020.1.3.tar.gz 384015566 BLAKE2B a8f69912d7f24ce81c0f4ab579423ef45de6be3f1a0d9d72c6a1566d28c4be41917b3a586964f0b3e7cba7a658da6e5d852d89844f0fd166919f55f3f487380a SHA512 d66f3fb07f06fbaf7282c81f9a81b3106c61d1f60c9b5acf9f512dd5ec12bc772f93192aa535823c808531aea973653b0d59aa770fe898eaa406be319b8873fe
+DIST pycharm-community-2020.1.tar.gz 382333125 BLAKE2B 5fa9000bad467784f2276286639c98509481ab3aef7482f8d0d166d058b2798fb027c037762c76dfd947376320e75f05045b34f172f849198c63950fe27d9855 SHA512 7e2663ac21536f7663910d0e2561a93869f46cc7b1d06bbc448d5afbdf89c4fcb834b9e7e3f61263e5c0a3d25caf35c663a42c6219ae2d5a67cb2516eba2e8e6
DIST pycharm-community-2020.3.tar.gz 486641961 BLAKE2B 35172e213cd90378637adecfc12ecbb758866a5359a5b6159d5201d232ff1e99a0af447163a598057d94c2d307d4d9c627f3f971b58c18c3d95cc2d9d81ef0fc SHA512 16d3508dfd89a3c4b17cdc68e35b2f44e3e18903b94c323c3e845801a8c0d7609b5f9693d7a76ad927860f8d1ec8c9537a1595391167cb5648cb97f248ffa171
-EBUILD pycharm-community-2020.3.ebuild 1378 BLAKE2B b325725ce7f464ae2359552cb90358c9ab69d6709268d3e909c0cf600c316614cb05fe6e77125f0d86b19629c9f0e4a23127d5c931c13051420b585ca1639072 SHA512 ee178e775d3cab103f9f7cf9b9f66ca46edfccba3806a149830786589b09d7f3391509bf43fb41fec949dd8b9d07aeffddf19d071a3cd44b59cb89cd19dc5523
-EBUILD pycharm-community-9999.ebuild 1378 BLAKE2B b325725ce7f464ae2359552cb90358c9ab69d6709268d3e909c0cf600c316614cb05fe6e77125f0d86b19629c9f0e4a23127d5c931c13051420b585ca1639072 SHA512 ee178e775d3cab103f9f7cf9b9f66ca46edfccba3806a149830786589b09d7f3391509bf43fb41fec949dd8b9d07aeffddf19d071a3cd44b59cb89cd19dc5523
diff --git a/dev-util/pycharm-community/files/README.gentoo b/dev-util/pycharm-community/files/README.gentoo
new file mode 100644
index 000000000000..2164d9e03ff7
--- /dev/null
+++ b/dev-util/pycharm-community/files/README.gentoo
@@ -0,0 +1,5 @@
+According to JetBrains, PyCharm has performance and
+graphics issues with OpenJDK Java.
+
+Please consider using Oracle JDK.
+Especially before reporting problems upstream.
diff --git a/dev-util/pycharm-community/metadata.xml b/dev-util/pycharm-community/metadata.xml
new file mode 100644
index 000000000000..711a23e5e89b
--- /dev/null
+++ b/dev-util/pycharm-community/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <name>Mikle Kolyada</name>
+ <email>zlogene@gentoo.org</email>
+</maintainer>
+<use>
+ <flag name="bundled-jdk">Use bundled jdk</flag>
+</use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-util/pycharm-community/pycharm-community-2020.1.1.ebuild b/dev-util/pycharm-community/pycharm-community-2020.1.1.ebuild
new file mode 100644
index 000000000000..b1475f0cff3f
--- /dev/null
+++ b/dev-util/pycharm-community/pycharm-community-2020.1.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils readme.gentoo-r1 xdg
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="https://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bundled-jdk"
+
+RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
+ dev-libs/libdbusmenu
+ dev-python/pip"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="*"
+
+MY_PN=${PN/-community/}
+
+src_install() {
+ insinto /opt/${PN}
+ doins -r *
+
+ if use bundled-jdk; then
+ fperms -R a+x /opt/pycharm-community/jbr/bin/
+ else
+ rm -r "${D}"/opt/pycharm-community/jbr/ || die
+ fi
+
+ fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+ dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+ newicon bin/${MY_PN}.png ${PN}.png
+ make_desktop_entry ${PN} ${PN} ${PN}
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_icon_cache_update
+}
diff --git a/dev-util/pycharm-community/pycharm-community-2020.1.3.ebuild b/dev-util/pycharm-community/pycharm-community-2020.1.3.ebuild
new file mode 100644
index 000000000000..9627fdbb3a8f
--- /dev/null
+++ b/dev-util/pycharm-community/pycharm-community-2020.1.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils readme.gentoo-r1 xdg
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="https://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+bundled-jdk"
+
+RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
+ dev-libs/libdbusmenu
+ dev-python/pip"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="*"
+
+MY_PN=${PN/-community/}
+
+src_install() {
+ insinto /opt/${PN}
+ doins -r *
+
+ if use bundled-jdk; then
+ fperms -R a+x /opt/pycharm-community/jbr/bin/
+ else
+ rm -r "${D}"/opt/pycharm-community/jbr/ || die
+ fi
+
+ fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+ dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+ newicon bin/${MY_PN}.png ${PN}.png
+ make_desktop_entry ${PN} ${PN} ${PN}
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_icon_cache_update
+}
diff --git a/dev-util/pycharm-community/pycharm-community-2020.1.ebuild b/dev-util/pycharm-community/pycharm-community-2020.1.ebuild
new file mode 100644
index 000000000000..b1475f0cff3f
--- /dev/null
+++ b/dev-util/pycharm-community/pycharm-community-2020.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils readme.gentoo-r1 xdg
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="https://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bundled-jdk"
+
+RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
+ dev-libs/libdbusmenu
+ dev-python/pip"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="*"
+
+MY_PN=${PN/-community/}
+
+src_install() {
+ insinto /opt/${PN}
+ doins -r *
+
+ if use bundled-jdk; then
+ fperms -R a+x /opt/pycharm-community/jbr/bin/
+ else
+ rm -r "${D}"/opt/pycharm-community/jbr/ || die
+ fi
+
+ fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+ dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+ newicon bin/${MY_PN}.png ${PN}.png
+ make_desktop_entry ${PN} ${PN} ${PN}
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_icon_cache_update
+}
diff --git a/dev-util/pycharm-community/pycharm-community-2020.3.ebuild b/dev-util/pycharm-community/pycharm-community-2020.3.ebuild
index 30ff563d5965..1e605ce86ec5 100644
--- a/dev-util/pycharm-community/pycharm-community-2020.3.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2020.3.ebuild
@@ -1,61 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit gnome2-utils xdg
+inherit gnome2-utils readme.gentoo-r1 xdg
-DESCRIPTION="The Python IDE for pure Python development"
-HOMEPAGE="https://www.jetbrains.com/pycharm"
-LICENSE="Apache-2.0"
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="https://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bundled-jdk"
-BDEPEND="
- app-arch/tar
-"
-
-RDEPEND="
- virtual/jdk
+RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
dev-libs/libdbusmenu
- dev-python/pip
-"
+ dev-python/pip"
-RESTRICT="bindist mirror strip"
+RESTRICT="mirror strip"
-MY_PN="pycharm"
-S="${WORKDIR}/${PN}-${PV}"
+QA_PREBUILT="*"
-if [[ ${PV} != 9999 ]]; then
- SRC_URI="https://download.jetbrains.com/python/${PN}-${PV}.tar.gz"
- KEYWORDS="*"
-fi
+MY_PN=${PN/-community/}
-src_unpack() {
- default
-}
+src_install() {
+ insinto /opt/${PN}
+ doins -r *
-src_prepare() {
- default
+ if use bundled-jdk; then
+ fperms -R a+x /opt/pycharm-community/jbr/bin/
+ else
+ rm -r "${D}"/opt/pycharm-community/jbr/ || die
+ fi
- # Remove any bundled Java
- rm -rf {jbr,jre{64}} || die "Failed to remove bundled Java"
-}
+ local rub
-src_install() {
-
- insinto "/opt/${PN}"
- doins -r *
+ for rub in aarch64 mips64el ppc64le; do
+ rm -r "${D}"/opt/pycharm-community/lib/pty4j-native/linux/${rub} || die
+ done
- fperms 755 /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+ fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+ newicon bin/${MY_PN}.png ${PN}.png
+ make_desktop_entry ${PN} ${PN} ${PN}
- newicon "bin/${MY_PN}.png" "${PN}.png"
- make_desktop_entry "${PN}" "PyCharm Community" "${PN}" "Development;Programming;IDE;"
-
- # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
- mkdir -p "${D}/etc/sysctl.d/" || die
- echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+ readme.gentoo_create_doc
}
pkg_postinst() {
diff --git a/dev-util/pycharm-community/pycharm-community-9999.ebuild b/dev-util/pycharm-community/pycharm-community-9999.ebuild
deleted file mode 100644
index 30ff563d5965..000000000000
--- a/dev-util/pycharm-community/pycharm-community-9999.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg
-
-DESCRIPTION="The Python IDE for pure Python development"
-HOMEPAGE="https://www.jetbrains.com/pycharm"
-LICENSE="Apache-2.0"
-
-SLOT="0"
-
-BDEPEND="
- app-arch/tar
-"
-
-RDEPEND="
- virtual/jdk
- dev-libs/libdbusmenu
- dev-python/pip
-"
-
-RESTRICT="bindist mirror strip"
-
-MY_PN="pycharm"
-S="${WORKDIR}/${PN}-${PV}"
-
-if [[ ${PV} != 9999 ]]; then
- SRC_URI="https://download.jetbrains.com/python/${PN}-${PV}.tar.gz"
- KEYWORDS="*"
-fi
-
-src_unpack() {
- default
-}
-
-src_prepare() {
- default
-
- # Remove any bundled Java
- rm -rf {jbr,jre{64}} || die "Failed to remove bundled Java"
-}
-
-src_install() {
-
- insinto "/opt/${PN}"
- doins -r *
-
- fperms 755 /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
- dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-
- newicon "bin/${MY_PN}.png" "${PN}.png"
- make_desktop_entry "${PN}" "PyCharm Community" "${PN}" "Development;Programming;IDE;"
-
- # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
- mkdir -p "${D}/etc/sysctl.d/" || die
- echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest
index 6444cc6bb175..3a6b0fbc4bb8 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -1,3 +1,4 @@
+DIST pycharm-professional-2020.1.1.tar.gz 507346192 BLAKE2B eb035967475fa1baf7833cf0b4ea18a7870e9ddeb68cef1ed6eaa0690ae21cb2482a61138cfe230928aa41a65e6f78078107d44b6c98b1ace7e6de22af5db555 SHA512 222f2e7284fb77018ace14907da6fbbe58bb8411f71aef9b2875e8c375ea2754a8595bfe9b5847bcfde2f8d59d0480f8fb4acf342231933a58f0f99fafc5a48d
+DIST pycharm-professional-2020.1.3.tar.gz 508036989 BLAKE2B 13bca1d093596bfedcad3c7837ab26c21631d15b5dce9ca62798baab281a7a4736e35fcbd96acc94b8e336119398c82c23583798ad53555eb8f1eac86febf031 SHA512 57a7878d3ee817778c7e1087d97e4d7a615fdd2f987fafecf4c6bcd7e1c0e7c1cb4411283214849cbd76fa92a2b98a074045b52cf1cd306f2e2995ed3b53e0e0
+DIST pycharm-professional-2020.1.tar.gz 507643980 BLAKE2B f0869ebec8ae6396a4ff9579214a913be631d52e67cf12b437800a6f3292c96bef67b8b813bb9d703a2b6893ad27835a6868cce5ac4f3db818bacc2de4aed87c SHA512 23737bdd8bafb57dab794b4c874e6d14bb3b2591706bf13a835b0172fbe914ade932c701a313d982d7c393d02b15629a8273f3be092a92178ed0bfd4eff9baa5
DIST pycharm-professional-2020.3.tar.gz 614570714 BLAKE2B 48ecb93a8db053b2b5983392b6270388fc1bf0ddf18e99453d04f87975ac3b8accfe14895b23db9d0b2eb199c0a64c9b137ea09142fc0cbe0d2ca6196ca2ec55 SHA512 e0c726abddbb98dc5d23043e6e5d2e41a3b813c18352ee3ad9596f0c37bdadfdefba3c74890bb9d2e9c0c8f6114841c2b52c6af2169e021256060452aacb7ec7
-EBUILD pycharm-professional-2020.3.ebuild 1616 BLAKE2B 06c145a60e988227cde94ac1c937b5be92d681507a462339520fe47c257184e91f1426ab7fbf75c8e1f1ddf84247bf82345e5396999bf482222f33fddcfc8182 SHA512 5ef8b327fc2cbabb1f560f95da4207b70d3ee5444a4f4485c32076111f1fb740c2356d956bee392f15f565888d7f2ec4a5f0d1b143484abad6c04dafe147dd86
-EBUILD pycharm-professional-9999.ebuild 1616 BLAKE2B 06c145a60e988227cde94ac1c937b5be92d681507a462339520fe47c257184e91f1426ab7fbf75c8e1f1ddf84247bf82345e5396999bf482222f33fddcfc8182 SHA512 5ef8b327fc2cbabb1f560f95da4207b70d3ee5444a4f4485c32076111f1fb740c2356d956bee392f15f565888d7f2ec4a5f0d1b143484abad6c04dafe147dd86
diff --git a/dev-util/pycharm-professional/files/README.gentoo b/dev-util/pycharm-professional/files/README.gentoo
new file mode 100644
index 000000000000..2164d9e03ff7
--- /dev/null
+++ b/dev-util/pycharm-professional/files/README.gentoo
@@ -0,0 +1,5 @@
+According to JetBrains, PyCharm has performance and
+graphics issues with OpenJDK Java.
+
+Please consider using Oracle JDK.
+Especially before reporting problems upstream.
diff --git a/dev-util/pycharm-professional/metadata.xml b/dev-util/pycharm-professional/metadata.xml
new file mode 100644
index 000000000000..711a23e5e89b
--- /dev/null
+++ b/dev-util/pycharm-professional/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+ <name>Mikle Kolyada</name>
+ <email>zlogene@gentoo.org</email>
+</maintainer>
+<use>
+ <flag name="bundled-jdk">Use bundled jdk</flag>
+</use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-util/pycharm-professional/pycharm-professional-2020.1.1.ebuild b/dev-util/pycharm-professional/pycharm-professional-2020.1.1.ebuild
new file mode 100644
index 000000000000..6c0277bc9778
--- /dev/null
+++ b/dev-util/pycharm-professional/pycharm-professional-2020.1.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils readme.gentoo-r1 xdg
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="https://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bundled-jdk"
+
+RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
+ dev-libs/libdbusmenu
+ dev-python/pip"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="*"
+
+MY_PN=${PN/-professional/}
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+ insinto /opt/${PN}
+ doins -r *
+
+ if use bundled-jdk; then
+ fperms -R a+x /opt/pycharm-professional/jbr/bin/
+ else
+ rm -r "${D}"/opt/pycharm-professional/jbr/ || die
+ fi
+
+ fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+ dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+ newicon bin/${MY_PN}.png ${PN}.png
+ make_desktop_entry ${PN} ${PN} ${PN}
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_icon_cache_update
+}
diff --git a/dev-util/pycharm-professional/pycharm-professional-2020.1.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2020.1.3.ebuild
new file mode 100644
index 000000000000..ba5412e636c2
--- /dev/null
+++ b/dev-util/pycharm-professional/pycharm-professional-2020.1.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils readme.gentoo-r1 xdg
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="https://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+bundled-jdk"
+
+RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
+ dev-libs/libdbusmenu
+ dev-python/pip"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="*"
+
+MY_PN=${PN/-professional/}
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+ insinto /opt/${PN}
+ doins -r *
+
+ if use bundled-jdk; then
+ fperms -R a+x /opt/pycharm-professional/jbr/bin/
+ else
+ rm -r "${D}"/opt/pycharm-professional/jbr/ || die
+ fi
+
+ fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+ dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+ newicon bin/${MY_PN}.png ${PN}.png
+ make_desktop_entry ${PN} ${PN} ${PN}
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_icon_cache_update
+}
diff --git a/dev-util/pycharm-professional/pycharm-professional-2020.1.ebuild b/dev-util/pycharm-professional/pycharm-professional-2020.1.ebuild
new file mode 100644
index 000000000000..6c0277bc9778
--- /dev/null
+++ b/dev-util/pycharm-professional/pycharm-professional-2020.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils readme.gentoo-r1 xdg
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="https://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bundled-jdk"
+
+RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
+ dev-libs/libdbusmenu
+ dev-python/pip"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="*"
+
+MY_PN=${PN/-professional/}
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+ insinto /opt/${PN}
+ doins -r *
+
+ if use bundled-jdk; then
+ fperms -R a+x /opt/pycharm-professional/jbr/bin/
+ else
+ rm -r "${D}"/opt/pycharm-professional/jbr/ || die
+ fi
+
+ fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+ dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+ newicon bin/${MY_PN}.png ${PN}.png
+ make_desktop_entry ${PN} ${PN} ${PN}
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_icon_cache_update
+}
diff --git a/dev-util/pycharm-professional/pycharm-professional-2020.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2020.3.ebuild
index 589bec707843..5599331073fb 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2020.3.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2020.3.ebuild
@@ -1,70 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit gnome2-utils xdg
+inherit gnome2-utils readme.gentoo-r1 xdg
-DESCRIPTION="The Python IDE for Professional Developers"
-HOMEPAGE="https://www.jetbrains.com/pycharm"
-LICENSE="JetBrains"
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="https://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bundled-jdk"
-BDEPEND="
- app-arch/tar
-"
-
-RDEPEND="
- virtual/jdk
+RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
dev-libs/libdbusmenu
- dev-python/pip
-"
-
-RESTRICT="bindist mirror strip"
-
-QA_PREBUILT="
- opt/${PN}/bin/fsnotifier
- opt/${PN}/bin/fsnotifier64
- opt/${PN}/bin/fsnotifier-arm
- opt/${PN}/bin/libyjpagent-linux.so
- opt/${PN}/bin/libyjpagent-linux64.so
-"
-
-MY_PN="pycharm"
-S="${WORKDIR}/${PN}-${PV}"
-
-if [[ ${PV} != 9999 ]]; then
- SRC_URI="https://download.jetbrains.com/python/${PN}-${PV}.tar.gz"
- KEYWORDS="*"
-fi
+ dev-python/pip"
-src_unpack() {
- default
- mv "${WORKDIR}"/pycharm* "${S}" || die "Failed to move/rename source dir"
-}
+RESTRICT="mirror strip"
-src_prepare() {
- default
+QA_PREBUILT="*"
- # Remove any bundled Java
- rm -rf {jbr,jre{64}} || die "Failed to remove bundled Java"
-}
+MY_PN=${PN/-professional/}
+S="${WORKDIR}/${MY_PN}-${PV}"
src_install() {
-
- insinto "/opt/${PN}"
+ insinto /opt/${PN}
doins -r *
- fperms 755 /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+ if use bundled-jdk; then
+ fperms -R a+x /opt/pycharm-professional/jbr/bin/
+ else
+ rm -r "${D}"/opt/pycharm-professional/jbr/ || die
+ fi
+
+ fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+ newicon bin/${MY_PN}.png ${PN}.png
+ make_desktop_entry ${PN} ${PN} ${PN}
+
+ local rub
- newicon "bin/${MY_PN}.png" "${PN}.png"
- make_desktop_entry "${PN}" "PyCharm Professional" "${PN}" "Development;Programming;IDE;"
+ for rub in aarch64 mips64el ppc64le; do
+ rm -r "${D}"/opt/pycharm-professional/lib/pty4j-native/linux/${rub} || die
+ done
- # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
- mkdir -p "${D}/etc/sysctl.d/" || die
- echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+ readme.gentoo_create_doc
}
pkg_postinst() {
diff --git a/dev-util/pycharm-professional/pycharm-professional-9999.ebuild b/dev-util/pycharm-professional/pycharm-professional-9999.ebuild
deleted file mode 100644
index 589bec707843..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-9999.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg
-
-DESCRIPTION="The Python IDE for Professional Developers"
-HOMEPAGE="https://www.jetbrains.com/pycharm"
-LICENSE="JetBrains"
-
-SLOT="0"
-
-BDEPEND="
- app-arch/tar
-"
-
-RDEPEND="
- virtual/jdk
- dev-libs/libdbusmenu
- dev-python/pip
-"
-
-RESTRICT="bindist mirror strip"
-
-QA_PREBUILT="
- opt/${PN}/bin/fsnotifier
- opt/${PN}/bin/fsnotifier64
- opt/${PN}/bin/fsnotifier-arm
- opt/${PN}/bin/libyjpagent-linux.so
- opt/${PN}/bin/libyjpagent-linux64.so
-"
-
-MY_PN="pycharm"
-S="${WORKDIR}/${PN}-${PV}"
-
-if [[ ${PV} != 9999 ]]; then
- SRC_URI="https://download.jetbrains.com/python/${PN}-${PV}.tar.gz"
- KEYWORDS="*"
-fi
-
-src_unpack() {
- default
- mv "${WORKDIR}"/pycharm* "${S}" || die "Failed to move/rename source dir"
-}
-
-src_prepare() {
- default
-
- # Remove any bundled Java
- rm -rf {jbr,jre{64}} || die "Failed to remove bundled Java"
-}
-
-src_install() {
-
- insinto "/opt/${PN}"
- doins -r *
-
- fperms 755 /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
- dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-
- newicon "bin/${MY_PN}.png" "${PN}.png"
- make_desktop_entry "${PN}" "PyCharm Professional" "${PN}" "Development;Programming;IDE;"
-
- # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
- mkdir -p "${D}/etc/sysctl.d/" || die
- echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_icon_cache_update
-}
diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index ed20307b5455..142b017fb2d7 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,4 +1,2 @@
-DIST qbs-src-1.12.2.tar.gz 4374830 BLAKE2B 8ace5ac7fea9bcd944dd02280a36f0f275749512e44ab9e3221e154d80ccf8aa25e3452eb90b1396323b540ec97e4b72c29b3a1d4727a72791a0e267bd89df13 SHA512 eb8c5db94f6b4e2300951d9cb6e092b873381421a1bff31a9e8422859aee3c0b3d038b6a2927a4f5c8fd871a0a7d283f7b7c3be74834dd30d640a1ed9c87a147
-DIST qbs-src-1.14.1.tar.gz 4365537 BLAKE2B 5a51ddea64023c76b6934634f72ab19d54a3e857efe30d7698a3970d099e436599b53b369d81434cc8e721606513bd487010047e60ccfa289574f606cf020dc5 SHA512 df9031e2749ba598129daef0a6b4322ad964c87a33bfd079bb231170da49c42708740ec63e351607b7e9da1dd11310802b14917eaf2ec97bb747a6df9890f2f3
-DIST qbs-src-1.15.0.tar.gz 4531882 BLAKE2B 95ef24a3c63972a5c4111b68c19d57d83552c8c2fd771bda6291d99564c2e3e80488700ceaf88e64bf6edca1d156dc912757ebe682cb5e3d5aec015640e8641f SHA512 461ac2e1574c163149b080936233144b3941024e7f61c2b2514e58089b7fa100e576c0336e16a3c51a0f4b77e575081350550e23b543e86a2023d524aba18d07
DIST qbs-src-1.16.0.tar.gz 4571788 BLAKE2B 4fb06314d0d0a532574e0d245ea85b6d596850ffe4b81b621406d1bc99e0529fc491bf5c7db514d90026c0bf4916f9fa102457aab2bbaaddbbe2e90c03aa04a4 SHA512 65c5398ffad54e10e251bed79a5b58abd722c0f95a031c536fc8647d915dd696923401c767a7a8ac029f4f571b6bbf96ef4b7493bb30768f675477bd68fcc21c
+DIST qbs-src-1.18.0.tar.gz 4921432 BLAKE2B 4c081434596c58d433e52ca9e335e3b4d62b75e401290895719b7fbe4f3c20cf8b34ab0753ae79a34b4e29c8859751a6276da8d6dbd5f3c711581af16ab61415 SHA512 bdef30200c7e74749c363b1d68232fd90d1dfc998722bee0e058ffcaff8e003599e0404b49f86cbeae098d59ccb5663316db5094d77b50a217fcf4ab5ae64d83
diff --git a/dev-util/qbs/qbs-1.12.2.ebuild b/dev-util/qbs/qbs-1.12.2.ebuild
deleted file mode 100644
index c5815752c219..000000000000
--- a/dev-util/qbs/qbs-1.12.2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-MY_P=${PN}-src-${PV}
-
-DESCRIPTION="Modern build tool for software projects"
-HOMEPAGE="https://wiki.qt.io/Qbs"
-SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-# see bug 581874 for the qttest dep in RDEPEND
-RDEPEND="
- dev-qt/qtcore:5=
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtscript:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- test? ( dev-qt/qttest:5 )
-"
-DEPEND="${RDEPEND}
- doc? (
- dev-qt/qdoc:5
- dev-qt/qthelp:5
- )
- test? ( dev-qt/qtdeclarative:5 )
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- default
-
- if ! use examples; then
- sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die
- fi
-
- # the qbsres target uses the newly built qbs binary, so we have to tell it where to find its libraries
- sed -i -e '/qbsres\.commands =/ a\LD_LIBRARY_PATH=$$shell_quote($$shell_path($$QBS_LIBRARY_DIRNAME)) \\' \
- static-res.pro || die
-
- echo "SUBDIRS = $(usex test auto '')" >> tests/tests.pro
-
- # skip several tests that fail and/or have additional deps
- sed -i \
- -e 's/findArchiver("7z")/""/' `# requires p7zip, fails` \
- -e 's/findArchiver(binaryName,.*/"";/' `# requires zip and jar` \
- -e 's/p\.value("nodejs\./true||&/' `# requires nodejs, bug 527652` \
- -e 's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/' `# requires nodejs and typescript` \
- tests/auto/blackbox/tst_blackbox.cpp || die
-
- # requires jdk, fails, bug 585398
- sed -i -e '/blackbox-java\.pro/ d' tests/auto/auto.pro || die
-}
-
-src_configure() {
- local myqmakeargs=(
- qbs.pro # bug 523218
- -recursive
- CONFIG+=qbs_disable_rpath
- CONFIG+=qbs_enable_project_file_updates
- $(usex test 'CONFIG+=qbs_enable_unit_tests' '')
- QBS_INSTALL_PREFIX="${EPREFIX}/usr"
- QBS_LIBRARY_DIRNAME="$(get_libdir)"
- )
- eqmake5 "${myqmakeargs[@]}"
-}
-
-src_test() {
- einfo "Setting up test environment in ${T}"
-
- export HOME=${T}
- export LD_LIBRARY_PATH=${S}/$(get_libdir)
- export QBS_AUTOTEST_PROFILE=autotests
-
- "${S}"/bin/qbs-setup-toolchains --detect || die
- "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" autotests || die
-
- einfo "Running autotests"
-
- # simply exporting LD_LIBRARY_PATH doesn't work
- # we have to use a custom testrunner script
- local testrunner=${WORKDIR}/gentoo-testrunner
- cat <<-EOF > "${testrunner}"
- #!/bin/sh
- export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}"
- exec "\$@"
- EOF
- chmod +x "${testrunner}"
-
- emake TESTRUNNER="'${testrunner}'" check
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
-
- dodoc -r changelogs
-
- # install documentation
- if use doc; then
- emake docs
- dodoc -r doc/qbs/html
- dodoc doc/qbs.qch
- docompress -x /usr/share/doc/${PF}/qbs.qch
- fi
-}
diff --git a/dev-util/qbs/qbs-1.14.1.ebuild b/dev-util/qbs/qbs-1.14.1.ebuild
deleted file mode 100644
index 689ab954a115..000000000000
--- a/dev-util/qbs/qbs-1.14.1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-MY_P=${PN}-src-${PV}
-
-DESCRIPTION="Modern build tool for software projects"
-HOMEPAGE="https://wiki.qt.io/Qbs"
-SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-# see bug 581874 for the qttest dep in RDEPEND
-RDEPEND="
- dev-qt/qtcore:5=
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtscript:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- test? ( dev-qt/qttest:5 )
-"
-DEPEND="${RDEPEND}
- doc? (
- dev-qt/qdoc:5
- dev-qt/qthelp:5
- )
- test? (
- dev-qt/linguist-tools:5
- dev-qt/qtdbus:5
- dev-qt/qtdeclarative:5
- )
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- default
-
- if ! use examples; then
- sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die
- fi
-
- echo "SUBDIRS = $(usex test auto '')" >> tests/tests.pro
-
- # skip several tests that fail and/or have additional deps
- sed -i \
- -e 's/findArchiver("7z")/""/' `# requires p7zip, fails` \
- -e 's/findArchiver(binaryName,.*/"";/' `# requires zip and jar` \
- -e 's/p\.value("nodejs\./true||&/' `# requires nodejs, bug 527652` \
- -e 's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/' `# requires nodejs and typescript` \
- tests/auto/blackbox/tst_blackbox.cpp || die
-
- # requires jdk, fails, bug 585398
- sed -i -e '/blackbox-java\.pro/ d' tests/auto/auto.pro || die
-}
-
-src_configure() {
- local myqmakeargs=(
- qbs.pro # bug 523218
- -recursive
- CONFIG+=qbs_disable_rpath
- CONFIG+=qbs_enable_project_file_updates
- $(usex test 'CONFIG+=qbs_enable_unit_tests' '')
- QBS_INSTALL_PREFIX="${EPREFIX}/usr"
- QBS_LIBRARY_DIRNAME="$(get_libdir)"
- )
- eqmake5 "${myqmakeargs[@]}"
-}
-
-src_test() {
- einfo "Setting up test environment in ${T}"
-
- export HOME=${T}
- export LD_LIBRARY_PATH=${S}/$(get_libdir)
- export QBS_AUTOTEST_PROFILE=autotests
-
- "${S}"/bin/qbs-setup-toolchains --detect || die
- "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" autotests || die
-
- einfo "Running autotests"
-
- # simply exporting LD_LIBRARY_PATH doesn't work
- # we have to use a custom testrunner script
- local testrunner=${WORKDIR}/gentoo-testrunner
- cat <<-EOF > "${testrunner}"
- #!/bin/sh
- export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}"
- exec "\$@"
- EOF
- chmod +x "${testrunner}"
-
- emake TESTRUNNER="'${testrunner}'" check
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
-
- dodoc -r changelogs
-
- # install documentation
- if use doc; then
- emake docs
- dodoc -r doc/qbs/html
- dodoc doc/qbs.qch
- docompress -x /usr/share/doc/${PF}/qbs.qch
- fi
-}
diff --git a/dev-util/qbs/qbs-1.15.0.ebuild b/dev-util/qbs/qbs-1.18.0.ebuild
index 5fa4f467db39..5dfbdf982a61 100644
--- a/dev-util/qbs/qbs-1.15.0.ebuild
+++ b/dev-util/qbs/qbs-1.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ inherit qmake-utils toolchain-funcs
MY_P=${PN}-src-${PV}
DESCRIPTION="Modern build tool for software projects"
-HOMEPAGE="https://wiki.qt.io/Qbs"
+HOMEPAGE="https://doc.qt.io/qbs/"
SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz"
LICENSE="|| ( LGPL-2.1 LGPL-3 )"
@@ -17,7 +17,6 @@ KEYWORDS="~amd64 ~arm ~x86"
IUSE="doc examples test"
RESTRICT="!test? ( test )"
-# see bug 581874 for the qttest dep in RDEPEND
RDEPEND="
dev-qt/qtcore:5=
dev-qt/qtgui:5
@@ -25,7 +24,6 @@ RDEPEND="
dev-qt/qtscript:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
- test? ( dev-qt/qttest:5 )
"
DEPEND="${RDEPEND}
doc? (
@@ -36,6 +34,7 @@ DEPEND="${RDEPEND}
dev-qt/linguist-tools:5
dev-qt/qtdbus:5
dev-qt/qtdeclarative:5
+ dev-qt/qttest:5
)
"
@@ -52,14 +51,11 @@ src_prepare() {
# skip several tests that fail and/or have additional deps
sed -i \
- -e 's/findArchiver("7z")/""/' `# requires p7zip, fails` \
-e 's/findArchiver(binaryName,.*/"";/' `# requires zip and jar` \
-e 's/p\.value("nodejs\./true||&/' `# requires nodejs, bug 527652` \
-e 's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/' `# requires nodejs and typescript` \
tests/auto/blackbox/tst_blackbox.cpp || die
-
- # requires jdk, fails, bug 585398
- sed -i -e '/blackbox-java\.pro/ d' tests/auto/auto.pro || die
+ sed -i -re '/blackbox-(android|apple|java)\.pro/ d' tests/auto/auto.pro || die
}
src_configure() {
@@ -102,9 +98,9 @@ src_test() {
}
src_install() {
- emake INSTALL_ROOT="${D}" install
+ emake -j1 INSTALL_ROOT="${D}" install
- dodoc -r changelogs
+ dodoc -r changelogs CONTRIBUTING.md README.md
# install documentation
if use doc; then
diff --git a/dev-util/quilt/quilt-0.66.ebuild b/dev-util/quilt/quilt-0.66.ebuild
index 0f62fd96875b..147599179f73 100644
--- a/dev-util/quilt/quilt-0.66.ebuild
+++ b/dev-util/quilt/quilt-0.66.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="https://savannah.nongnu.org/download/quilt/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
IUSE="emacs graphviz elibc_Darwin elibc_SunOS"
# unresolved test failures
RESTRICT="test"
diff --git a/dev-util/quilt/quilt-9999.ebuild b/dev-util/quilt/quilt-9999.ebuild
index 1698d8c89c9e..ce1acb35fbf5 100644
--- a/dev-util/quilt/quilt-9999.ebuild
+++ b/dev-util/quilt/quilt-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -16,7 +16,7 @@ HOMEPAGE="https://savannah.nongnu.org/projects/quilt"
LICENSE="GPL-2"
SLOT="0"
[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
IUSE="graphviz elibc_Darwin elibc_SunOS"
RDEPEND="
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 2eb220c54e8d..13664a54135e 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1 +1,2 @@
DIST radare2-4.5.1.tar.gz 8266567 BLAKE2B 0d23c1d47dd79ffd9398ca7b2c8b383ba6a7e3ec662046d1111ab34cabcdaaf1fdd449686433b3229e3c22c31c705530b0a85bbd22b5fc79891a5ad292ba0ff1 SHA512 f08a4cd1e0d65643463d9f9dbb1aacfe793c7b411ec820a18b75a5975d265cfc2cf91e593522c8823aa369098ded21415939acb07c84d8acd102889bf5aed899
+DIST radare2-5.0.0.tar.gz 7897849 BLAKE2B be785b693e9de7264f21b857291286849e054e807d87b4c56a6177a132f9fa141c25661f9d28ea10b61fd298161693794f2ee70279cfd076a2b1a98c563dd2a9 SHA512 059bc341bc34c5f39ef7493af9e2d3b7e52667a2d16f12ef19c9c6ba83c911fd02e07cd527599caea503d5e81a5fedbd8ff343db4d41257e0f48ace9dd52f3ba
diff --git a/dev-util/radare2/files/radare2-4.5.1-docdir.patch b/dev-util/radare2/files/radare2-4.5.1-docdir.patch
new file mode 100644
index 000000000000..51dcd7b16e1b
--- /dev/null
+++ b/dev-util/radare2/files/radare2-4.5.1-docdir.patch
@@ -0,0 +1,12 @@
+Be closer to ${PF} than ${PN}.
+--- a/libr/include/r_userconf.h.acr
++++ b/libr/include/r_userconf.h.acr
+@@ -53,7 +53,7 @@
+ #define R2_ZIGNS R_JOIN_4_PATHS ("share", "radare2", R2_VERSION, "zigns")
+ #define R2_THEMES R_JOIN_4_PATHS ("share", "radare2", R2_VERSION, "cons")
+ #define R2_FLAGS R_JOIN_4_PATHS ("share", "radare2", R2_VERSION, "flag")
+-#define R2_FORTUNES R_JOIN_3_PATHS ("share", "doc", "radare2")
++#define R2_FORTUNES R_JOIN_3_PATHS ("share", "doc", "radare2-" R2_VERSION)
+ #define R2_HUD R_JOIN_4_PATHS ("share", "radare2", R2_VERSION, "hud")
+ #endif
+
diff --git a/dev-util/radare2/radare2-4.5.1-r1.ebuild b/dev-util/radare2/radare2-4.5.1-r1.ebuild
new file mode 100644
index 000000000000..fb844a9458d9
--- /dev/null
+++ b/dev-util/radare2/radare2-4.5.1-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 eutils toolchain-funcs
+
+DESCRIPTION="unix-like reverse engineering framework and commandline tools"
+HOMEPAGE="https://www.radare.org"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/radareorg/radare2"
+else
+ SRC_URI="https://github.com/radareorg/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ssl libressl"
+
+RDEPEND="
+ dev-libs/libzip
+ dev-libs/xxhash
+ sys-apps/file
+ sys-libs/zlib
+ dev-libs/capstone:0=
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+ # Fix hardcoded docdir for fortunes
+ sed -i -e "/^#define R2_FORTUNES/s/radare2/$PF/" \
+ libr/include/r_userconf.h.acr
+ default
+}
+
+src_configure() {
+ # Ideally these should be set by ./configure
+ tc-export CC AR LD OBJCOPY RANLIB
+ export HOST_CC=${CC}
+
+ econf \
+ --without-libuv \
+ --with-syscapstone \
+ --with-sysmagic \
+ --with-sysxxhash \
+ --with-syszip \
+ $(use_with ssl openssl)
+}
+
+src_install() {
+ default
+
+ insinto /usr/share/zsh/site-functions
+ doins doc/zsh/_*
+
+ newbashcomp doc/bash_autocompletion.sh "${PN}"
+ bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2
+
+ # a workaround for unstable $(INSTALL) call, bug #574866
+ local d
+ for d in doc/*; do
+ if [[ -d $d ]]; then
+ rm -rfv "$d" || die "failed to delete '$d'"
+ fi
+ done
+
+ # These are not really docs. radare assumes
+ # uncompressed files: bug #761250
+ docompress -x /usr/share/doc/${PF}/fortunes.{creepy,fun,nsfw,tips}
+}
diff --git a/dev-util/radare2/radare2-4.5.1.ebuild b/dev-util/radare2/radare2-4.5.1.ebuild
index d110cd7ab589..d4e5c4fb79f2 100644
--- a/dev-util/radare2/radare2-4.5.1.ebuild
+++ b/dev-util/radare2/radare2-4.5.1.ebuild
@@ -30,6 +30,8 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
+PATCHES=("${FILESDIR}"/${PN}-4.5.1-docdir.patch)
+
src_configure() {
# Ideally these should be set by ./configure
tc-export CC AR LD OBJCOPY RANLIB
@@ -57,4 +59,8 @@ src_install() {
rm -rfv "$d" || die "failed to delete '$d'"
fi
done
+
+ # These are not really docs. radare assumes
+ # uncompressed files: bug #761250
+ docompress -x /usr/share/doc/${PF}/fortunes.{creepy,fun,nsfw,tips}
}
diff --git a/dev-util/radare2/radare2-5.0.0.ebuild b/dev-util/radare2/radare2-5.0.0.ebuild
new file mode 100644
index 000000000000..fb844a9458d9
--- /dev/null
+++ b/dev-util/radare2/radare2-5.0.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 eutils toolchain-funcs
+
+DESCRIPTION="unix-like reverse engineering framework and commandline tools"
+HOMEPAGE="https://www.radare.org"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/radareorg/radare2"
+else
+ SRC_URI="https://github.com/radareorg/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ssl libressl"
+
+RDEPEND="
+ dev-libs/libzip
+ dev-libs/xxhash
+ sys-apps/file
+ sys-libs/zlib
+ dev-libs/capstone:0=
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+ # Fix hardcoded docdir for fortunes
+ sed -i -e "/^#define R2_FORTUNES/s/radare2/$PF/" \
+ libr/include/r_userconf.h.acr
+ default
+}
+
+src_configure() {
+ # Ideally these should be set by ./configure
+ tc-export CC AR LD OBJCOPY RANLIB
+ export HOST_CC=${CC}
+
+ econf \
+ --without-libuv \
+ --with-syscapstone \
+ --with-sysmagic \
+ --with-sysxxhash \
+ --with-syszip \
+ $(use_with ssl openssl)
+}
+
+src_install() {
+ default
+
+ insinto /usr/share/zsh/site-functions
+ doins doc/zsh/_*
+
+ newbashcomp doc/bash_autocompletion.sh "${PN}"
+ bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2
+
+ # a workaround for unstable $(INSTALL) call, bug #574866
+ local d
+ for d in doc/*; do
+ if [[ -d $d ]]; then
+ rm -rfv "$d" || die "failed to delete '$d'"
+ fi
+ done
+
+ # These are not really docs. radare assumes
+ # uncompressed files: bug #761250
+ docompress -x /usr/share/doc/${PF}/fortunes.{creepy,fun,nsfw,tips}
+}
diff --git a/dev-util/radare2/radare2-9999.ebuild b/dev-util/radare2/radare2-9999.ebuild
index 93f9c86afe9a..fb844a9458d9 100644
--- a/dev-util/radare2/radare2-9999.ebuild
+++ b/dev-util/radare2/radare2-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit bash-completion-r1 eutils
+inherit bash-completion-r1 eutils toolchain-funcs
DESCRIPTION="unix-like reverse engineering framework and commandline tools"
HOMEPAGE="https://www.radare.org"
@@ -21,6 +21,10 @@ SLOT="0"
IUSE="ssl libressl"
RDEPEND="
+ dev-libs/libzip
+ dev-libs/xxhash
+ sys-apps/file
+ sys-libs/zlib
dev-libs/capstone:0=
ssl? (
!libressl? ( dev-libs/openssl:0= )
@@ -30,10 +34,24 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
+src_prepare() {
+ # Fix hardcoded docdir for fortunes
+ sed -i -e "/^#define R2_FORTUNES/s/radare2/$PF/" \
+ libr/include/r_userconf.h.acr
+ default
+}
+
src_configure() {
+ # Ideally these should be set by ./configure
+ tc-export CC AR LD OBJCOPY RANLIB
+ export HOST_CC=${CC}
+
econf \
--without-libuv \
--with-syscapstone \
+ --with-sysmagic \
+ --with-sysxxhash \
+ --with-syszip \
$(use_with ssl openssl)
}
@@ -53,4 +71,8 @@ src_install() {
rm -rfv "$d" || die "failed to delete '$d'"
fi
done
+
+ # These are not really docs. radare assumes
+ # uncompressed files: bug #761250
+ docompress -x /usr/share/doc/${PF}/fortunes.{creepy,fun,nsfw,tips}
}
diff --git a/dev-util/ragel/Manifest b/dev-util/ragel/Manifest
index e5437be78e17..1e144737777b 100644
--- a/dev-util/ragel/Manifest
+++ b/dev-util/ragel/Manifest
@@ -1,2 +1,2 @@
-DIST ragel-7.0.0.10.tar.gz 779503 BLAKE2B 2f7b8bb858555719b0c7afa8209be76fd07f9d06a8f75df723211c48d59f50c21f09a1f1fa031d53e434db933d1bc12299c75d8932485e5a43eccef7506667ad SHA512 2d1d4c469d8581239ec21f128e94ab452b398903302f82ef59ce03d6fb89bc89de6441dbe53ea99d7689866f7aec485ab1ec9c537908f21eb1394650b55413ba
-DIST ragel-7.0.0.12.tar.gz 1543127 BLAKE2B c3024c55eb5397f78159da83e318923529d3c1f10cc802564ac13c39b18c261166e27e4f315bbaa49e7eb9afa6840ca72aa62d7ae14d46f20865db64e3ab6759 SHA512 32ec90eddfd209e50995f21b9a5fcddd2b94279828227d367d990d7bfa8e4412682631d4e6ae5081871bac23d96153b96fb4494b991c70bf38df8cc0ddc8866d
+DIST ragel-7.0.1.tar.gz 1644746 BLAKE2B 34ea866a0fc05d0de9eef402bee67a12bd17cd972146e0fbb173e0efc670ea830844936973dd6918c6d7160e0f91ad0715aaccf9be519f7d602257a58fa7dddd SHA512 45dc1688206fd1acc014769a166dfecc5a3b2b5d904568baeac5987b2f4b7c4fa6f91a41a1d6c3a23ec85a99a70515f67d55f6b62d4a78901cac71a33db88ce9
+DIST ragel-7.0.2.tar.gz 1656530 BLAKE2B 590d4b87b73f72c4f4af4b1562fe9c2c4555b6d30e1a963794b15ff0a7dcdc8b7c4d828a4eadade835dd517b3934c1346e1e8499097927b58e818142d2575d10 SHA512 5550860f167cbf2646d2c1d59dcf38d3612b5f20099576a5191287a8bf1e574ff8d06902224147fcc989a9f5512f85c00b3546b41771ed0940b391f7e5fd600b
diff --git a/dev-util/ragel/files/colm_version.patch b/dev-util/ragel/files/colm_version.patch
new file mode 100644
index 000000000000..7cac3f1418eb
--- /dev/null
+++ b/dev-util/ragel/files/colm_version.patch
@@ -0,0 +1,80 @@
+From 348c2ee9272e3e546d81b2a17f026cae1781921c Mon Sep 17 00:00:00 2001
+From: Adrian Thurston <thurston@colm.net>
+Date: Wed, 23 Dec 2020 21:45:12 -0800
+Subject: [PATCH] removed COLM_VERSION and RAGEL_VERSION
+
+also expect colm 0.14.4, the latest release
+---
+ configure.ac | 13 ++-----------
+ src/Makefile.am | 4 ++--
+ src/inputdata.cc | 4 ++--
+ 3 files changed, 6 insertions(+), 15 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7d2b681c..b3d2a50e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -21,12 +21,7 @@ dnl OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN TH
+ dnl SOFTWARE.
+
+ AC_INIT(ragel, 7.0.1)
+-
+-RAGEL_VERSION="7.0.1"
+-RAGEL_PUBDATE="November 2020"
+-
+-COLM_VERSION="---"
+-COLM_PUBDATE="---"
++PUBDATE="November 2020"
+
+ AM_INIT_AUTOMAKE([foreign])
+
+@@ -36,10 +31,6 @@ AM_INIT_AUTOMAKE([foreign])
+ AC_CONFIG_MACRO_DIR([m4])
+
+ AC_SUBST(PUBDATE)
+-AC_SUBST(COLM_VERSION)
+-AC_SUBST(COLM_PUBDATE)
+-AC_SUBST(RAGEL_VERSION)
+-AC_SUBST(RAGEL_PUBDATE)
+ AC_CHECK_SIZEOF([int])
+ AC_CHECK_SIZEOF([long])
+ AC_CHECK_SIZEOF([void *])
+@@ -74,7 +65,7 @@ AC_SUBST(COLM_SHARE)
+ AC_SUBST(LIBCOLM_LA)
+ AC_SUBST(LIBFSM_LA)
+
+-EXPECTED_COLM_VER=0.14.2
++EXPECTED_COLM_VER=0.14.4
+ INSTALLED_COLM_VER=`$COLM -v | sed -n -e '1 {' -e 's/^.*version //' -e 's/ .*$//' -e p -e '}'`
+ if test "x$INSTALLED_COLM_VER" != "x$EXPECTED_COLM_VER"; then
+ AC_ERROR( [check colm: expected version $EXPECTED_COLM_VER, but $INSTALLED_COLM_VER is installed] )
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 6fa1cfd9..8b7bf2bd 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -59,8 +59,8 @@ BUILT_SOURCES += \
+ endif
+
+ version.h: Makefile
+- echo '#define RAGEL_VERSION "@RAGEL_VERSION@"' > version.h
+- echo '#define RAGEL_PUBDATE "@RAGEL_PUBDATE@"' >> version.h
++ echo '#define VERSION "@VERSION@"' > version.h
++ echo '#define PUBDATE "@PUBDATE@"' >> version.h
+
+ EXTRA_DIST = \
+ $(RAGEL_LM) \
+diff --git a/src/inputdata.cc b/src/inputdata.cc
+index 33a0b5b8..d260d951 100644
+--- a/src/inputdata.cc
++++ b/src/inputdata.cc
+@@ -647,8 +647,8 @@ void InputData::usage()
+ /* Print version information and exit. */
+ void InputData::version()
+ {
+- info() << "Ragel State Machine Compiler version " RAGEL_VERSION << " " RAGEL_PUBDATE << endl <<
+- "Copyright (c) 2001-2019 by Adrian Thurston et al." << endl;
++ info() << "Ragel State Machine Compiler version " VERSION << " " PUBDATE << endl <<
++ "Copyright (c) 2001-2021 by Dr. Adrian D. Thurston et al." << endl;
+ abortCompile( 0 );
+ }
+
diff --git a/dev-util/ragel/files/ragel-7.0.0.10-use-pkginclude.patch b/dev-util/ragel/files/ragel-7.0.0.10-use-pkginclude.patch
deleted file mode 100644
index 6609af5a99a2..000000000000
--- a/dev-util/ragel/files/ragel-7.0.0.10-use-pkginclude.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 927f380272442ae803fdccfc001b55877f25e7dc Mon Sep 17 00:00:00 2001
-From: Adrian Thurston <thurston@colm.net>
-Date: Sat, 10 Dec 2016 15:41:30 -0500
-Subject: [PATCH] use pkginclude for the headers
-
----
- aapl/Makefile.am | 2 +-
- src/Makefile.am | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/aapl/Makefile.am b/aapl/Makefile.am
-index fd9f9cb0..80b972f1 100644
---- a/aapl/Makefile.am
-+++ b/aapl/Makefile.am
-@@ -1,4 +1,4 @@
--include_HEADERS = \
-+pkginclude_HEADERS = \
- avlbasic.h avlimel.h avlmap.h bstcommon.h compare.h insertsort.h \
- sbstset.h avlcommon.h avlimelkey.h avlmel.h bstmap.h dlcommon.h \
- mergesort.h sbsttable.h avlibasic.h avliset.h avlmelkey.h bstset.h \
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 24a19a4b..60554a99 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -16,11 +16,11 @@ bin_PROGRAMS = ragel
-
- endif
-
--include_HEADERS = \
-+pkginclude_HEADERS = \
- action.h fsmgraph.h ragel.h common.h \
- gendata.h redfsm.h dot.h
-
--nodist_include_HEADERS = config.h
-+nodist_pkginclude_HEADERS = config.h
-
- ragel_CPPFLAGS = -I$(top_srcdir)/aapl -DBINDIR='"@bindir@"'
-
---
-2.15.1
-
diff --git a/dev-util/ragel/ragel-7.0.0.10-r2.ebuild b/dev-util/ragel/ragel-7.0.1-r1.ebuild
index dc77bc5fb7eb..738e14a8e90f 100644
--- a/dev-util/ragel/ragel-7.0.0.10-r2.ebuild
+++ b/dev-util/ragel/ragel-7.0.1-r1.ebuild
@@ -13,9 +13,12 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86 ~amd64-linux ~x86-linux"
IUSE="vim-syntax"
-DEPEND="~dev-util/colm-0.13.0.5"
+DEPEND=">=dev-util/colm-0.14.2"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${P}-use-pkginclude.patch" )
+
+PATCHES=(
+ "${FILESDIR}/colm_version.patch"
+)
src_prepare() {
default
@@ -23,7 +26,7 @@ src_prepare() {
}
src_configure() {
- econf --disable-static
+ econf --with-colm=/usr --disable-manual
}
src_test() {
diff --git a/dev-util/ragel/ragel-7.0.0.12.ebuild b/dev-util/ragel/ragel-7.0.2.ebuild
index 5a32841231b1..6e6efe86a9ba 100644
--- a/dev-util/ragel/ragel-7.0.0.12.ebuild
+++ b/dev-util/ragel/ragel-7.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Liguros Authors
+# Copyright 2020-2021 Liguros Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86 ~amd64-linux ~x86-linux"
IUSE="vim-syntax"
-DEPEND=">=dev-util/colm-0.13.0.7"
+DEPEND=">=dev-util/colm-0.14.2"
RDEPEND="${DEPEND}"
src_prepare() {
@@ -22,7 +22,7 @@ src_prepare() {
}
src_configure() {
- econf --disable-static
+ econf --with-colm=/usr --disable-manual
}
src_test() {
diff --git a/dev-util/rats/rats-2.4.ebuild b/dev-util/rats/rats-2.4.ebuild
index 0a41658a9907..861cd2aa5c67 100644
--- a/dev-util/rats/rats-2.4.ebuild
+++ b/dev-util/rats/rats-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.go
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
RDEPEND="dev-libs/expat:="
diff --git a/dev-util/rbtools/rbtools-2.0.ebuild b/dev-util/rbtools/rbtools-2.0.ebuild
index e3123c6c471e..296d22876b25 100644
--- a/dev-util/rbtools/rbtools-2.0.ebuild
+++ b/dev-util/rbtools/rbtools-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/dev-util/re2c/re2c-2.0.3.ebuild b/dev-util/re2c/re2c-2.0.3.ebuild
index 4c1abd02d5ba..7b7d532c8ef0 100644
--- a/dev-util/re2c/re2c-2.0.3.ebuild
+++ b/dev-util/re2c/re2c-2.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.xz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug"
src_configure() {
diff --git a/dev-util/rider/Manifest b/dev-util/rider/Manifest
index c35c3b68fc5c..8bdef17d99af 100644
--- a/dev-util/rider/Manifest
+++ b/dev-util/rider/Manifest
@@ -1,3 +1,3 @@
-DIST JetBrains.Rider-2020.2.4.tar.gz 829320879 BLAKE2B 8df9eaf7d756e548c1b597051c60da5ddb6bf04030a590698a0d7f9e4e1e9f05350d60ca82392f71671989a8e50eac5d54b61792e70e8f9050b5fcfed3a3f036 SHA512 493eb3494cdd159373889c48ffbf7ee47f07a9bf3d13c92b39b5e2c6eda5a7783cf2ec885b66e10c8df29f65181090b1eec2331e449b00d4d028129ff444bfda
-EBUILD rider-2020.2.4.ebuild 1402 BLAKE2B 8d30ee1699026917b27d17ad634cbd8f4b763f9dbcb0c6f2889a14d35ef9de5f4d0cc8cf8a199beafe6bfc0b1cf2071cb708e0906158e5e7a37c2ed8286eac11 SHA512 48edc2cb478aca65942062aa8ad00c95e176e60528e2626715b34a2f45018c5dc51d34a9f1234f79973a621df2d67eea27a38cf6ced4125cbc3926f5126e1184
+DIST JetBrains.Rider-2020.3.2.tar.gz 916913040 BLAKE2B 4115812941ec0a195fd846bef66fd195a407a5ba3ec1d8de1a73e195d4f44e24ecb00dc90a9368cff81a07e61d1b4e046728ae2eb31255a32706fdb6cedd6626 SHA512 cc8982933a75780ad7102f9d68984b3bd8a737a35a6aa16d241d8f569ef6989db68abf0225049d58b86dcc311de0be6f5b9a56119f8da7e2600f339177548be9
+EBUILD rider-2020.3.2.ebuild 1402 BLAKE2B 8d30ee1699026917b27d17ad634cbd8f4b763f9dbcb0c6f2889a14d35ef9de5f4d0cc8cf8a199beafe6bfc0b1cf2071cb708e0906158e5e7a37c2ed8286eac11 SHA512 48edc2cb478aca65942062aa8ad00c95e176e60528e2626715b34a2f45018c5dc51d34a9f1234f79973a621df2d67eea27a38cf6ced4125cbc3926f5126e1184
EBUILD rider-9999.ebuild 1402 BLAKE2B 8d30ee1699026917b27d17ad634cbd8f4b763f9dbcb0c6f2889a14d35ef9de5f4d0cc8cf8a199beafe6bfc0b1cf2071cb708e0906158e5e7a37c2ed8286eac11 SHA512 48edc2cb478aca65942062aa8ad00c95e176e60528e2626715b34a2f45018c5dc51d34a9f1234f79973a621df2d67eea27a38cf6ced4125cbc3926f5126e1184
diff --git a/dev-util/rider/rider-2020.2.4.ebuild b/dev-util/rider/rider-2020.3.2.ebuild
index a63950de2c7e..a63950de2c7e 100644
--- a/dev-util/rider/rider-2020.2.4.ebuild
+++ b/dev-util/rider/rider-2020.3.2.ebuild
diff --git a/dev-util/rocm-cmake/Manifest b/dev-util/rocm-cmake/Manifest
index f3b7fb465448..acde44ac095d 100644
--- a/dev-util/rocm-cmake/Manifest
+++ b/dev-util/rocm-cmake/Manifest
@@ -1,3 +1,4 @@
DIST rocm-cmake-3.10.0.tar.gz 15825 BLAKE2B d54140431c5ce11250bd1b9fbdc03ce6de628a48e83fba89a93a4c6062319c52085ec036a7c1f2bf9605de3c276abfbec6864aea456ada5dfbde2f857da5394c SHA512 f58d17af522332b9a3366d47e44e61a361f83a3f5dcea6a410025e2383a1231435243ce123f5d8044e77b7572682be8d4d2a1f08d364e5be6a8cb25c4a8c4c69
DIST rocm-cmake-3.8.0.tar.gz 15823 BLAKE2B 321d31769cee254f9f9048104c7837fc6eb4a224d53e3e3ec18d5fa283f33cb116ece739a19f791cf62ac84f533933233461fd9e470b5c413363aa58fe23b57a SHA512 52e71033ef85b526edc00c1c11681c888ca7a50cf70a69f111ac2d7d32821340d8c812714a525711ff7ec54c8e7cbb79c4cb620a6e559699c509397ebf1b5886
DIST rocm-cmake-3.9.0.tar.gz 15815 BLAKE2B 86fedeb90ee27367b5fcfe842009055ef073932823fe54c9c6b7dfc7d08e92165c6cb4befebee347645777948b8c24de0c90f2547648cadbd34d39de2da540ef SHA512 bda392023494929ae743a81afdb4b802a3f7728a101ec06dd49c2e1d1165a2306d25beda6a4ea7dfc0aeeeee3f8bad8949d5c897618a362262570d6582c789db
+DIST rocm-cmake-4.0.0.tar.gz 15815 BLAKE2B a6e6ce5f63ea6e1c14ce4c74a627d54987321e20d977e575615caa7037f2e3c734cc9f88dc5cdff7a9ee81caefab17440043bdc88a201d4fec29eb167ea709fe SHA512 1d42f7d17f783355b7d559db17020258dd686a0439c481cde04bb3750494dc2e5757dad0fed7e96c1da6ce875b03f97366efec5a75ece09fd92fbd9265a58e34
diff --git a/dev-util/rocm-cmake/rocm-cmake-4.0.0.ebuild b/dev-util/rocm-cmake/rocm-cmake-4.0.0.ebuild
new file mode 100644
index 000000000000..a8e68baa5599
--- /dev/null
+++ b/dev-util/rocm-cmake/rocm-cmake-4.0.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm-cmake/"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/RadeonOpenCompute/rocm-cmake/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+ S="${WORKDIR}/rocm-cmake-rocm-${PV}"
+fi
+
+DESCRIPTION="Radeon Open Compute CMake Modules"
+HOMEPAGE="https://github.com/RadeonOpenCompute/rocm-cmake"
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="test"
+
+src_prepare() {
+ sed -e "s:set(ROCM_INSTALL_LIBDIR lib):set(ROCM_INSTALL_LIBDIR $(get_libdir)):" -i "${S}/share/rocm/cmake/ROCMInstallTargets.cmake" || die
+ cmake_src_prepare
+}
diff --git a/dev-util/rocm-smi/Manifest b/dev-util/rocm-smi/Manifest
new file mode 100644
index 000000000000..d19074784f55
--- /dev/null
+++ b/dev-util/rocm-smi/Manifest
@@ -0,0 +1 @@
+DIST rocm-smi-4.0.0.tar.gz 45065 BLAKE2B 90a28c162099deaa67c98701b79328c760973d88fa598f8a66116927483f25dbfd85366312c4c6e8e64fa2199dfb32fb661db04b464bd58cb39dea09a84ac51e SHA512 63c1274470df079320164d29cb4c009f52e59ffebdadfefe73cbe21238a70858fd5a86417b9f81ab2c405bc64707b02ddbf65e9d301f757f245b60152cd63dcf
diff --git a/dev-util/rocm-smi/metadata.xml b/dev-util/rocm-smi/metadata.xml
new file mode 100644
index 000000000000..f2e28de4299a
--- /dev/null
+++ b/dev-util/rocm-smi/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>candrews@gentoo.org</email>
+ <name>Craig Andrews</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>gentoo@holzke.net</email>
+ <name>Wilfried Holzke</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">RadeonOpenCompute/ROC-smi</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-util/rocm-smi/rocm-smi-4.0.0.ebuild b/dev-util/rocm-smi/rocm-smi-4.0.0.ebuild
new file mode 100644
index 000000000000..d03b116dcfa1
--- /dev/null
+++ b/dev-util/rocm-smi/rocm-smi-4.0.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit python-single-r1
+
+DESCRIPTION="ROCm System Management Interface"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROC-smi"
+
+if [[ ${PV} == *9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROC-smi"
+ EGIT_BRANCH="master"
+else
+ SRC_URI="https://github.com/RadeonOpenCompute/ROC-smi/archive/rocm-${PV}.tar.gz -> rocm-smi-${PV}.tar.gz"
+ KEYWORDS="~amd64"
+ S="${WORKDIR}/ROC-smi-rocm-${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+RDEPEND="${PYTHON_DEPS}"
+
+src_install() {
+ python_scriptinto /usr/bin
+ python_newscript rocm_smi.py rocm-smi
+}
diff --git a/dev-util/rocm-smi/rocm-smi-9999.ebuild b/dev-util/rocm-smi/rocm-smi-9999.ebuild
new file mode 100644
index 000000000000..d03b116dcfa1
--- /dev/null
+++ b/dev-util/rocm-smi/rocm-smi-9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit python-single-r1
+
+DESCRIPTION="ROCm System Management Interface"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROC-smi"
+
+if [[ ${PV} == *9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROC-smi"
+ EGIT_BRANCH="master"
+else
+ SRC_URI="https://github.com/RadeonOpenCompute/ROC-smi/archive/rocm-${PV}.tar.gz -> rocm-smi-${PV}.tar.gz"
+ KEYWORDS="~amd64"
+ S="${WORKDIR}/ROC-smi-rocm-${PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+RDEPEND="${PYTHON_DEPS}"
+
+src_install() {
+ python_scriptinto /usr/bin
+ python_newscript rocm_smi.py rocm-smi
+}
diff --git a/dev-util/rocminfo/Manifest b/dev-util/rocminfo/Manifest
index 02acf1b59200..46edea5438d5 100644
--- a/dev-util/rocminfo/Manifest
+++ b/dev-util/rocminfo/Manifest
@@ -2,3 +2,4 @@ DIST rocminfo-3.10.0.tar.gz 15106 BLAKE2B 7cc90a1c0b9c5f8664dc6c9bebe83f59052656
DIST rocminfo-3.7.0.tar.gz 15104 BLAKE2B 728ce471e52dadca8b59aa3196c2f75933650e3002335014accd7f8eada19d4936a7404f908d50747a0e51faa8a65764200072cf598f9d0855a3052db8290160 SHA512 25a6a9216366e310ece9db50a21bc0eb7741760a7b46fa1818ee102557000348f430f9269e2ba9e872437dfafcb31ac563476e2bf83a10705fde8dd5fc854404
DIST rocminfo-3.8.0.tar.gz 15103 BLAKE2B afa6a2cd3315b18f2711cf1de4701e672beac76d08548453f9377c865f2b108f4f50340f545a9040450c7acded3ac093d334908a7ceddba35c847136fe92aa77 SHA512 c75fa7a4116b9cfa75d6b7ff3920c85ad19fea09ab5f6a7abebde9cd184763905aea8684574f6b1919044806af8ab35a81d7f6010cbd0fb18b36699a182b5f39
DIST rocminfo-3.9.0.tar.gz 15106 BLAKE2B 0be734ee03298a83892fb237f7b171c7bb5779d153efa2f49ceadd27a32709fd7f6fe4895d43c7d55763be6a5ddf22a4ab9c6b42e4f28946b0d35d44cd897d54 SHA512 aaa2feaad1e0c8583f5211d629934c270f30c046d4e4067c142ea5ddc4fba95c6719d38cd623d1f5190962ccbbfc63196a3f4618d84e9b223bc6ee8cc5544530
+DIST rocminfo-4.0.0.tar.gz 15104 BLAKE2B 858d0856a63af88bfb8d948f729fa4108aff0bbe21270d9679d14a2b5bb3230471f498143ce67921af3271e619896ca2cb1a624029f3154e7aa127c018dc9d74 SHA512 40496919dd40cd3a551c01be6023d81a60aebefa5aebdd2aee87cdec44fde4b54b89b67c380d65e25747ae7fc4d5b592dd01d4728dde447079ee7f63396c0c1a
diff --git a/dev-util/rocminfo/rocminfo-4.0.0.ebuild b/dev-util/rocminfo/rocminfo-4.0.0.ebuild
new file mode 100644
index 000000000000..6de4e9b7cca0
--- /dev/null
+++ b/dev-util/rocminfo/rocminfo-4.0.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/RadeonOpenCompute/rocminfo/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+ S="${WORKDIR}/rocminfo-rocm-${PV}"
+fi
+
+DESCRIPTION="ROCm Application for Reporting System Info"
+HOMEPAGE="https://github.com/RadeonOpenCompute/rocminfo"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=dev-libs/rocr-runtime-${PV}"
+DEPEND="${RDEPEND}"
diff --git a/dev-util/rosdep/Manifest b/dev-util/rosdep/Manifest
index 46d0f5d75102..12b266dc4a00 100644
--- a/dev-util/rosdep/Manifest
+++ b/dev-util/rosdep/Manifest
@@ -1 +1 @@
-DIST rosdep-0.19.0.tar.gz 309029 BLAKE2B d4d9f607757c418f848a89987db6ff17a98719d0cacab49250abf45145a9f5b538d9442622ec3a8c3536061e82e624f25c9a7b777662b686167e2fdce88433ec SHA512 3e1d5829689646d583da2eaaf3b8bbddec3cb4ca3dc3941ee2697f6367510a4dcff11984fa1792a400f49132778d7869f0a8274e42bc8c04f2e326e6a663c494
+DIST rosdep-0.20.0.tar.gz 310881 BLAKE2B f81275e6b88de10b1bd080feaa97a5f870aea6f4bfa7d8ccaa788df01b5b43890f99fee3d2bdbf7dda811745a89d54aac948201a218dd32d56f2ed49eefbdaf8 SHA512 f464b4a1bd3ef437f4ef0ca55eed873125c537aed793b22e99dcdfdeb078bdd3dc03cbe75b67d6ba7b29c7390b893f85c436fb90fc339a26dca338e8652db917
diff --git a/dev-util/rosdep/files/tests.patch b/dev-util/rosdep/files/tests.patch
index cd6e199b3cd0..fa4fcfdb36a8 100644
--- a/dev-util/rosdep/files/tests.patch
+++ b/dev-util/rosdep/files/tests.patch
@@ -1,16 +1,3 @@
-Index: rosdep-0.19.0/src/rosdep2/platforms/osx.py
-===================================================================
---- rosdep-0.19.0.orig/src/rosdep2/platforms/osx.py
-+++ rosdep-0.19.0/src/rosdep2/platforms/osx.py
-@@ -303,7 +303,7 @@ class HomebrewInstaller(PackageManagerIn
-
- # make sure options is a list of list of strings
- try:
-- valid = all([isinstance(x, _basestring) for l in options for x in l])
-+ valid = all([isinstance(x, _basestring) for option in options for x in option])
- except Exception as e:
- raise InvalidData("Invalid list of options '%s', error: %s" % (options, e))
- else:
Index: rosdep-0.19.0/test/test_rosdep_gentoo.py
===================================================================
--- rosdep-0.19.0.orig/test/test_rosdep_gentoo.py
diff --git a/dev-util/rosdep/rosdep-0.19.0-r1.ebuild b/dev-util/rosdep/rosdep-0.20.0.ebuild
index 66fe175c9bfd..81e703d9c941 100644
--- a/dev-util/rosdep/rosdep-0.19.0-r1.ebuild
+++ b/dev-util/rosdep/rosdep-0.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/dev-util/rt-tests/Manifest b/dev-util/rt-tests/Manifest
index 8ef3346de3ca..9ef496a4e6c1 100644
--- a/dev-util/rt-tests/Manifest
+++ b/dev-util/rt-tests/Manifest
@@ -1 +1 @@
-DIST rt-tests-1.9.tar.xz 112180 BLAKE2B fa9b7b70bd9ae5d5f5e1077ddbd916bc4556d079d4067f16289ab34fec16ed0c8074607a7a8e50ea7bad4df318a063074f1c0ec5c2e895851d3045d51a8ecd74 SHA512 66f086dbda31567e6dc5297424ec66b2c6bd7cb0e065c32e02c326f33967f3a301b1b34f9eb0dd0acd853279c64fb1c2bc271ac26648f4abc3f6090ba6484cfa
+DIST rt-tests-1.10.tar.xz 112300 BLAKE2B b38a7357b1402de94661014e71ed9fc48d9dde6cabbe72ed4031841b57f7fb76a01dda03c7888f11d8e5e9c11cda8281dae1b437f0d1ff971d2941547f659103 SHA512 9512419b364746ad490894c7184a391f0e8d571477ad636abff8ed473151c6f2c263475ca4aa7d498e81c18e17e42ae82260693b90bce4ef9889e0eaf0b77b58
diff --git a/dev-util/rt-tests/files/rt-tests-1.9-musl.patch b/dev-util/rt-tests/files/rt-tests-1.10-musl.patch
index 0114cd004473..2dc17d504922 100644
--- a/dev-util/rt-tests/files/rt-tests-1.9-musl.patch
+++ b/dev-util/rt-tests/files/rt-tests-1.10-musl.patch
@@ -1,4 +1,4 @@
-From fd78f200ac8e9d1eb7579cd9e4adaaa1a4dc2d46 Mon Sep 17 00:00:00 2001
+From 0b7a1e0d3463aa8aa4b7dcad0ec154e658d68036 Mon Sep 17 00:00:00 2001
From: Kurt Kanzenbach <kurt@kmk-computers.de>
Date: Wed, 1 Apr 2020 20:15:24 +0200
Subject: [PATCH] all: Fix musl build
@@ -16,7 +16,7 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
---
Makefile | 5 --
src/backfire/sendme.c | 1 +
- src/cyclictest/cyclictest.c | 68 ++++-----------------------
+ src/cyclictest/cyclictest.c | 70 ++++-----------------------
src/hackbench/hackbench.c | 4 +-
src/include/musl.h | 28 +++++++++++
src/lib/rt-utils.c | 1 +
@@ -26,11 +26,11 @@ Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
src/ptsematest/ptsematest.c | 1 +
src/rt-migrate-test/rt-migrate-test.c | 1 +
src/sched_deadline/cyclicdeadline.c | 2 +
- 12 files changed, 50 insertions(+), 66 deletions(-)
+ 12 files changed, 51 insertions(+), 67 deletions(-)
create mode 100644 src/include/musl.h
diff --git a/Makefile b/Makefile
-index c3ebbd7b2a2e..8815c113c0df 100644
+index 636f1914a777..01732ee2647f 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,6 @@ OBJDIR = bld
@@ -41,17 +41,17 @@ index c3ebbd7b2a2e..8815c113c0df 100644
pmqtest.c \
ptsematest.c \
rt-migrate-test.c \
-@@ -36,7 +35,6 @@ LDFLAGS ?=
- PYLIB ?= $(shell python3 -c 'import distutils.sysconfig; print (distutils.sysconfig.get_python_lib())')
+@@ -42,7 +41,6 @@ ifeq (${PYLIB},)
+ endif
MANPAGES = src/cyclictest/cyclictest.8 \
- src/pi_tests/pi_stress.8 \
src/ptsematest/ptsematest.8 \
src/rt-migrate-test/rt-migrate-test.8 \
src/sigwaittest/sigwaittest.8 \
-@@ -129,9 +127,6 @@ deadline_test: $(OBJDIR)/deadline_test.o $(OBJDIR)/librttest.a
- signaltest: $(OBJDIR)/signaltest.o $(OBJDIR)/librttest.a
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB)
+@@ -130,9 +128,6 @@ deadline_test: $(OBJDIR)/deadline_test.o $(OBJDIR)/librttest.a
+ signaltest: $(OBJDIR)/signaltest.o $(OBJDIR)/librttest.a $(OBJDIR)/librttestnuma.a
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB) $(RTTESTNUMA)
-pi_stress: $(OBJDIR)/pi_stress.o $(OBJDIR)/librttest.a
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB)
@@ -72,18 +72,18 @@ index d963723b1c93..b355bbbcfece 100644
#include <utmpx.h>
#include <sys/types.h>
diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
-index b41d42f13f24..56b27a4e0547 100644
+index f38c453f1975..b6b91218f756 100644
--- a/src/cyclictest/cyclictest.c
+++ b/src/cyclictest/cyclictest.c
-@@ -36,6 +36,7 @@
- #include "rt_numa.h"
+@@ -37,6 +37,7 @@
#include "rt-utils.h"
+ #include "rt-numa.h"
+#include "musl.h"
#include <bionic.h>
-@@ -501,12 +502,8 @@ static void *timerthread(void *param)
+@@ -500,12 +501,8 @@ static void *timerthread(void *param)
{
struct thread_param *par = param;
struct sched_param schedp;
@@ -96,7 +96,7 @@ index b41d42f13f24..56b27a4e0547 100644
struct thread_stat *stat = par->stats;
int stopped = 0;
cpu_set_t mask;
-@@ -537,14 +534,6 @@ static void *timerthread(void *param)
+@@ -536,14 +533,6 @@ static void *timerthread(void *param)
sigaddset(&sigset, par->signal);
sigprocmask(SIG_BLOCK, &sigset, NULL);
@@ -111,7 +111,7 @@ index b41d42f13f24..56b27a4e0547 100644
memset(&schedp, 0, sizeof(schedp));
schedp.sched_priority = par->prio;
if (setscheduler(0, par->policy, &schedp))
-@@ -599,20 +588,6 @@ static void *timerthread(void *param)
+@@ -598,20 +587,6 @@ static void *timerthread(void *param)
stop = now;
stop.tv_sec += duration;
}
@@ -132,7 +132,7 @@ index b41d42f13f24..56b27a4e0547 100644
stat->threadstarted++;
-@@ -620,16 +595,10 @@ static void *timerthread(void *param)
+@@ -619,16 +594,10 @@ static void *timerthread(void *param)
uint64_t diff;
unsigned long diff_smi = 0;
@@ -150,7 +150,7 @@ index b41d42f13f24..56b27a4e0547 100644
case MODE_CLOCK_NANOSLEEP:
if (par->timermode == TIMER_ABSTIME) {
ret = clock_nanosleep(par->clock, TIMER_ABSTIME,
-@@ -751,11 +720,6 @@ static void *timerthread(void *param)
+@@ -749,11 +718,6 @@ static void *timerthread(void *param)
next.tv_sec += interval.tv_sec;
next.tv_nsec += interval.tv_nsec;
@@ -162,7 +162,7 @@ index b41d42f13f24..56b27a4e0547 100644
tsnorm(&next);
while (tsgreater(&now, &next)) {
-@@ -780,17 +744,6 @@ out:
+@@ -778,17 +742,6 @@ out:
pthread_mutex_unlock(&refresh_on_max_lock);
}
@@ -180,7 +180,7 @@ index b41d42f13f24..56b27a4e0547 100644
/* close msr file */
if (smi)
close(par->msr_fd);
-@@ -1305,7 +1258,8 @@ static void process_options (int argc, char *argv[], int max_cpus)
+@@ -1159,7 +1112,8 @@ static void process_options(int argc, char *argv[], int max_cpus)
case OPT_VERBOSE: verbose = 1; break;
case 'x':
case OPT_POSIX_TIMERS:
@@ -190,7 +190,7 @@ index b41d42f13f24..56b27a4e0547 100644
case '?':
case OPT_HELP:
display_help(0); break;
-@@ -1338,13 +1292,6 @@ static void process_options (int argc, char *argv[], int max_cpus)
+@@ -1192,13 +1146,6 @@ static void process_options(int argc, char *argv[], int max_cpus)
}
}
@@ -203,8 +203,8 @@ index b41d42f13f24..56b27a4e0547 100644
-
/* if smp wasn't requested, test for numa automatically */
if (!smp) {
- #ifdef NUMA
-@@ -2038,7 +1985,6 @@ int main(int argc, char **argv)
+ if (numa_initialize())
+@@ -1881,7 +1828,6 @@ int main(int argc, char **argv)
}
@@ -212,7 +212,7 @@ index b41d42f13f24..56b27a4e0547 100644
mode = use_nanosleep + use_system;
sigemptyset(&sigset);
-@@ -2088,16 +2034,18 @@ int main(int argc, char **argv)
+@@ -1931,16 +1877,18 @@ int main(int argc, char **argv)
void *stack;
void *currstk;
size_t stksize;
@@ -221,8 +221,9 @@ index b41d42f13f24..56b27a4e0547 100644
/* find the memory node associated with the cpu i */
node = rt_numa_numa_node_of_cpu(cpu);
- /* get the stack size set for for this thread */
+- /* get the stack size set for this thread */
- if (pthread_attr_getstack(&attr, &currstk, &stksize))
++ /* get the stack size set for for this thread */
+ err = pthread_attr_getstack(&attr, &currstk, &stksize);
+ if (err != EINVAL)
fatal("failed to get stack size for thread %d\n", i);
@@ -234,7 +235,7 @@ index b41d42f13f24..56b27a4e0547 100644
/* allocate memory for a stack on appropriate node */
diff --git a/src/hackbench/hackbench.c b/src/hackbench/hackbench.c
-index 2cddff654df6..46f09fa9e7ba 100644
+index 268c23233004..bbbb29a3a430 100644
--- a/src/hackbench/hackbench.c
+++ b/src/hackbench/hackbench.c
@@ -24,13 +24,15 @@
@@ -289,7 +290,7 @@ index 000000000000..ea5075e768c8
+
+#endif /* _MUSL_H_ */
diff --git a/src/lib/rt-utils.c b/src/lib/rt-utils.c
-index f786588706cd..c1a55272dfdb 100644
+index 2d68d62cd875..529d427c8084 100644
--- a/src/lib/rt-utils.c
+++ b/src/lib/rt-utils.c
@@ -23,6 +23,7 @@
@@ -327,7 +328,7 @@ index 97a345edd26e..1028d344edff 100644
#define TIMEOUT 2
diff --git a/src/pmqtest/pmqtest.c b/src/pmqtest/pmqtest.c
-index 5db8d348cdf8..2de6c1417e4a 100644
+index 5f7a24d55db6..555679cf36ef 100644
--- a/src/pmqtest/pmqtest.c
+++ b/src/pmqtest/pmqtest.c
@@ -24,6 +24,7 @@
@@ -339,7 +340,7 @@ index 5db8d348cdf8..2de6c1417e4a 100644
#include <pthread.h>
diff --git a/src/ptsematest/ptsematest.c b/src/ptsematest/ptsematest.c
-index de8ea2fe1b0c..1568f3b78711 100644
+index 2e392299fdc4..b45d35755865 100644
--- a/src/ptsematest/ptsematest.c
+++ b/src/ptsematest/ptsematest.c
@@ -22,6 +22,7 @@
@@ -351,7 +352,7 @@ index de8ea2fe1b0c..1568f3b78711 100644
#include <pthread.h>
diff --git a/src/rt-migrate-test/rt-migrate-test.c b/src/rt-migrate-test/rt-migrate-test.c
-index 4863238edeb4..9f1aba159dc7 100644
+index 9bf716c9178c..f51d388d9150 100644
--- a/src/rt-migrate-test/rt-migrate-test.c
+++ b/src/rt-migrate-test/rt-migrate-test.c
@@ -25,6 +25,7 @@
@@ -363,12 +364,12 @@ index 4863238edeb4..9f1aba159dc7 100644
int nr_tasks;
int lfd;
diff --git a/src/sched_deadline/cyclicdeadline.c b/src/sched_deadline/cyclicdeadline.c
-index a08e28e73c42..675a0ea1a162 100644
+index 98eb367248ac..45b27f72a5a7 100644
--- a/src/sched_deadline/cyclicdeadline.c
+++ b/src/sched_deadline/cyclicdeadline.c
-@@ -32,6 +32,8 @@
- #include <rt-utils.h>
+@@ -34,6 +34,8 @@
#include <rt-sched.h>
+ #include <error.h>
+#include "musl.h"
+
diff --git a/dev-util/rt-tests/rt-tests-1.9.ebuild b/dev-util/rt-tests/rt-tests-1.10.ebuild
index d19c70d1e9f2..86a9e520503a 100644
--- a/dev-util/rt-tests/rt-tests-1.9.ebuild
+++ b/dev-util/rt-tests/rt-tests-1.10.ebuild
@@ -32,7 +32,7 @@ src_compile() {
}
src_install() {
- emake prefix=/usr DESTDIR="${D}" MAN_COMPRESSION=none install
+ emake prefix=/usr DESTDIR="${ED}" install
python_fix_shebang "${ED}"
python_optimize
}
diff --git a/dev-util/rubymine/Manifest b/dev-util/rubymine/Manifest
index f4c7824a24a1..0f6a785df1c5 100644
--- a/dev-util/rubymine/Manifest
+++ b/dev-util/rubymine/Manifest
@@ -1,3 +1,3 @@
-DIST RubyMine-2020.3.tar.gz 454323470 BLAKE2B 26fab76be019a4f8be2615f765d6ff20ab0d234417fe801419d2d204849846b094fcf94b07bc483ecae07935c7d4e26afbd0abf3315c4c265d938d4a6f7a1d2a SHA512 0e49af983e0852bc1c7707c6567d83ad2ab0f3ce0b85dd52f3fc33175fcbdb03641f6c4b915328701733cea3ddc6ae6e3cb524af9d3afe4ceee09b8c1e0a54d7
-EBUILD rubymine-2020.3.ebuild 1422 BLAKE2B 5d80fd623ce5aa1e613c1afd0f3c875c9223bdbfa5810ec78b612f0a496d1a9b9681c69fe3cccf3a63cfcba1c2c886a5fd0cc9b14c20a6d68945d4a7ec5ef6d5 SHA512 31c7c3eff05d206fc783cdbede97b0164ed5ffde48cb441549313fef9554f9f01009addb69605501ff95bc4206e99e71b98368870634a2d3d0d05589b6f66f99
+DIST RubyMine-2020.3.1.tar.gz 447141523 BLAKE2B a832cdf6a987ad462e957599a055989dbd413ee0d2eedc99a357a0fcc41ef0908cf1d80018b198c67412c471aaa37a55b8b9a7e4847dc4b0dc1c1f44cce30637 SHA512 d1aa52127b916a5b3e70c7f43804c555f19a13e42cad06bc2a0bc2346b58ddef1b038a27b56068138c2032afafd50c1f5be916e70157225aa1c55cb24030548a
+EBUILD rubymine-2020.3.1.ebuild 1422 BLAKE2B 5d80fd623ce5aa1e613c1afd0f3c875c9223bdbfa5810ec78b612f0a496d1a9b9681c69fe3cccf3a63cfcba1c2c886a5fd0cc9b14c20a6d68945d4a7ec5ef6d5 SHA512 31c7c3eff05d206fc783cdbede97b0164ed5ffde48cb441549313fef9554f9f01009addb69605501ff95bc4206e99e71b98368870634a2d3d0d05589b6f66f99
EBUILD rubymine-9999.ebuild 1422 BLAKE2B 5d80fd623ce5aa1e613c1afd0f3c875c9223bdbfa5810ec78b612f0a496d1a9b9681c69fe3cccf3a63cfcba1c2c886a5fd0cc9b14c20a6d68945d4a7ec5ef6d5 SHA512 31c7c3eff05d206fc783cdbede97b0164ed5ffde48cb441549313fef9554f9f01009addb69605501ff95bc4206e99e71b98368870634a2d3d0d05589b6f66f99
diff --git a/dev-util/rubymine/rubymine-2020.3.ebuild b/dev-util/rubymine/rubymine-2020.3.1.ebuild
index 948c65c7c475..948c65c7c475 100644
--- a/dev-util/rubymine/rubymine-2020.3.ebuild
+++ b/dev-util/rubymine/rubymine-2020.3.1.ebuild
diff --git a/dev-util/sasm/metadata.xml b/dev-util/sasm/metadata.xml
index 5d30c4991b6f..7b5de81874a5 100644
--- a/dev-util/sasm/metadata.xml
+++ b/dev-util/sasm/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>maksbotan@gentoo.org</email>
- <name>Maxim Koltsov</name>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<remote-id type="github">Dman95/SASM</remote-id>
</upstream>
diff --git a/dev-util/scons/scons-3.1.1.ebuild b/dev-util/scons/scons-3.1.1.ebuild
index 65050676bbef..af1cd7e11f09 100644
--- a/dev-util/scons/scons-3.1.1.ebuild
+++ b/dev-util/scons/scons-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
RESTRICT="test"
diff --git a/dev-util/scons/scons-3.1.2.ebuild b/dev-util/scons/scons-3.1.2.ebuild
index 12eefc97875b..d2ac1e22a3ff 100644
--- a/dev-util/scons/scons-3.1.2.ebuild
+++ b/dev-util/scons/scons-3.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -21,7 +21,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
RESTRICT="test"
diff --git a/dev-util/scons/scons-4.0.1.ebuild b/dev-util/scons/scons-4.0.1.ebuild
index a9d57219a371..c0fc0c5ceca5 100644
--- a/dev-util/scons/scons-4.0.1.ebuild
+++ b/dev-util/scons/scons-4.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -21,7 +21,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-util/sel/sel-0.08.4-r2.ebuild b/dev-util/sel/sel-0.08.4-r2.ebuild
index 13a129850cac..c640cffb49f6 100644
--- a/dev-util/sel/sel-0.08.4-r2.ebuild
+++ b/dev-util/sel/sel-0.08.4-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit toolchain-funcs
@@ -14,6 +14,7 @@ LICENSE="GPL-2"
KEYWORDS="amd64 ppc s390 sparc x86"
RDEPEND="sys-libs/ncurses:0="
+BDEPEND="virtual/pkgconfig"
DOCS=( "help.txt" README.GER whatsnew )
@@ -25,7 +26,8 @@ src_prepare() {
}
src_compile() {
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDLIBS="-lncurses"
+ local PKGCONFIG="$(tc-getPKG_CONFIG)"
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDLIBS="$(${PKGCONFIG} --libs ncurses)"
}
src_install() {
diff --git a/dev-util/shadowman/shadowman-2.ebuild b/dev-util/shadowman/shadowman-2.ebuild
index f072c802effb..1f8ac445a79e 100644
--- a/dev-util/shadowman/shadowman-2.ebuild
+++ b/dev-util/shadowman/shadowman-2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/shadowman/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
IUSE=""
RDEPEND="app-admin/eselect"
diff --git a/dev-util/shflags/shflags-1.0.3.ebuild b/dev-util/shflags/shflags-1.0.3.ebuild
index e3b2d116e4fa..b03ab47675da 100644
--- a/dev-util/shflags/shflags-1.0.3.ebuild
+++ b/dev-util/shflags/shflags-1.0.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/kward/shflags/archive/${PV}.tar.gz -> ${P}.tgz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="examples"
src_test() {
diff --git a/dev-util/shtool/shtool-2.0.8-r1.ebuild b/dev-util/shtool/shtool-2.0.8-r1.ebuild
index fc1deae5b6e4..993cd50fb8cd 100644
--- a/dev-util/shtool/shtool-2.0.8-r1.ebuild
+++ b/dev-util/shtool/shtool-2.0.8-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm hppa ~ia64 ppc s390 sparc x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ppc s390 sparc x86"
IUSE=""
DEPEND="dev-lang/perl"
diff --git a/dev-util/source-highlight/source-highlight-3.1.9.ebuild b/dev-util/source-highlight/source-highlight-3.1.9.ebuild
index 3568b4c32e0d..9335feb8ec5c 100644
--- a/dev-util/source-highlight/source-highlight-3.1.9.ebuild
+++ b/dev-util/source-highlight/source-highlight-3.1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ DESCRIPTION="Generate highlighted source code as an (x)html document"
HOMEPAGE="https://www.gnu.org/software/src-highlite/source-highlight.html"
SRC_URI="mirror://gnu/src-highlite/${P}.tar.gz"
LICENSE="GPL-3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
SLOT="0"
IUSE="doc static-libs"
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index c2f9845e9e6d..56fa4987dad5 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,2 +1,2 @@
-DIST spirv-headers-1.5.3.tar.gz 387520 BLAKE2B 80f210792294232b9f1ebd12e96a8070b27ca29fcfcf8f61c19b0ddef493511bd1f5f85d44f6112de6154108237147feb564334cd47fb37b6f3e7dfb50620a7e SHA512 fab90cd073aed34320d2a03c441746101e757a4bd44f0b259aaa34e1fafd450b9576d8d539d85a8066cdf0eda3e78c807ccf65cd86ab9d8660195a96e9a50795
+DIST spirv-headers-1.5.4.1.tar.gz 395834 BLAKE2B e4852f1d694271e9928f1f9aa460c6ba33ad2d0568bd38b24ba31e8dd0390a5542192f9c6977cd3ff4a56520af83280b779fd4e7cece6adc33a5261ef2d2398d SHA512 3578a0210b954e904ac154307a0b98a2c01410adf910e549669109b1b559781959bb5771e39945c50523548a6613d064576fcba15aa3c9125255c0443d3e61a6
DIST spirv-headers-1.5.4.tar.gz 394957 BLAKE2B c94d0ab2e98242aeb78c6948ac915467ba2cc9568483b8e3d00d5c5e1f422a23e9645161ea6b958cb3a8f7b2d51cf8e8040b7479712dd32382c5c5cbba30e4f3 SHA512 050ae8ded345bbef3d94e91f22dd72860fdeed3072f943bafaa37f86f2d522e59d7c4ff2e6aa5bddb3c3df55f124200394a91e6d99eb95933463e7b8ce360aad
diff --git a/dev-util/spirv-headers/spirv-headers-1.5.3.ebuild b/dev-util/spirv-headers/spirv-headers-1.5.4.1.ebuild
index 4f2bba2c5394..90856517cc36 100644
--- a/dev-util/spirv-headers/spirv-headers-1.5.3.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-1.5.4.1.ebuild
@@ -7,11 +7,11 @@ inherit cmake-utils
DESCRIPTION="Machine-readable files for the SPIR-V Registry"
HOMEPAGE="https://www.khronos.org/registry/spir-v/"
-EGIT_COMMIT="c0df742ec0b8178ad58c68cff3437ad4b6a06e26"
+EGIT_COMMIT="f027d53ded7e230e008d37c8b47ede7cd308e19d"
SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-headers/spirv-headers-1.5.4.ebuild b/dev-util/spirv-headers/spirv-headers-1.5.4.ebuild
index d9ba70c80794..d6312ae27fb4 100644
--- a/dev-util/spirv-headers/spirv-headers-1.5.4.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-1.5.4.ebuild
@@ -12,6 +12,6 @@ SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.ta
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index 5cc21ac225cf..e33e66fe1467 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,2 +1,2 @@
-DIST spirv-tools-2020.3.tar.gz 2170858 BLAKE2B c9fdc6bbf6edbb6e3e5aba1fff9bd179b7b435ecb4ebbe29db38ce0c71166269484f8c3798a69a0fe5d936392b07fc6ccd5f058945aa70330612a6ef8fafe12f SHA512 8abb4fe227dbe9d0fc4279523eb714ce3a590a3c56e3dcd226317bc7835e2dceaef3a46c0873c2f144c61b28f41c0fcdf2985cc4f708fa496186c16738cc493f
DIST spirv-tools-2020.5_pre20201107.tar.gz 2583541 BLAKE2B f234e34142af47a98268d85fa12861b9c66c78d74af7e44d4aa9150ad5cfce8e65780d89344ec947b4866de9811a8198e174480c23c30f690193feca7cc136a6 SHA512 a65174e5f1b7cad3be80e0df0d46e8fbfbb62f397fe98eb1b2c37bb85cf8f92d7b4c9103b5e9e8181240bcf97e5a7e3f09323f78159d4b25f7f02176e982f542
+DIST spirv-tools-2020.6.tar.gz 2595300 BLAKE2B bd500824866fcd0f0e05ccf3f43a168e33bc4783396d24fa6ddc58d4e46110b001cc32acde1cadcd793a997d547476f58c07475f43c3cbec5314b039926896b2 SHA512 b6d3667581101536e1f4d405e9c1c64e64a0aba174cc2f41d31e080f44d23bcfaed9642fd31f1d44a56c3df3e894526b643c572832cb96218b16d748b1ac6fe2
diff --git a/dev-util/spirv-tools/spirv-tools-2020.5_pre20201107.ebuild b/dev-util/spirv-tools/spirv-tools-2020.5_pre20201107.ebuild
index b033f1d59633..a6a0af0f850d 100644
--- a/dev-util/spirv-tools/spirv-tools-2020.5_pre20201107.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2020.5_pre20201107.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
else
EGIT_COMMIT="a61d07a72763c1eb200de0a2c316703643a0d1d9"
SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 arm arm64 ~ppc ppc64 ~riscv x86"
+ KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
fi
diff --git a/dev-util/spirv-tools/spirv-tools-2020.3.ebuild b/dev-util/spirv-tools/spirv-tools-2020.6.ebuild
index e8bcfd680cc2..abd96728ee58 100644
--- a/dev-util/spirv-tools/spirv-tools-2020.3.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2020.6.ebuild
@@ -12,9 +12,10 @@ if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
inherit git-r3
else
- SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
- S="${WORKDIR}"/${MY_PN}-${PV}
+ EGIT_COMMIT="${PV}"
+ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+ S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
fi
DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
@@ -25,7 +26,7 @@ SLOT="0"
# Tests fail upon finding symbols that do not match a regular expression
# in the generated library. Easily hit with non-standard compiler flags
RESTRICT="test"
-COMMON_DEPEND=">=dev-util/spirv-headers-1.5.3"
+COMMON_DEPEND=">=dev-util/spirv-headers-1.5.4.1"
DEPEND="${COMMON_DEPEND}"
RDEPEND=""
BDEPEND="${PYTHON_DEPS}
@@ -35,6 +36,8 @@ multilib_src_configure() {
local mycmakeargs=(
"-DSPIRV-Headers_SOURCE_DIR=/usr/"
"-DSPIRV_WERROR=OFF"
+ "-DSPIRV_TOOLS_BUILD_STATIC=OFF"
+ "-DBUILD_SHARED_LIBS=ON"
)
cmake_src_configure
diff --git a/dev-util/spirv-tools/spirv-tools-9999.ebuild b/dev-util/spirv-tools/spirv-tools-9999.ebuild
index 808ff078ee4d..eeeccf517079 100644
--- a/dev-util/spirv-tools/spirv-tools-9999.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-9999.ebuild
@@ -26,7 +26,7 @@ SLOT="0"
# Tests fail upon finding symbols that do not match a regular expression
# in the generated library. Easily hit with non-standard compiler flags
RESTRICT="test"
-COMMON_DEPEND=">=dev-util/spirv-headers-1.5.4"
+COMMON_DEPEND=">=dev-util/spirv-headers-1.5.4.1"
DEPEND="${COMMON_DEPEND}"
RDEPEND=""
BDEPEND="${PYTHON_DEPS}
diff --git a/dev-util/splint/splint-3.1.2-r1.ebuild b/dev-util/splint/splint-3.1.2-r1.ebuild
deleted file mode 100644
index 5b3c7cba6227..000000000000
--- a/dev-util/splint/splint-3.1.2-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools
-
-DESCRIPTION="Check C programs for vulnerabilities and programming mistakes"
-HOMEPAGE="https://lclint.cs.virginia.edu/"
-SRC_URI="http://www.splint.org/downloads/${P}.src.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
-
-DEPEND="
- sys-devel/flex
-"
-
-src_prepare() {
- # verbose compiler calls
- sed -i -e '/Compiling/d' src/Makefile.am || die
- # automake complains about trailing \
- sed -i -e '1600d' test/Makefile.am || die
- # do not install these header files twice
- sed -i -e '/\$(UnixHeaders)/s|stdio.h stdlib.h||g' lib/Makefile.am || die
-
- eautoreconf
-}
-
-src_configure() {
- # We do not need bison/yacc at all here
- # We definitely need libfl
- BISON=no LEXLIB=-lfl econf
-}
-
-src_compile() {
- local subdir
- # skip test/ subdir
- for subdir in src lib imports doc; do
- emake -j1 -C ${subdir}
- done
-}
-
-src_test() {
- emake -C test
-}
diff --git a/dev-util/splint/splint-3.1.2-r2.ebuild b/dev-util/splint/splint-3.1.2-r2.ebuild
index b5fba3cee130..6a79f9885005 100644
--- a/dev-util/splint/splint-3.1.2-r2.ebuild
+++ b/dev-util/splint/splint-3.1.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="http://www.splint.org/downloads/${P}.src.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-macos ~x64-macos"
DEPEND="
sys-devel/flex
diff --git a/dev-util/stepman/stepman-0.10.5.ebuild b/dev-util/stepman/stepman-0.10.5.ebuild
index f95a6153f9c0..de176576e0f9 100644
--- a/dev-util/stepman/stepman-0.10.5.ebuild
+++ b/dev-util/stepman/stepman-0.10.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
diff --git a/dev-util/stubgen/stubgen-2.08.ebuild b/dev-util/stubgen/stubgen-2.08.ebuild
index 9eaf5ea10473..09887353395d 100644
--- a/dev-util/stubgen/stubgen-2.08.ebuild
+++ b/dev-util/stubgen/stubgen-2.08.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/dev-util/sysdig/sysdig-0.27.1-r100.ebuild b/dev-util/sysdig/sysdig-0.27.1-r100.ebuild
new file mode 100644
index 000000000000..a554cf18daa2
--- /dev/null
+++ b/dev-util/sysdig/sysdig-0.27.1-r100.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+# Documentation says this might be needed but since the unmigrated ebuilds
+# did not enforce it, nor does this one.
+#LUA_REQ_USE="-lua52compat"
+
+inherit bash-completion-r1 cmake lua-single
+
+DESCRIPTION="A system exploration and troubleshooting tool"
+HOMEPAGE="https://sysdig.com/"
+SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl +modules test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}
+ app-misc/jq:0=
+ dev-cpp/tbb:0=
+ >=dev-libs/jsoncpp-0.6_pre:0=
+ dev-libs/libb64:0=
+ dev-libs/protobuf:0=
+ net-dns/c-ares:0=
+ net-libs/grpc:0=
+ sys-libs/ncurses:0=
+ sys-libs/zlib:0=
+ libressl? ( dev-libs/libressl:0= )
+ !libressl? ( dev-libs/openssl:0= )
+ net-misc/curl:0="
+DEPEND="${RDEPEND}
+ virtual/os-headers
+ test? ( dev-cpp/gtest )"
+PDEPEND="
+ modules? ( >=dev-util/sysdig-kmod-${PV} )"
+
+src_prepare() {
+ sed -i -e 's:-ggdb::' CMakeLists.txt || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCREATE_TEST_TARGETS=$(usex test)
+
+ # done in dev-util/sysdig-kmod
+ -DBUILD_DRIVER=OFF
+ # libscap examples are not installed or really useful
+ -DBUILD_LIBSCAP_EXAMPLES=OFF
+
+ # unbundle the deps
+ -DUSE_BUNDLED_DEPS=OFF
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ # remove sources
+ rm -r "${ED}"/usr/src || die
+
+ # move bashcomp to the proper location
+ dobashcomp "${ED}"/usr/etc/bash_completion.d/sysdig || die
+ rm -r "${ED}"/usr/etc || die
+}
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index 64824bfcd4c6..7a49d47e8939 100644
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@@ -1 +1,2 @@
DIST systemtap-4.0.tar.gz 5282312 BLAKE2B 9eac1cf9c9f13255ac12642c910b5591b0f5380b2a6337dedcb3d20785c0416900b9bee05f239632f7c548812be35ae90b24f524ab6f5c0c6ef474cf5de834a1 SHA512 66b5ba1902ed974101429dce9fee849273d3dc64e862c057177d158c5f284cc93299819ee8ee49d4bd3b7ff47a3512b1c68b74cad374147ce67fa406c7518c79
+DIST systemtap-4.4.tar.gz 5532282 BLAKE2B bcb2f744ad09821ce63d78b3e86eb489013aed247952c72d3dbc4cc6fc1a2b85f948b71c622487876f43b615c147eb1624b2c146e9b4176e3c91e2b7cbef9ea0 SHA512 8fb1fe5071ec99ce3c6bcf82afdc98a3e1abc0ea937f3019b225c3a1879ada30080740b1918a84c6db06fe1893e6d1e7dc84be26c7e597d7feda1efe11354e76
diff --git a/dev-util/systemtap/files/systemtap-4.0-configure.ac-non-posix-test.patch b/dev-util/systemtap/files/systemtap-4.0-configure.ac-non-posix-test.patch
new file mode 100644
index 000000000000..d429ab197ddd
--- /dev/null
+++ b/dev-util/systemtap/files/systemtap-4.0-configure.ac-non-posix-test.patch
@@ -0,0 +1,214 @@
+ configure.ac | 62 ++++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 31 insertions(+), 31 deletions(-)
+
+diff --git i/configure.ac w/configure.ac
+index caa62ee28..19db3fb21 100644
+--- i/configure.ac
++++ w/configure.ac
+@@ -225,7 +225,7 @@ dnl fi
+ # Compiling without fPIE by default (see PR 9922)
+ AC_ARG_ENABLE([pie],
+ [AS_HELP_STRING([--enable-pie], [enable position-independent-executable])])
+-AS_IF([test "x$enable_pie" == xyes],[
++AS_IF([test "x$enable_pie" = xyes],[
+ PIECFLAGS='-fPIE'
+ PIECXXFLAGS='-fPIE'
+ PIELDFLAGS='-pie -Wl,-z,relro -Wl,-z,now'
+@@ -271,7 +271,7 @@ AC_ARG_ENABLE([translator],
+ AS_HELP_STRING([--disable-translator], [build only runtime utilities]),
+ [],
+ [enable_translator="yes"])
+-AM_CONDITIONAL([BUILD_TRANSLATOR], [test "$enable_translator" == "yes"])
++AM_CONDITIONAL([BUILD_TRANSLATOR], [test "$enable_translator" = "yes"])
+
+ dnl Handle the option to build the crash extension
+ AC_ARG_ENABLE([crash],
+@@ -312,25 +312,25 @@ AC_CHECK_PROG(have_latex, latex, yes, no)
+ AC_CHECK_PROG(have_dvips, dvips, yes, no)
+ AC_CHECK_PROG(have_ps2pdf, ps2pdf, yes, no)
+ if test "x${have_latex}${have_dvips}${have_ps2pdf}" != "xyesyesyes"; then
+- if test "$enable_docs" == "yes"; then
++ if test "$enable_docs" = "yes"; then
+ AC_MSG_ERROR([cannot find all tools for building documentation])
+ fi
+- if test "$enable_docs" == "check"; then
++ if test "$enable_docs" = "check"; then
+ AC_MSG_WARN([will not build documentation, cannot find all tools])
+ fi
+ fi
+-if test "$enable_docs" == "prebuilt"; then
++if test "$enable_docs" = "prebuilt"; then
+ AC_MSG_NOTICE([will only install prebuilt documentation])
+ fi
+-if test "x${have_latex}${have_dvips}${have_ps2pdf}" == "xyesyesyes" -a "$enable_docs" != "no" -a "$enable_docs" != "prebuilt"; then
++if test "x${have_latex}${have_dvips}${have_ps2pdf}" = "xyesyesyes" -a "$enable_docs" != "no" -a "$enable_docs" != "prebuilt"; then
+ building_docs="yes"
+ installing_prebuilt_docs="yes"
+ fi
+-if test "$enable_docs" == "no"; then
++if test "$enable_docs" = "no"; then
+ installing_prebuilt_docs="no"
+ fi
+-AM_CONDITIONAL([BUILD_DOCS], [test "$building_docs" == "yes"])
+-AM_CONDITIONAL([INSTALL_PREBUILT_DOCS], [test "$installing_prebuilt_docs" == "yes"])
++AM_CONDITIONAL([BUILD_DOCS], [test "$building_docs" = "yes"])
++AM_CONDITIONAL([INSTALL_PREBUILT_DOCS], [test "$installing_prebuilt_docs" = "yes"])
+
+
+ dnl Handle the option to build the reference documentation
+@@ -340,17 +340,17 @@ AC_ARG_ENABLE([refdocs],
+ [enable building reference documentation (default on if other documentation built).]),
+ [enable_refdocs=$enableval],
+ [enable_refdocs="check"])
+-if test "$building_docs" == "no" -a "$enable_refdocs" == "yes" ; then
++if test "$building_docs" = "no" -a "$enable_refdocs" = "yes" ; then
+ AC_MSG_ERROR([must use --enable-docs with --enable-refdocs])
+ fi
+-if test "$enable_refdocs" != "no" -a "${building_docs}" == "yes"; then
++if test "$enable_refdocs" != "no" -a "${building_docs}" = "yes"; then
+ building_refdocs="yes"
+ fi
+-AM_CONDITIONAL([BUILD_REFDOCS], [test "$building_refdocs" == "yes"])
++AM_CONDITIONAL([BUILD_REFDOCS], [test "$building_refdocs" = "yes"])
+
+ AC_CHECK_PROG(have_xmlto, xmlto, yes, no)
+ AC_CHECK_PROG(have_fop, fop, yes, no)
+-if test "x${have_fop}" == "xyes"; then
++if test "x${have_fop}" = "xyes"; then
+ # Due to rhbz505364 / 830266, we must actually test-run fop, not just
+ # hope that it works.
+ AC_MSG_CHECKING([to see if xmlto --with-fop actually works])
+@@ -362,8 +362,8 @@ if test "x${have_fop}" == "xyes"; then
+ fi
+ rm -f dummy-tapsets.pdf
+ fi
+-AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" == "yes"])
+-AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" == "yes"])
++AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = "yes"])
++AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = "yes"])
+
+ dnl Handle the option to build the html documentation
+ building_htmldocs="no"
+@@ -372,11 +372,11 @@ AC_ARG_ENABLE([htmldocs],
+ [enable building html documentation (default off).]),
+ [building_htmldocs=$enableval],
+ [building_htmldocs="no"])
+-if test "$have_xmlto" == "no" -a "$building_htmldocs" == "yes"; then
++if test "$have_xmlto" = "no" -a "$building_htmldocs" = "yes"; then
+ AC_MSG_ERROR([xmlto required for building html documentation])
+ fi
+
+-AM_CONDITIONAL([BUILD_HTMLDOCS], [test "$building_htmldocs" == "yes"])
++AM_CONDITIONAL([BUILD_HTMLDOCS], [test "$building_htmldocs" = "yes"])
+
+ dnl There is a strange bug in older versions of xmlto when generating pdf.
+ dnl https://bugzilla.redhat.com/show_bug.cgi?id=526273
+@@ -396,10 +396,10 @@ cat > conftest.xml << 'EOF'
+ </book>
+ EOF
+
+-if test "x${have_xmlto}" == "xyes"; then
++if test "x${have_xmlto}" = "xyes"; then
+ AC_MSG_CHECKING([for xmlto --stringparam support])
+ xmlto --stringparam man.authors.section.enabled=0 html-nochunks conftest.xml >/dev/null 2>&1
+- if test $? == 0; then
++ if test $? = 0; then
+ have_xmlto_stringparam="yes"
+ AC_MSG_RESULT([yes])
+ else
+@@ -407,7 +407,7 @@ AC_MSG_CHECKING([for xmlto --stringparam support])
+ fi
+ rm -f conftest.html
+ fi
+-AM_CONDITIONAL([XMLTO_STRINGPARAM], [test "$have_xmlto_stringparam" == "yes"])
++AM_CONDITIONAL([XMLTO_STRINGPARAM], [test "$have_xmlto_stringparam" = "yes"])
+
+ rm -f conftest.xml
+
+@@ -473,7 +473,7 @@ dnl See if we have enough libraries and tools to build the compile server
+ AC_MSG_WARN([will not build systemtap compile server, cannot find nss headers])
+ fi
+ fi
+-AM_CONDITIONAL([BUILD_SERVER], [test "${have_nss}" == "yes" -a "$enable_server" != "no"])
++AM_CONDITIONAL([BUILD_SERVER], [test "${have_nss}" = "yes" -a "$enable_server" != "no"])
+
+ if test "${have_nss}" != "yes"; then
+ AC_MSG_WARN([compile-server client functionality will be disabled, cannot find nss development files])
+@@ -514,10 +514,10 @@ if test "$with_rpm" != "no"; then
+ AC_DEFINE([HAVE_LIBRPMIO],[1],[have librpmio])
+ stap_LIBS="$stap_LIBS -lc -lrpmio"
+ have_librpmio="yes"], [have_librpmio="no"])
+- if test "x$have_librpm" != "xyes" -a "$with_rpm" == "yes"; then
++ if test "x$have_librpm" != "xyes" -a "$with_rpm" = "yes"; then
+ AC_MSG_ERROR([cannot find librpm])
+ fi
+- if test "x$have_librpmio" != "xyes" -a "$with_rpm" == "yes"; then
++ if test "x$have_librpmio" != "xyes" -a "$with_rpm" = "yes"; then
+ AC_MSG_WARN([cannot find librpmio])
+ fi
+ fi
+@@ -554,7 +554,7 @@ else
+ [Define if you have the readline library (-lreadline).])
+ fi
+ AC_SUBST([READLINE_LIBS])
+-AM_CONDITIONAL([HAVE_LIBREADLINE], [test "$have_libreadline" == "yes"])
++AM_CONDITIONAL([HAVE_LIBREADLINE], [test "$have_libreadline" = "yes"])
+
+ dnl End of readline checks: restore LIBS
+ LIBS=$LIBS_no_readline
+@@ -710,7 +710,7 @@ dnl See if we have enough libraries and tools to build the virt server
+ AC_MSG_WARN([will not build systemtap virt support, cannot find xml2 headers])
+ fi
+ fi
+-AM_CONDITIONAL([BUILD_VIRT], [test "${have_libvirt}" == "yes" -a "${have_libxml2}" == "yes" -a "$enable_virt" != "no"])
++AM_CONDITIONAL([BUILD_VIRT], [test "${have_libvirt}" = "yes" -a "${have_libxml2}" = "yes" -a "$enable_virt" != "no"])
+
+ dnl Handle the option to build python2 probe support
+ AC_ARG_WITH([python2-probes],
+@@ -750,7 +750,7 @@ have_python3_support=no
+ AS_IF([test "x$with_python3_probes" != "xno"],
+ [dnl First, check to make sure we have the 'python3-config' script.
+ pathless_python3=$(basename "$PYTHON3")
+- if test "x${pathless_python3}" == "x"; then
++ if test "x${pathless_python3}" = "x"; then
+ pathless_python3="python3"
+ fi
+ AC_PATH_PROG([PYTHON3_CONFIG], [${pathless_python3}-config], [no])
+@@ -785,8 +785,8 @@ AM_CONDITIONAL([HAVE_PYTHON_PROBES],
+ dnl Check for presence of json-c and ncurses for use in monitor mode
+ PKG_CHECK_MODULES([jsonc], [json-c >= 0.11], [have_jsonc=yes], [have_jsonc=no])
+ PKG_CHECK_MODULES([ncurses], [ncurses], [have_ncurses=yes], [have_ncurses=no])
+-AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" == "yes" -a "${have_ncurses}" == "yes"])
+-if test "${have_jsonc}" == "yes" -a "${have_ncurses}" == yes; then
++AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" = "yes" -a "${have_ncurses}" = "yes"])
++if test "${have_jsonc}" = "yes" -a "${have_ncurses}" = yes; then
+ AC_DEFINE([HAVE_MONITOR_LIBS],[1],[Define to 1 if json-c and ncurses libraries are installed])
+ fi
+
+@@ -823,7 +823,7 @@ AS_IF([test "x$with_bpf" != "xno"], [
+ [],
+ [#include <linux/bpf.h>])
+ ])
+-AM_CONDITIONAL(HAVE_BPF_DECLS, [test "x$ac_cv_have_decl_BPF_PROG_TYPE_PERF_EVENT" == "xyes"])
++AM_CONDITIONAL(HAVE_BPF_DECLS, [test "x$ac_cv_have_decl_BPF_PROG_TYPE_PERF_EVENT" = "xyes"])
+ AC_CONFIG_FILES([includes/sys/sdt-config.h po/Makefile.in])
+
+ if test $build_elfutils = yes -a $enable_translator = yes; then
+@@ -965,7 +965,7 @@ AS_IF([test "x$enable_http" = "xyes"],
+ dnl If we have all of the libraries, the json-c and nss libraries,
+ dnl and full C++11 support, we could build the httpd web
+ dnl compilation service.
+- AS_IF([test "x$have_libmicrohttpd" == "xtrue" -a "x$have_libuuid" == "xtrue" -a "x$have_libcurl" == "xtrue" -a "x$have_jsonc" == "xyes" -a "x$have_nss" == "xyes" -a "x$have_openssl" == "xyes" -a "x$have_cxx0x" == "xno"], [have_http_support=yes])])
++ AS_IF([test "x$have_libmicrohttpd" = "xtrue" -a "x$have_libuuid" = "xtrue" -a "x$have_libcurl" = "xtrue" -a "x$have_jsonc" = "xyes" -a "x$have_nss" = "xyes" -a "x$have_openssl" = "xyes" -a "x$have_cxx0x" = "xno"], [have_http_support=yes])])
+
+ AS_IF([test "x$have_http_support" = "xyes"],
+ [AC_DEFINE([HAVE_HTTP_SUPPORT], [1],
+@@ -1010,7 +1010,7 @@ initscript/99stap/module-setup.sh \
+ initscript/99stap/install \
+ initscript/99stap/check ])
+ AC_CONFIG_SUBDIRS(testsuite)
+-if test $enable_translator == "yes"; then
++if test $enable_translator = "yes"; then
+ AC_CONFIG_FILES([run-stap], [chmod +x run-stap])
+ fi
+ AC_CONFIG_FILES([dtrace], [chmod +x dtrace])
diff --git a/dev-util/systemtap/files/systemtap-4.4-configure.ac-non-posix-test.patch b/dev-util/systemtap/files/systemtap-4.4-configure.ac-non-posix-test.patch
new file mode 100644
index 000000000000..bd1c60376834
--- /dev/null
+++ b/dev-util/systemtap/files/systemtap-4.4-configure.ac-non-posix-test.patch
@@ -0,0 +1,199 @@
+ configure.ac | 58 +++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 29 insertions(+), 29 deletions(-)
+
+diff --git i/configure.ac w/configure.ac
+index 9589fa6f2..2d519f1ba 100644
+--- i/configure.ac
++++ w/configure.ac
+@@ -287,7 +287,7 @@ AC_ARG_ENABLE([translator],
+ AS_HELP_STRING([--disable-translator], [build only runtime utilities]),
+ [],
+ [enable_translator="yes"])
+-AM_CONDITIONAL([BUILD_TRANSLATOR], [test "$enable_translator" == "yes"])
++AM_CONDITIONAL([BUILD_TRANSLATOR], [test "$enable_translator" = "yes"])
+
+ dnl Handle the option to build the crash extension
+ AC_ARG_ENABLE([crash],
+@@ -328,25 +328,25 @@ AC_CHECK_PROG(have_latex, latex, yes, no)
+ AC_CHECK_PROG(have_dvips, dvips, yes, no)
+ AC_CHECK_PROG(have_ps2pdf, ps2pdf, yes, no)
+ if test "x${have_latex}${have_dvips}${have_ps2pdf}" != "xyesyesyes"; then
+- if test "$enable_docs" == "yes"; then
++ if test "$enable_docs" = "yes"; then
+ AC_MSG_ERROR([cannot find all tools for building documentation])
+ fi
+- if test "$enable_docs" == "check"; then
++ if test "$enable_docs" = "check"; then
+ AC_MSG_WARN([will not build documentation, cannot find all tools])
+ fi
+ fi
+-if test "$enable_docs" == "prebuilt"; then
++if test "$enable_docs" = "prebuilt"; then
+ AC_MSG_NOTICE([will only install prebuilt documentation])
+ fi
+-if test "x${have_latex}${have_dvips}${have_ps2pdf}" == "xyesyesyes" -a "$enable_docs" != "no" -a "$enable_docs" != "prebuilt"; then
++if test "x${have_latex}${have_dvips}${have_ps2pdf}" = "xyesyesyes" -a "$enable_docs" != "no" -a "$enable_docs" != "prebuilt"; then
+ building_docs="yes"
+ installing_prebuilt_docs="yes"
+ fi
+-if test "$enable_docs" == "no"; then
++if test "$enable_docs" = "no"; then
+ installing_prebuilt_docs="no"
+ fi
+-AM_CONDITIONAL([BUILD_DOCS], [test "$building_docs" == "yes"])
+-AM_CONDITIONAL([INSTALL_PREBUILT_DOCS], [test "$installing_prebuilt_docs" == "yes"])
++AM_CONDITIONAL([BUILD_DOCS], [test "$building_docs" = "yes"])
++AM_CONDITIONAL([INSTALL_PREBUILT_DOCS], [test "$installing_prebuilt_docs" = "yes"])
+
+
+ dnl Handle the option to build the reference documentation
+@@ -356,17 +356,17 @@ AC_ARG_ENABLE([refdocs],
+ [enable building reference documentation (default on if other documentation built).]),
+ [enable_refdocs=$enableval],
+ [enable_refdocs="check"])
+-if test "$building_docs" == "no" -a "$enable_refdocs" == "yes" ; then
++if test "$building_docs" = "no" -a "$enable_refdocs" = "yes" ; then
+ AC_MSG_ERROR([must use --enable-docs with --enable-refdocs])
+ fi
+-if test "$enable_refdocs" != "no" -a "${building_docs}" == "yes"; then
++if test "$enable_refdocs" != "no" -a "${building_docs}" = "yes"; then
+ building_refdocs="yes"
+ fi
+-AM_CONDITIONAL([BUILD_REFDOCS], [test "$building_refdocs" == "yes"])
++AM_CONDITIONAL([BUILD_REFDOCS], [test "$building_refdocs" = "yes"])
+
+ AC_CHECK_PROG(have_xmlto, xmlto, yes, no)
+ AC_CHECK_PROG(have_fop, fop, yes, no)
+-if test "x${have_fop}" == "xyes"; then
++if test "x${have_fop}" = "xyes"; then
+ # Due to rhbz505364 / 830266, we must actually test-run fop, not just
+ # hope that it works.
+ AC_MSG_CHECKING([to see if xmlto --with-fop actually works])
+@@ -378,8 +378,8 @@ if test "x${have_fop}" == "xyes"; then
+ fi
+ rm -f dummy-tapsets.pdf
+ fi
+-AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" == "yes"])
+-AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" == "yes"])
++AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = "yes"])
++AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = "yes"])
+
+ dnl Handle the option to build the html documentation
+ building_htmldocs="no"
+@@ -388,11 +388,11 @@ AC_ARG_ENABLE([htmldocs],
+ [enable building html documentation (default off).]),
+ [building_htmldocs=$enableval],
+ [building_htmldocs="no"])
+-if test "$have_xmlto" == "no" -a "$building_htmldocs" == "yes"; then
++if test "$have_xmlto" = "no" -a "$building_htmldocs" = "yes"; then
+ AC_MSG_ERROR([xmlto required for building html documentation])
+ fi
+
+-AM_CONDITIONAL([BUILD_HTMLDOCS], [test "$building_htmldocs" == "yes"])
++AM_CONDITIONAL([BUILD_HTMLDOCS], [test "$building_htmldocs" = "yes"])
+
+ dnl There is a strange bug in older versions of xmlto when generating pdf.
+ dnl https://bugzilla.redhat.com/show_bug.cgi?id=526273
+@@ -412,10 +412,10 @@ cat > conftest.xml << 'EOF'
+ </book>
+ EOF
+
+-if test "x${have_xmlto}" == "xyes"; then
++if test "x${have_xmlto}" = "xyes"; then
+ AC_MSG_CHECKING([for xmlto --stringparam support])
+ xmlto --stringparam man.authors.section.enabled=0 html-nochunks conftest.xml >/dev/null 2>&1
+- if test $? == 0; then
++ if test $? = 0; then
+ have_xmlto_stringparam="yes"
+ AC_MSG_RESULT([yes])
+ else
+@@ -423,7 +423,7 @@ AC_MSG_CHECKING([for xmlto --stringparam support])
+ fi
+ rm -f conftest.html
+ fi
+-AM_CONDITIONAL([XMLTO_STRINGPARAM], [test "$have_xmlto_stringparam" == "yes"])
++AM_CONDITIONAL([XMLTO_STRINGPARAM], [test "$have_xmlto_stringparam" = "yes"])
+
+ rm -f conftest.xml
+
+@@ -489,7 +489,7 @@ dnl See if we have enough libraries and tools to build the compile server
+ AC_MSG_WARN([will not build systemtap compile server, cannot find nss headers])
+ fi
+ fi
+-AM_CONDITIONAL([BUILD_SERVER], [test "${have_nss}" == "yes" -a "$enable_server" != "no"])
++AM_CONDITIONAL([BUILD_SERVER], [test "${have_nss}" = "yes" -a "$enable_server" != "no"])
+
+ if test "${have_nss}" != "yes"; then
+ AC_MSG_WARN([compile-server client functionality will be disabled, cannot find nss development files])
+@@ -530,10 +530,10 @@ if test "$with_rpm" != "no"; then
+ AC_DEFINE([HAVE_LIBRPMIO],[1],[have librpmio])
+ stap_LIBS="$stap_LIBS -lc -lrpmio"
+ have_librpmio="yes"], [have_librpmio="no"])
+- if test "x$have_librpm" != "xyes" -a "$with_rpm" == "yes"; then
++ if test "x$have_librpm" != "xyes" -a "$with_rpm" = "yes"; then
+ AC_MSG_ERROR([cannot find librpm])
+ fi
+- if test "x$have_librpmio" != "xyes" -a "$with_rpm" == "yes"; then
++ if test "x$have_librpmio" != "xyes" -a "$with_rpm" = "yes"; then
+ AC_MSG_WARN([cannot find librpmio])
+ fi
+ fi
+@@ -570,7 +570,7 @@ else
+ [Define if you have the readline library (-lreadline).])
+ fi
+ AC_SUBST([READLINE_LIBS])
+-AM_CONDITIONAL([HAVE_LIBREADLINE], [test "$have_libreadline" == "yes"])
++AM_CONDITIONAL([HAVE_LIBREADLINE], [test "$have_libreadline" = "yes"])
+
+ dnl End of readline checks: restore LIBS
+ LIBS=$LIBS_no_readline
+@@ -726,7 +726,7 @@ dnl See if we have enough libraries and tools to build the virt server
+ AC_MSG_WARN([will not build systemtap virt support, cannot find xml2 headers])
+ fi
+ fi
+-AM_CONDITIONAL([BUILD_VIRT], [test "${have_libvirt}" == "yes" -a "${have_libxml2}" == "yes" -a "$enable_virt" != "no"])
++AM_CONDITIONAL([BUILD_VIRT], [test "${have_libvirt}" = "yes" -a "${have_libxml2}" = "yes" -a "$enable_virt" != "no"])
+
+ dnl Handle the option to build python2 probe support
+ AC_ARG_WITH([python2-probes],
+@@ -801,11 +801,11 @@ if test "$enable_monitor" != "no"; then
+ dnl Check for presence of json-c and ncurses for use in monitor mode
+ PKG_CHECK_MODULES([jsonc], [json-c >= 0.11], [have_jsonc=yes], [have_jsonc=no])
+ PKG_CHECK_MODULES([ncurses], [ncurses], [have_ncurses=yes], [have_ncurses=no])
+-if test "${have_jsonc}" == "yes" -a "${have_ncurses}" == yes; then
++if test "${have_jsonc}" = "yes" -a "${have_ncurses}" = yes; then
+ AC_DEFINE([HAVE_MONITOR_LIBS],[1],[Define to 1 if json-c and ncurses libraries are installed])
+ fi
+ fi
+-AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" == "yes" -a "${have_ncurses}" == "yes" -a "$enable_monitor" != "no"])
++AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" = "yes" -a "${have_ncurses}" = "yes" -a "$enable_monitor" != "no"])
+
+ AC_CACHE_CHECK([for assembler .section "?" flags support], stap_cv_sectionq, [
+ old_CFLAGS="$CFLAGS"
+@@ -840,7 +840,7 @@ AS_IF([test "x$with_bpf" != "xno"], [
+ [],
+ [#include <linux/bpf.h>])
+ ])
+-AM_CONDITIONAL(HAVE_BPF_DECLS, [test "x$ac_cv_have_decl_BPF_PROG_TYPE_PERF_EVENT" == "xyes"])
++AM_CONDITIONAL(HAVE_BPF_DECLS, [test "x$ac_cv_have_decl_BPF_PROG_TYPE_PERF_EVENT" = "xyes"])
+ AC_CONFIG_FILES([includes/sys/sdt-config.h po/Makefile.in])
+
+ dnl determine whether BPF raw tracepoints are available
+@@ -931,7 +931,7 @@ AS_IF([test "x$enable_http" = "xyes"],
+ dnl If we have all of the libraries, the json-c and nss libraries,
+ dnl and full C++11 support, we could build the httpd web
+ dnl compilation service.
+- AS_IF([test "x$have_libmicrohttpd" == "xtrue" -a "x$have_libuuid" == "xtrue" -a "x$have_libcurl" == "xtrue" -a "x$have_jsonc" == "xyes" -a "x$have_nss" == "xyes" -a "x$have_openssl" == "xyes" -a "x$have_cxx0x" == "xno"], [have_http_support=yes])])
++ AS_IF([test "x$have_libmicrohttpd" = "xtrue" -a "x$have_libuuid" = "xtrue" -a "x$have_libcurl" = "xtrue" -a "x$have_jsonc" = "xyes" -a "x$have_nss" = "xyes" -a "x$have_openssl" = "xyes" -a "x$have_cxx0x" = "xno"], [have_http_support=yes])])
+
+ AS_IF([test "x$have_http_support" = "xyes"],
+ [AC_DEFINE([HAVE_HTTP_SUPPORT], [1],
+@@ -976,7 +976,7 @@ initscript/99stap/module-setup.sh \
+ initscript/99stap/install \
+ initscript/99stap/check ])
+ AC_CONFIG_SUBDIRS(testsuite)
+-if test $enable_translator == "yes"; then
++if test $enable_translator = "yes"; then
+ AC_CONFIG_FILES([run-stap], [chmod +x run-stap])
+ fi
+ AC_CONFIG_FILES([dtrace], [chmod +x dtrace])
diff --git a/dev-util/systemtap/systemtap-4.0-r1.ebuild b/dev-util/systemtap/systemtap-4.0-r1.ebuild
index d0889a202c16..70da1a779e09 100644
--- a/dev-util/systemtap/systemtap-4.0-r1.ebuild
+++ b/dev-util/systemtap/systemtap-4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -33,6 +33,9 @@ RDEPEND=">=dev-libs/elfutils-0.142
DEPEND="${RDEPEND}
app-arch/cpio
app-text/xmlto
+ $(python_gen_cond_dep '
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ')
>=sys-devel/gettext-0.18.2
libvirt? ( dev-libs/libxml2 )
"
diff --git a/dev-util/systemtap/systemtap-4.0-r2.ebuild b/dev-util/systemtap/systemtap-4.0-r2.ebuild
new file mode 100644
index 000000000000..4add7bba3001
--- /dev/null
+++ b/dev-util/systemtap/systemtap-4.0-r2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit linux-info autotools python-single-r1
+
+DESCRIPTION="A linux trace/probe tool"
+HOMEPAGE="https://www.sourceware.org/systemtap/"
+SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="libvirt selinux sqlite +ssl zeroconf"
+
+RDEPEND=">=dev-libs/elfutils-0.142
+ dev-libs/json-c:=
+ sys-libs/ncurses:0=
+ sys-libs/readline:0=
+ ${PYTHON_DEPS}
+ libvirt? ( >=app-emulation/libvirt-1.0.2 )
+ selinux? ( sys-libs/libselinux )
+ sqlite? ( dev-db/sqlite:3 )
+ ssl? (
+ dev-libs/nspr
+ dev-libs/nss
+ )
+ zeroconf? ( net-dns/avahi )
+"
+DEPEND="${RDEPEND}
+ app-arch/cpio
+ app-text/xmlto
+ $(python_gen_cond_dep '
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ')
+ >=sys-devel/gettext-0.18.2
+ libvirt? ( dev-libs/libxml2 )
+"
+RDEPEND="${RDEPEND}
+ acct-group/stapdev
+ acct-group/stapsys
+ acct-group/stapusr
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+CONFIG_CHECK="~KPROBES ~RELAY ~DEBUG_FS"
+ERROR_KPROBES="${PN} requires support for KProbes Instrumentation (KPROBES) - this can be enabled in 'Instrumentation Support -> Kprobes'."
+ERROR_RELAY="${PN} works with support for user space relay support (RELAY) - this can be enabled in 'General setup -> Kernel->user space relay support (formerly relayfs)'."
+ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) - this can be enabled in 'Kernel hacking -> Debug Filesystem'."
+
+DOCS="AUTHORS HACKING NEWS README"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.1-ia64.patch
+ "${FILESDIR}"/${PN}-4.0-AR.patch
+ "${FILESDIR}"/${P}-configure.ac-non-posix-test.patch
+)
+
+pkg_setup() {
+ linux-info_pkg_setup
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ python_fix_shebang .
+
+ sed -i \
+ -e 's:-Werror::g' \
+ configure.ac \
+ Makefile.am \
+ stapbpf/Makefile.am \
+ stapdyn/Makefile.am \
+ staprun/Makefile.am \
+ testsuite/systemtap.unprivileged/unprivileged_probes.exp \
+ testsuite/systemtap.unprivileged/unprivileged_myproc.exp \
+ testsuite/systemtap.base/stmt_rel_user.exp \
+ testsuite/systemtap.base/sdt_va_args.exp \
+ testsuite/systemtap.base/sdt_misc.exp \
+ testsuite/systemtap.base/sdt.exp \
+ scripts/kprobes_test/gen_code.py \
+ || die "Failed to clean up sources"
+
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --disable-docs
+ --disable-grapher
+ --disable-refdocs
+ --disable-server
+ --enable-pie
+ --with-python3
+ --without-java
+ --without-openssl
+ --without-python2-probes
+ --without-rpm
+ $(use_enable libvirt virt)
+ $(use_enable sqlite)
+ $(use_with zeroconf avahi)
+ $(use_with ssl nss)
+ $(use_with selinux)
+ )
+ PYTHON3="${PYTHON}" \
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ python_optimize
+}
diff --git a/dev-util/systemtap/systemtap-4.4.ebuild b/dev-util/systemtap/systemtap-4.4.ebuild
new file mode 100644
index 000000000000..d069b0389619
--- /dev/null
+++ b/dev-util/systemtap/systemtap-4.4.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit linux-info autotools python-single-r1
+
+DESCRIPTION="A linux trace/probe tool"
+HOMEPAGE="https://www.sourceware.org/systemtap/"
+SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="libvirt selinux sqlite +ssl zeroconf"
+
+RDEPEND=">=dev-libs/elfutils-0.142
+ dev-libs/json-c:=
+ sys-libs/ncurses:0=
+ sys-libs/readline:0=
+ ${PYTHON_DEPS}
+ libvirt? ( >=app-emulation/libvirt-1.0.2 )
+ selinux? ( sys-libs/libselinux )
+ sqlite? ( dev-db/sqlite:3 )
+ ssl? (
+ dev-libs/nspr
+ dev-libs/nss
+ )
+ zeroconf? ( net-dns/avahi )
+"
+DEPEND="${RDEPEND}
+ app-arch/cpio
+ app-text/xmlto
+ $(python_gen_cond_dep '
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ')
+ >=sys-devel/gettext-0.18.2
+ libvirt? ( dev-libs/libxml2 )
+"
+RDEPEND="${RDEPEND}
+ acct-group/stapdev
+ acct-group/stapsys
+ acct-group/stapusr
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+CONFIG_CHECK="~KPROBES ~RELAY ~DEBUG_FS"
+ERROR_KPROBES="${PN} requires support for KProbes Instrumentation (KPROBES) - this can be enabled in 'Instrumentation Support -> Kprobes'."
+ERROR_RELAY="${PN} works with support for user space relay support (RELAY) - this can be enabled in 'General setup -> Kernel->user space relay support (formerly relayfs)'."
+ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) - this can be enabled in 'Kernel hacking -> Debug Filesystem'."
+
+DOCS="AUTHORS HACKING NEWS README"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.1-ia64.patch
+ "${FILESDIR}"/${P}-configure.ac-non-posix-test.patch
+)
+
+pkg_setup() {
+ linux-info_pkg_setup
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ python_fix_shebang .
+
+ sed -i \
+ -e 's:-Werror::g' \
+ configure.ac \
+ Makefile.am \
+ stapbpf/Makefile.am \
+ stapdyn/Makefile.am \
+ staprun/Makefile.am \
+ testsuite/systemtap.unprivileged/unprivileged_probes.exp \
+ testsuite/systemtap.unprivileged/unprivileged_myproc.exp \
+ testsuite/systemtap.base/stmt_rel_user.exp \
+ testsuite/systemtap.base/sdt_va_args.exp \
+ testsuite/systemtap.base/sdt_misc.exp \
+ testsuite/systemtap.base/sdt.exp \
+ scripts/kprobes_test/gen_code.py \
+ || die "Failed to clean up sources"
+
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --disable-docs
+ --disable-grapher
+ --disable-refdocs
+ --disable-server
+ --enable-pie
+ --with-python3
+ --without-java
+ --without-openssl
+ --without-python2-probes
+ --without-rpm
+ $(use_enable libvirt virt)
+ $(use_enable sqlite)
+ $(use_with zeroconf avahi)
+ $(use_with ssl nss)
+ $(use_with selinux)
+ )
+ PYTHON3="${PYTHON}" \
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ python_optimize
+}
diff --git a/dev-util/treecc/treecc-0.3.10-r1.ebuild b/dev-util/treecc/treecc-0.3.10-r1.ebuild
index b7f084dfe7cc..a543a684d021 100644
--- a/dev-util/treecc/treecc-0.3.10-r1.ebuild
+++ b/dev-util/treecc/treecc-0.3.10-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://download.savannah.gnu.org/releases/dotgnu-pnet/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
IUSE="doc examples"
DEPEND="doc? ( app-text/texi2html )"
diff --git a/dev-util/txt2regex/txt2regex-0.8-r3.ebuild b/dev-util/txt2regex/txt2regex-0.8-r3.ebuild
index d9f5b8806af8..3af6821c2e14 100644
--- a/dev-util/txt2regex/txt2regex-0.8-r3.ebuild
+++ b/dev-util/txt2regex/txt2regex-0.8-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://txt2regex.sourceforge.net/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 sparc x86"
IUSE="nls cjk"
DEPEND="nls? ( sys-devel/gettext )"
diff --git a/dev-util/uftrace/uftrace-0.9.4-r100.ebuild b/dev-util/uftrace/uftrace-0.9.4-r100.ebuild
new file mode 100644
index 000000000000..c54963d31fa6
--- /dev/null
+++ b/dev-util/uftrace/uftrace-0.9.4-r100.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit bash-completion-r1 lua-single
+
+DESCRIPTION="Function (graph) tracer for user-space"
+HOMEPAGE="https://github.com/namhyung/uftrace"
+SRC_URI="https://github.com/namhyung/uftrace/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="bash-completion capstone lua"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+RESTRICT="test"
+
+RDEPEND="
+ sys-libs/ncurses:=
+ virtual/libelf:=
+ capstone? ( dev-libs/capstone:0= )
+ lua? ( ${LUA_DEPS} )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ default
+ sed -i -e "s/ARCH/MYARCH/g" -e "/ldconfig/d" -e "/bash.completion/d" Makefile || die
+}
+
+src_configure() {
+ local myconf=(
+ $(use_with capstone)
+ --without-libpython
+ )
+ if use lua && use lua_single_target_luajit; then
+ myconf+=(
+ --with-libluajit
+ )
+ else
+ myconf+=(
+ --without-libluajit
+ )
+ fi
+ econf "${myconf[@]}"
+}
+
+src_compile() {
+ emake V=1
+}
+
+src_install() {
+ default
+ dodoc doc/*.{md,gif,png}
+ use bash-completion && newbashcomp misc/bash-completion.sh uftrace
+}
diff --git a/dev-util/uncrustify/Manifest b/dev-util/uncrustify/Manifest
index ea9a2e1cd1a4..531e0ed53675 100644
--- a/dev-util/uncrustify/Manifest
+++ b/dev-util/uncrustify/Manifest
@@ -1 +1,2 @@
DIST uncrustify-0.71.0.tar.gz 1704631 BLAKE2B 3dc9122647e2c173a776c4ad24c93d7b88fdd00c6c4f3070e68fd7a272218335063d8563446a3c8e72ff68e41d00a265aca76682a8cea201a33230377d7e425a SHA512 220ecbebb1c1d6abadb96c339e4ca9b264a04fa08bc83e9b0fabba5fae425efd1911d175d18b635521614ec9c33aa389fadaeec62ebf28a5d71e595900a92181
+DIST uncrustify-0.72.0.tar.gz 1530850 BLAKE2B 59b3ff4b47fee1f2a303e237d46b5fb656041e4d397aa97862cc7aebb6a5e705d036889a7b492bbe4393537ff52cf78af46bbe513e71aef19fca1388e3ffa79b SHA512 bfcbdf0d8198e1dd91f1c8283441a56669610a84d55a17cdd504571da09b26fef026fd3f753acd9950e498f574e6771a206c72b76ffdea97747b7a4fdb481862
diff --git a/dev-util/uncrustify/uncrustify-0.71.0.ebuild b/dev-util/uncrustify/uncrustify-0.71.0.ebuild
index b3c75d27d37d..ed82143fd4fe 100644
--- a/dev-util/uncrustify/uncrustify-0.71.0.ebuild
+++ b/dev-util/uncrustify/uncrustify-0.71.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
if [[ $PV == *9999* ]]; then
EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
@@ -12,7 +12,7 @@ else
S=${WORKDIR}/${PN}-${P}
fi
-inherit cmake-utils ${scm_eclass}
+inherit cmake ${scm_eclass}
PYTHON_COMPAT=( python3_{6,7,8,9,10} )
diff --git a/dev-util/uncrustify/uncrustify-0.72.0.ebuild b/dev-util/uncrustify/uncrustify-0.72.0.ebuild
new file mode 100644
index 000000000000..63e6152b5153
--- /dev/null
+++ b/dev-util/uncrustify/uncrustify-0.72.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ $PV == *9999* ]]; then
+ EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+ scm_eclass=git-r3
+else
+ KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+ SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
+ S=${WORKDIR}/${PN}-${P}
+fi
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit cmake python-any-r1 ${scm_eclass}
+
+DESCRIPTION="C/C++/C#/D/Java/Pawn code indenter and beautifier"
+HOMEPAGE="https://sourceforge.net/projects/uncrustify/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( ${PYTHON_DEPS} )"
diff --git a/dev-util/unifdef/unifdef-2.10.ebuild b/dev-util/unifdef/unifdef-2.10.ebuild
index e4d1dd5d88e4..d8af09ead551 100644
--- a/dev-util/unifdef/unifdef-2.10.ebuild
+++ b/dev-util/unifdef/unifdef-2.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dotat.at/prog/unifdef/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
DOCS=( README )
diff --git a/dev-util/valgrind/valgrind-3.16.1.ebuild b/dev-util/valgrind/valgrind-3.16.1.ebuild
index 89ba3f01570b..79988e017d62 100644
--- a/dev-util/valgrind/valgrind-3.16.1.ebuild
+++ b/dev-util/valgrind/valgrind-3.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2"
- KEYWORDS="-* amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+ KEYWORDS="-* amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
fi
DEPEND="mpi? ( virtual/mpi )"
@@ -76,7 +76,6 @@ src_configure() {
fi
# Force bitness on darwin, bug #306467
- use x86-macos && myconf+=("--enable-only32bit")
use x64-macos && myconf+=("--enable-only64bit")
# Don't use mpicc unless the user asked for it (bug #258832)
diff --git a/dev-util/valgrind/valgrind-9999.ebuild b/dev-util/valgrind/valgrind-9999.ebuild
index fdb5142569a3..f76d3175d613 100644
--- a/dev-util/valgrind/valgrind-9999.ebuild
+++ b/dev-util/valgrind/valgrind-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2"
- KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+ KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
fi
DEPEND="mpi? ( virtual/mpi )"
@@ -76,7 +76,6 @@ src_configure() {
fi
# Force bitness on darwin, bug #306467
- use x86-macos && myconf+=("--enable-only32bit")
use x64-macos && myconf+=("--enable-only64bit")
# Don't use mpicc unless the user asked for it (bug #258832)
diff --git a/dev-util/vbindiff/vbindiff-3.0_beta5.ebuild b/dev-util/vbindiff/vbindiff-3.0_beta5.ebuild
index 762a69588b80..cecef7d36e62 100644
--- a/dev-util/vbindiff/vbindiff-3.0_beta5.ebuild
+++ b/dev-util/vbindiff/vbindiff-3.0_beta5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index 766eb7633419..a9d376daddd7 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,2 +1,2 @@
-DIST vulkan-headers-1.2.143.tar.gz 758635 BLAKE2B e1fa8e1290d2fd1e4cef932e4dcd2bc10ef14449cdb41d57f0e4ef58f9a758add7e05d06d7884b08e080250cbb93bf0b211ac3570f0be6b256f6c70bd9eb1704 SHA512 fafd28822da050211525b289a324d333d5651e74e455a7b1010db55eac624edbbf50f5e7f899e2003c821fd06a9a61fec32ea7d07dc4d90a3b3697e03d3ddcc3
DIST vulkan-headers-1.2.154.tar.gz 817069 BLAKE2B 66b073daf01741d74a8c2524e6f2692a4c2143340bba8349f3c85408ce12cd7405f960fac0b6ffe3cbd6dcddfcbb04a6481b2743428c66a527d51c16cbd326c6 SHA512 97f9b56b57a762a3616ff3e9795de01c9b9327b80903adf2b141f33be45b30980acd50007ac6af9562ee1897491929d23f7f5dc6a8bafced59e14df27dfca6a9
+DIST vulkan-headers-1.2.162.tar.gz 852973 BLAKE2B 3907c247f115f4dee2fc8697f157aeb30a3ef91a774132591771c0b327090abf7c0caad2082edb86c787883c167ce1ffe75c199d9b94fc642aae30526f5311cd SHA512 7b33f6ef32f1ef34d3b37ad38b077a3a2ebcef62612371afa1b6f4910815bbab8418a837c49b3872b57d2e5012c15623521121f5d62836e46d6f20773841d7b0
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.2.154.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.2.154.ebuild
index 79af58fcdc70..82d54c8ea81d 100644
--- a/dev-util/vulkan-headers/vulkan-headers-1.2.154.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-1.2.154.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 arm arm64 ~ppc ppc64 ~riscv x86"
+ KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
S="${WORKDIR}"/${MY_PN}-${PV}
fi
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.2.143.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.2.162.ebuild
index 3c7d217ae9fa..b7d53089df0c 100644
--- a/dev-util/vulkan-headers/vulkan-headers-1.2.143.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-1.2.162.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
S="${WORKDIR}"/${MY_PN}-${PV}
fi
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 57a84eb9bb71..023fb99982ff 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,2 +1,2 @@
-DIST vulkan-tools-1.2.141.tar.gz 711666 BLAKE2B 0ad31cba26106ea76ddeb26e05b59302a6f35c9172eb75fe31b6a05370be0131a92db33a4c54a006b6ba5145447079239d7ff174f7be10feb172fe03d7a1a619 SHA512 5dce372f60f55570bfc7dc4e4da7b4a07f632cfac6a2862bdf773cab61a8c6260bb38cbd48d944e08479248bfe29248214618a78952fac0aeef285e5b888d337
DIST vulkan-tools-1.2.154.tar.gz 719166 BLAKE2B 351fd168be69615691bf956f65c0a6f2050c1061897745ecc227cc11336d2d3b39b0475a0c941c0ccdb011b9d37ef0417b22e0935ec956c5d37bbb8c6cd2e6d2 SHA512 51d6521af4f65c5b93bc5a10ef921f3770f04d6a363a9c4f0941421bf762e17cb8948bbdd3ed1d5449d015e1ac86e42e63583aee4a442cc275a1d410f61813a7
+DIST vulkan-tools-1.2.162.tar.gz 724232 BLAKE2B 16eb2dde35883fb2c7c263a72a615818ff8e1557ac9d74553ec3784d96a827e6900efa4e42218cb9081f7501d9b1a53eac82c360c2d20922043308515ab48983 SHA512 7827f6775dfb26820a2a2cbc60e7da8c7e7bdcb57b65523fbc6b2e989ae6869b04a57ae458c72715722c67d842660574697834c92f9b909dd5673da1945ac6dc
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.154.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.154.ebuild
index ca07b9093e08..96ea4cfbe5a6 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.2.154.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.2.154.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64"
S="${WORKDIR}"/${MY_PN}-${PV}
fi
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.141.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.162.ebuild
index 96ea4cfbe5a6..ca07b9093e08 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.2.141.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.2.162.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
S="${WORKDIR}"/${MY_PN}-${PV}
fi
diff --git a/dev-util/wayland-scanner/Manifest b/dev-util/wayland-scanner/Manifest
new file mode 100644
index 000000000000..36f469572777
--- /dev/null
+++ b/dev-util/wayland-scanner/Manifest
@@ -0,0 +1,2 @@
+DIST wayland-1.18.91.tar.xz 453500 BLAKE2B 6e234fa637bf4329fcf37c7372e3d02a50742812e2f61477ce302da4c2a1b9377874b0e4e2da899c726ede417081c4d459e40863169352825dd38a8fe0dcf267 SHA512 5ab770c87507e8248aa5197a253f27f3cca984bf1a69c52b438e9aaf512e6b0d841321f81c20643a49ef62eeb6c8b3a6391eadfee5c8822c3cf0d63bb0a8e0f8
+DIST wayland-1.18.92.tar.xz 456320 BLAKE2B bd88156773b5ca817544e0aa496101dc144723dc7f4602011ce1bc4fedbbb20081d99fc882866c0f572139cf4bf4dcf1e7b181af48653b2c67622af07c7ab650 SHA512 837afe1accc632c445868a85792e708daa5d7dc5942888c2fa0981cfb0dd34a3d37667407f1875f04aa5710a07089f3b620a6b78dd19030b477d8b25941e6305
diff --git a/dev-util/wayland-scanner/metadata.xml b/dev-util/wayland-scanner/metadata.xml
new file mode 100644
index 000000000000..154de7167100
--- /dev/null
+++ b/dev-util/wayland-scanner/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-util/wayland-scanner/wayland-scanner-1.18.91.ebuild b/dev-util/wayland-scanner/wayland-scanner-1.18.91.ebuild
new file mode 100644
index 000000000000..eeb424d9d3c1
--- /dev/null
+++ b/dev-util/wayland-scanner/wayland-scanner-1.18.91.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/wayland.git"
+ inherit git-r3
+else
+ SRC_URI="https://wayland.freedesktop.org/releases/wayland-${PV}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+ S="${WORKDIR}/wayland-${PV}"
+fi
+inherit meson multilib-minimal
+
+DESCRIPTION="wayland-scanner tool"
+HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
+
+LICENSE="MIT"
+SLOT="0"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+ !<dev-libs/wayland-${PV}
+ >=dev-libs/expat-2.1.0-r3:=[$MULTILIB_USEDEP]
+"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+ local emesonargs=(
+ -Ddocumentation=false
+ -Ddtd_validation=false
+ -Dlibraries=false
+ -Dscanner=true
+ )
+ meson_src_configure
+}
+
+multilib_src_compile() {
+ meson_src_compile
+}
+
+multilib_src_test() {
+ meson_src_test
+}
+
+multilib_src_install() {
+ meson_src_install
+}
diff --git a/dev-util/wayland-scanner/wayland-scanner-1.18.92.ebuild b/dev-util/wayland-scanner/wayland-scanner-1.18.92.ebuild
new file mode 100644
index 000000000000..eeb424d9d3c1
--- /dev/null
+++ b/dev-util/wayland-scanner/wayland-scanner-1.18.92.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/wayland.git"
+ inherit git-r3
+else
+ SRC_URI="https://wayland.freedesktop.org/releases/wayland-${PV}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+ S="${WORKDIR}/wayland-${PV}"
+fi
+inherit meson multilib-minimal
+
+DESCRIPTION="wayland-scanner tool"
+HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
+
+LICENSE="MIT"
+SLOT="0"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+ !<dev-libs/wayland-${PV}
+ >=dev-libs/expat-2.1.0-r3:=[$MULTILIB_USEDEP]
+"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+ local emesonargs=(
+ -Ddocumentation=false
+ -Ddtd_validation=false
+ -Dlibraries=false
+ -Dscanner=true
+ )
+ meson_src_configure
+}
+
+multilib_src_compile() {
+ meson_src_compile
+}
+
+multilib_src_test() {
+ meson_src_test
+}
+
+multilib_src_install() {
+ meson_src_install
+}
diff --git a/dev-util/wayland-scanner/wayland-scanner-9999.ebuild b/dev-util/wayland-scanner/wayland-scanner-9999.ebuild
new file mode 100644
index 000000000000..eeb424d9d3c1
--- /dev/null
+++ b/dev-util/wayland-scanner/wayland-scanner-9999.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/wayland.git"
+ inherit git-r3
+else
+ SRC_URI="https://wayland.freedesktop.org/releases/wayland-${PV}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+ S="${WORKDIR}/wayland-${PV}"
+fi
+inherit meson multilib-minimal
+
+DESCRIPTION="wayland-scanner tool"
+HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/wayland"
+
+LICENSE="MIT"
+SLOT="0"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+ !<dev-libs/wayland-${PV}
+ >=dev-libs/expat-2.1.0-r3:=[$MULTILIB_USEDEP]
+"
+DEPEND="${RDEPEND}"
+
+multilib_src_configure() {
+ local emesonargs=(
+ -Ddocumentation=false
+ -Ddtd_validation=false
+ -Dlibraries=false
+ -Dscanner=true
+ )
+ meson_src_configure
+}
+
+multilib_src_compile() {
+ meson_src_compile
+}
+
+multilib_src_test() {
+ meson_src_test
+}
+
+multilib_src_install() {
+ meson_src_install
+}
diff --git a/dev-util/webstorm/Manifest b/dev-util/webstorm/Manifest
index c96ac663adf2..d1268e8d9220 100644
--- a/dev-util/webstorm/Manifest
+++ b/dev-util/webstorm/Manifest
@@ -1,3 +1,3 @@
-DIST WebStorm-2020.3.tar.gz 435281659 BLAKE2B e0cbe5df5995b6de54b66c5e73db5751fa668a6cf7e401abf90dd32e3becf943b97c07d5c5755bd0831f079a58f47ef52faf735b6130c31e2cd38604c5f86c54 SHA512 ea6faf0326df0c285211aec6b38442c5047066a0917d832d1f9f28b910fcd8d96a4b759deb7beded263f0fb03ecf292a08c5dbff3c0498dc1fb95bf8ec55335f
-EBUILD webstorm-2020.3.ebuild 1428 BLAKE2B 79c9157afb9e2aa3787351c58c9327070aa32558b28fe267d0151b887ea331d531ccc6409704402e8c108dcc5a757bb9e4d4cbbe447fee309f882bedcc2db021 SHA512 e72dea2114b9154497f6320945b1f2436752b951d89a6cbabd92e8d12e0f793f340362ce6617d2fc1063aff35a0e999576ff532928acac75813991c6b3027a36
+DIST WebStorm-2020.3.1.tar.gz 441960473 BLAKE2B 117b3f127e7ac049983fd95a66781f71f5d7fe80c1531347ca73817d2f2eef8bd3d5dbdb962f7cf24a0ac893f0fda1da50bad122251fb3c1a1253777325b1849 SHA512 06843db4801df6308268f37c34302719b14a5d5a07939324c1574784c266e87d90e490e8c7f5c99ae46ee1f352580647eb36d6887f43357ccd2059cdf237c05b
+EBUILD webstorm-2020.3.1.ebuild 1428 BLAKE2B 79c9157afb9e2aa3787351c58c9327070aa32558b28fe267d0151b887ea331d531ccc6409704402e8c108dcc5a757bb9e4d4cbbe447fee309f882bedcc2db021 SHA512 e72dea2114b9154497f6320945b1f2436752b951d89a6cbabd92e8d12e0f793f340362ce6617d2fc1063aff35a0e999576ff532928acac75813991c6b3027a36
EBUILD webstorm-9999.ebuild 1428 BLAKE2B 79c9157afb9e2aa3787351c58c9327070aa32558b28fe267d0151b887ea331d531ccc6409704402e8c108dcc5a757bb9e4d4cbbe447fee309f882bedcc2db021 SHA512 e72dea2114b9154497f6320945b1f2436752b951d89a6cbabd92e8d12e0f793f340362ce6617d2fc1063aff35a0e999576ff532928acac75813991c6b3027a36
diff --git a/dev-util/webstorm/webstorm-2020.3.ebuild b/dev-util/webstorm/webstorm-2020.3.1.ebuild
index b20a3c1504e6..b20a3c1504e6 100644
--- a/dev-util/webstorm/webstorm-2020.3.ebuild
+++ b/dev-util/webstorm/webstorm-2020.3.1.ebuild
diff --git a/dev-util/wiggle/wiggle-1.0.ebuild b/dev-util/wiggle/wiggle-1.0.ebuild
index 33e321fa5383..2ae059f746e4 100644
--- a/dev-util/wiggle/wiggle-1.0.ebuild
+++ b/dev-util/wiggle/wiggle-1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://neil.brown.name/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-util/xdelta/xdelta-1.1.4-r3.ebuild b/dev-util/xdelta/xdelta-1.1.4-r3.ebuild
index 13f4fe56b9fc..232594e88fae 100644
--- a/dev-util/xdelta/xdelta-1.1.4-r3.ebuild
+++ b/dev-util/xdelta/xdelta-1.1.4-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
RDEPEND=">=dev-libs/glib-2
>=sys-libs/zlib-1.1.4:="
diff --git a/dev-util/xdelta/xdelta-3.0.11.ebuild b/dev-util/xdelta/xdelta-3.0.11.ebuild
index 60a4024b7d8d..c18979906a9b 100644
--- a/dev-util/xdelta/xdelta-3.0.11.ebuild
+++ b/dev-util/xdelta/xdelta-3.0.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jmacd/xdelta-gpl/releases/download/v${PV}/${MY_P}.ta
LICENSE="GPL-2"
SLOT="3"
-KEYWORDS="~alpha amd64 ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
IUSE="examples lzma"
RDEPEND="lzma? ( app-arch/xz-utils:= )"
diff --git a/dev-util/xfce4-dev-tools/Manifest b/dev-util/xfce4-dev-tools/Manifest
index ba62b2a27a3e..964dc670c6d8 100644
--- a/dev-util/xfce4-dev-tools/Manifest
+++ b/dev-util/xfce4-dev-tools/Manifest
@@ -1,3 +1,3 @@
DIST xfce4-dev-tools-4.14.0.tar.bz2 292275 BLAKE2B 18f28394ded038a7bcf0e754ebb359464358df245903a0c4441df2845e57c9059de6e6775a90c0e6c3cde4936a847ddf26ae88ff61fe7612fc2626b00f1d56a7 SHA512 e22b139ff7516ec0e510f882cc6a9e8e8b2b7bd41093c8e67e5ef11eb6c2c2848637513369d652f7238f10b5005c5483a938d3348020b48a4c1fadadd6d635f8
-DIST xfce4-dev-tools-4.15.0.tar.bz2 336453 BLAKE2B 9072d86b4b1645e72c04f26b5609162f50aac9d90ad007d2f629bb1ec67d242f3addea4bdd6f129f3336658b04f0eaecbd039154dfd98ccb87a85840b502d11f SHA512 125c8a7d594b17ce822dc5f57f5c700e69ee6208b06931cb0fefcbd1aa70281f388a9eebe8b451ffb55f16682070f9119a43b148f97adcdfd2278b4901910425
DIST xfce4-dev-tools-4.15.1.tar.bz2 340738 BLAKE2B 73c08f27011ce0d2144eaa1672209669a382695bc9fc9c0a7b9966398df09cf4813afdde9f809354b48d8ddc06644b6e8d4f45ed758dfca24c92e557f5536c8e SHA512 e24fb63774b36f5b3cd901394b75b36e891a68fe7a46a1503a1fc3cfe901bd267e2d8d4aa35a2c760226524079617059e5344b93ef98b3f97dce85e765e5c5dc
+DIST xfce4-dev-tools-4.16.0.tar.bz2 340107 BLAKE2B 93919e1b705858770f5c98cab080ba86785d524dc7371f09fba065f2bdf549d9a3ada66cdef3e1bbd344fb62cecb70661a1b6ce8c8bb51ada0be9459604d4d4f SHA512 54d9b45535c174ab0d13a3061ba2ff247c788a1190a6622b0adb4242d12e1fe42715256a18168d42fd5e425bbc7e9e81de30aa507da04f3e8d9b6f1ae5a5a7a7
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.15.0.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.16.0.ebuild
index 665633a8f721..4a16245a3622 100644
--- a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.15.0.ebuild
+++ b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.16.0.ebuild
@@ -12,6 +12,8 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
IUSE=""
-RDEPEND=">=dev-libs/glib-2.42"
-DEPEND="${RDEPEND}
+RDEPEND="
+ >=dev-libs/glib-2.50"
+DEPEND="${RDEPEND}"
+BDEPEND="
virtual/pkgconfig"
diff --git a/dev-util/yacc/yacc-1.9.1-r6.ebuild b/dev-util/yacc/yacc-1.9.1-r6.ebuild
index 140525ba6d3f..9b59538b6991 100644
--- a/dev-util/yacc/yacc-1.9.1-r6.ebuild
+++ b/dev-util/yacc/yacc-1.9.1-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://metalab.unc.edu/pub/Linux/devel/compiler-tools/${P}.tar.Z"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
PATCHES=(
# mkstemp patch from byacc ebuild.
diff --git a/dev-util/ydiff/Manifest b/dev-util/ydiff/Manifest
index 4de4a7a39ad6..b7a42ee49c96 100644
--- a/dev-util/ydiff/Manifest
+++ b/dev-util/ydiff/Manifest
@@ -1,2 +1 @@
-DIST ydiff-1.1.tar.gz 36357 BLAKE2B 4465c85132bb7c7d58c13dd79903610c74edec3b2b8ab8980918a1bf3a98f2b8387872a0974743503fcaad1e7ecb24c21d312a13d9aabe94780e9d623c35175a SHA512 575b3327edd3b8796f5f150fc7ebde32561e1782582e03e9b63bf9010998913fb8b00a8245d799f6cd5599e286f07f9e97e160f23606323d1a6f6059faa59bc9
DIST ydiff-1.2.tar.gz 42808 BLAKE2B 927482c2ed9a96efc354178679b4ba50497289bc31107e8cdef3062a71d91268fa703620f1f4b0be03aebaf339eba5254f4b43c16403f1d7818b84b0c450defb SHA512 0eb2230b64f43e20f6dc2411296389dc99356ef626152dc7f234583f70678e64a07b764fd89635479e7ac4aa7e2490db6e76c744369eefef8ab6a5386db1a7b5
diff --git a/dev-util/ydiff/ydiff-1.1.ebuild b/dev-util/ydiff/ydiff-1.1.ebuild
deleted file mode 100644
index 351de2deb1bd..000000000000
--- a/dev-util/ydiff/ydiff-1.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="Colored, side-by-side diff terminal viewer (ex. cdiff)"
-HOMEPAGE="https://github.com/ymattw/ydiff"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-DEPEND="sys-apps/less"
-RDEPEND=""
-
-DOCS=( CHANGES.rst README.rst )
-
-RESTRICT="test"
-
-python_test() {
- ${PYTHON} tests/test_ydiff.py || die "Unit tests failed."
-
- ./tests/regression.sh || die "Regression tests failed."
-}