summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/android-studio/android-studio-3.3.0.20.182.5199772.ebuild2
-rw-r--r--dev-util/android-studio/android-studio-3.4.0.18.183.5452501.ebuild2
-rw-r--r--dev-util/android-studio/android-studio-3.4.1.0.183.5522156.ebuild2
-rw-r--r--dev-util/android-tools/android-tools-8.1.0_p1.ebuild1
-rw-r--r--dev-util/android-tools/android-tools-9.0.0_p3.ebuild1
-rw-r--r--dev-util/apitrace/apitrace-8.0.ebuild2
-rw-r--r--dev-util/bazel/Manifest2
-rw-r--r--dev-util/bazel/bazel-0.24.1-r1.ebuild5
-rw-r--r--dev-util/bazel/bazel-0.26.1-r1.ebuild5
-rw-r--r--dev-util/bazel/bazel-0.27.0-r1.ebuild5
-rw-r--r--dev-util/bazel/bazel-0.27.2.ebuild109
-rw-r--r--dev-util/bazel/bazel-0.28.1.ebuild109
-rw-r--r--dev-util/bin_replace_string/metadata.xml1
-rw-r--r--dev-util/bitcoin-tx/Manifest2
-rw-r--r--dev-util/bitcoin-tx/bitcoin-tx-0.18.0.ebuild100
-rw-r--r--dev-util/bite/bite-9999.ebuild4
-rw-r--r--dev-util/boost-build/boost-build-1.70.0.ebuild2
-rw-r--r--dev-util/bpftrace/Manifest1
-rw-r--r--dev-util/bpftrace/bpftrace-0.9.2.ebuild68
-rw-r--r--dev-util/byacc/Manifest2
-rw-r--r--dev-util/byacc/byacc-20170201.ebuild4
-rw-r--r--dev-util/byacc/byacc-20190617.ebuild (renamed from dev-util/byacc/byacc-20190616.ebuild)0
-rw-r--r--dev-util/catalyst/Manifest5
-rw-r--r--dev-util/catalyst/catalyst-2.0.18-r1.ebuild115
-rw-r--r--dev-util/catalyst/catalyst-2.0.18-r4.ebuild120
-rw-r--r--dev-util/catalyst/catalyst-3.0.1.ebuild65
-rw-r--r--dev-util/catalyst/catalyst-3.0.2-r1.ebuild71
-rw-r--r--dev-util/catalyst/catalyst-3.0.2.ebuild70
-rw-r--r--dev-util/catalyst/catalyst-3.0.3.ebuild71
-rw-r--r--dev-util/catalyst/catalyst-3.0.4.ebuild68
-rw-r--r--dev-util/catalyst/catalyst-3.0.5.ebuild2
-rw-r--r--dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch95
-rw-r--r--dev-util/catalyst/files/catalyst-2.0.18-fix-quotes.patch38
-rw-r--r--dev-util/catalyst/files/catalyst-2.0.18-remove-machine-id.patch25
-rw-r--r--dev-util/catalyst/files/catalyst-2.0.18-stage1-export-ROOT.patch42
-rw-r--r--dev-util/catfish/Manifest2
-rw-r--r--dev-util/catfish/catfish-1.4.8-r1.ebuild45
-rw-r--r--dev-util/catfish/catfish-1.4.8.ebuild41
-rw-r--r--dev-util/catfish/catfish-1.4.9.ebuild46
-rw-r--r--dev-util/cbindgen/cbindgen-0.9.0.ebuild2
-rw-r--r--dev-util/ccache/Manifest8
-rw-r--r--dev-util/ccache/ccache-3.2.4.ebuild67
-rw-r--r--dev-util/ccache/ccache-3.3.4-r1.ebuild70
-rw-r--r--dev-util/ccache/ccache-3.5-r1.ebuild83
-rw-r--r--dev-util/ccache/ccache-3.5.1a.ebuild85
-rw-r--r--dev-util/ccache/ccache-3.7.1.ebuild2
-rw-r--r--dev-util/ccache/ccache-3.7.2.ebuild (renamed from dev-util/ccache/ccache-3.7.ebuild)2
-rw-r--r--dev-util/ccache/ccache-3.7.3.ebuild (renamed from dev-util/ccache/ccache-3.6.ebuild)8
-rw-r--r--dev-util/ccache/files/ccache-3.1.10-size-on-disk.patch21
-rw-r--r--dev-util/ccache/files/ccache-3.3-size-on-disk.patch3
-rw-r--r--dev-util/ccache/files/ccache-3.4-size-on-disk.patch3
-rw-r--r--dev-util/ccache/files/ccache-3.6-disable-sized-cleanup.patch1
-rw-r--r--dev-util/cgvg/Manifest1
-rw-r--r--dev-util/cgvg/cgvg-1.6.2.ebuild21
-rw-r--r--dev-util/cgvg/cgvg-1.6.3.ebuild2
-rw-r--r--dev-util/cgvg/metadata.xml1
-rw-r--r--dev-util/checkbashisms/Manifest4
-rw-r--r--dev-util/checkbashisms/checkbashisms-2.19.3.ebuild40
-rw-r--r--dev-util/checkbashisms/checkbashisms-2.19.5.ebuild40
-rw-r--r--dev-util/checkbashisms/checkbashisms-2.19.6.ebuild (renamed from dev-util/checkbashisms/checkbashisms-2.18.11.ebuild)2
-rw-r--r--dev-util/clion/Manifest2
-rw-r--r--dev-util/clion/clion-2019.2.ebuild (renamed from dev-util/clion/clion-2019.1.3.ebuild)6
-rw-r--r--dev-util/cloc/Manifest2
-rw-r--r--dev-util/cloc/cloc-1.82.ebuild2
-rw-r--r--dev-util/cmake/Manifest6
-rw-r--r--dev-util/cmake/cmake-3.14.6.ebuild (renamed from dev-util/cmake/cmake-3.14.3.ebuild)0
-rw-r--r--dev-util/cmake/cmake-3.15.1.ebuild (renamed from dev-util/cmake/cmake-3.15.0_rc4.ebuild)0
-rw-r--r--dev-util/cmake/cmake-3.15.2.ebuild (renamed from dev-util/cmake/cmake-3.14.5.ebuild)2
-rw-r--r--dev-util/cmocka/Manifest1
-rw-r--r--dev-util/cmocka/cmocka-1.1.3.ebuild51
-rw-r--r--dev-util/cmocka/cmocka-1.1.5.ebuild2
-rw-r--r--dev-util/cmocka/files/cmocka-1.1.3-examples.patch45
-rw-r--r--dev-util/cmocka/files/cmocka-1.1.3-fix-doxygen.patch43
-rw-r--r--dev-util/codeblocks/metadata.xml2
-rw-r--r--dev-util/conan/Manifest1
-rw-r--r--dev-util/conan/conan-1.18.1.ebuild68
-rw-r--r--dev-util/conan/metadata.xml4
-rw-r--r--dev-util/conf2struct/conf2struct-0_pre0-r1.ebuild (renamed from dev-util/conf2struct/conf2struct-0_pre0.ebuild)11
-rw-r--r--dev-util/conf2struct/conf2struct-9999.ebuild8
-rw-r--r--dev-util/cppcheck/cppcheck-1.86.ebuild2
-rw-r--r--dev-util/cpputest/cpputest-3.8.ebuild7
-rw-r--r--dev-util/ctags/Manifest2
-rw-r--r--dev-util/ctags/ctags-20161028.ebuild67
-rw-r--r--dev-util/ctags/ctags-20170704.ebuild74
-rw-r--r--dev-util/cucumber-core/Manifest1
-rw-r--r--dev-util/cucumber-core/cucumber-core-1.5.0.ebuild33
-rw-r--r--dev-util/cucumber-rails/Manifest1
-rw-r--r--dev-util/cucumber-rails/cucumber-rails-1.8.0.ebuild45
-rw-r--r--dev-util/cutter/cutter-1.8.0.ebuild3
-rw-r--r--dev-util/cutter/cutter-1.8.2.ebuild3
-rw-r--r--dev-util/debhelper/Manifest4
-rw-r--r--dev-util/debhelper/debhelper-12.3.ebuild (renamed from dev-util/debhelper/debhelper-12.1.1.ebuild)0
-rw-r--r--dev-util/debhelper/debhelper-12.4.ebuild (renamed from dev-util/debhelper/debhelper-12.1.ebuild)0
-rw-r--r--dev-util/debootstrap/debootstrap-1.0.115.ebuild2
-rw-r--r--dev-util/debugedit/debugedit-4.14.2-r2.ebuild2
-rw-r--r--dev-util/desktop-file-utils/Manifest1
-rw-r--r--dev-util/desktop-file-utils/desktop-file-utils-0.23.ebuild2
-rw-r--r--dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild56
-rw-r--r--dev-util/dialog/Manifest5
-rw-r--r--dev-util/dialog/dialog-1.3.20181022.ebuild51
-rw-r--r--dev-util/dialog/dialog-1.3.20190728.ebuild (renamed from dev-util/dialog/dialog-1.3.20190211.ebuild)0
-rw-r--r--dev-util/dialog/dialog-1.3.20190808.ebuild (renamed from dev-util/dialog/dialog-1.3.20181107.ebuild)4
-rw-r--r--dev-util/diffoscope/metadata.xml1
-rw-r--r--dev-util/dogtail/dogtail-0.9.10.ebuild2
-rw-r--r--dev-util/drone-cli/Manifest2
-rw-r--r--dev-util/drone-cli/drone-cli-1.1.3.ebuild34
-rw-r--r--dev-util/drone-cli/drone-cli-1.1.4.ebuild34
-rw-r--r--dev-util/edb-debugger/metadata.xml1
-rw-r--r--dev-util/edi/metadata.xml7
-rw-r--r--dev-util/electron/Manifest20
-rw-r--r--dev-util/electron/electron-1.6.18.ebuild883
-rw-r--r--dev-util/electron/electron-1.7.16.ebuild889
-rw-r--r--dev-util/electron/electron-2.0.10.ebuild908
-rw-r--r--dev-util/electron/electron-2.0.17-r2.ebuild (renamed from dev-util/electron/electron-2.0.17-r1.ebuild)20
-rw-r--r--dev-util/electron/metadata.xml11
-rw-r--r--dev-util/ftjam/ftjam-2.5.3_rc2-r2.ebuild2
-rw-r--r--dev-util/ftjam/metadata.xml1
-rw-r--r--dev-util/gdbus-codegen/Manifest1
-rw-r--r--dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild68
-rw-r--r--dev-util/glade/Manifest1
-rw-r--r--dev-util/glade/glade-3.22.1.ebuild90
-rw-r--r--dev-util/glade/metadata.xml3
-rw-r--r--dev-util/glib-utils/Manifest1
-rw-r--r--dev-util/glib-utils/glib-utils-2.60.6.ebuild65
-rw-r--r--dev-util/global/metadata.xml6
-rw-r--r--dev-util/glslang/Manifest1
-rw-r--r--dev-util/glslang/glslang-7.10.2984.ebuild16
-rw-r--r--dev-util/glslang/glslang-7.11.3114_pre20190415-r1.ebuild2
-rw-r--r--dev-util/glslang/glslang-7.11.3114_pre20190415.ebuild16
-rw-r--r--dev-util/gn/Manifest2
-rw-r--r--dev-util/gn/gn-0.1544.ebuild2
-rw-r--r--dev-util/gn/gn-0.1616.ebuild (renamed from dev-util/gn/gn-0.1583.ebuild)2
-rw-r--r--dev-util/google-perftools/metadata.xml1
-rw-r--r--dev-util/gource/gource-0.49.ebuild2
-rw-r--r--dev-util/gtk-update-icon-cache/Manifest2
-rw-r--r--dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.0.ebuild38
-rw-r--r--dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.7.ebuild31
-rw-r--r--dev-util/gyp/gyp-20170904022846.ebuild2
-rw-r--r--dev-util/gyp/gyp-99999999999999.ebuild2
-rw-r--r--dev-util/howdoi/Manifest1
-rw-r--r--dev-util/howdoi/howdoi-1.1.14.ebuild24
-rw-r--r--dev-util/howdoi/howdoi-1.2.1.ebuild2
-rw-r--r--dev-util/hxtools/metadata.xml1
-rw-r--r--dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.9-opencl-clang_solib_filename.patch14
-rw-r--r--dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.9.ebuild1
-rw-r--r--dev-util/jenkins-bin/Manifest6
-rw-r--r--dev-util/jenkins-bin/jenkins-bin-2.176.1.ebuild46
-rw-r--r--dev-util/jenkins-bin/jenkins-bin-2.176.2.ebuild (renamed from dev-util/jenkins-bin/jenkins-bin-2.164.3.ebuild)0
-rw-r--r--dev-util/jenkins-bin/jenkins-bin-2.180.ebuild46
-rw-r--r--dev-util/jenkins-bin/jenkins-bin-2.186.ebuild (renamed from dev-util/jenkins-bin/jenkins-bin-2.177.ebuild)0
-rw-r--r--dev-util/kdevelop-php/Manifest3
-rw-r--r--dev-util/kdevelop-php/kdevelop-php-5.3.3.ebuild (renamed from dev-util/kdevelop-php/kdevelop-php-5.3.2.ebuild)4
-rw-r--r--dev-util/kdevelop-php/kdevelop-php-5.4.1.ebuild52
-rw-r--r--dev-util/kdevelop-python/Manifest3
-rw-r--r--dev-util/kdevelop-python/kdevelop-python-5.3.3.ebuild (renamed from dev-util/kdevelop-python/kdevelop-python-5.3.2.ebuild)0
-rw-r--r--dev-util/kdevelop-python/kdevelop-python-5.4.1.ebuild47
-rw-r--r--dev-util/kdevelop/Manifest3
-rw-r--r--dev-util/kdevelop/kdevelop-5.3.3.ebuild (renamed from dev-util/kdevelop/kdevelop-5.3.2.ebuild)5
-rw-r--r--dev-util/kdevelop/kdevelop-5.4.1.ebuild135
-rw-r--r--dev-util/kernelshark/Manifest1
-rw-r--r--dev-util/kernelshark/files/kernelshark-1.0-build.patch33
-rw-r--r--dev-util/kernelshark/files/kernelshark-1.0-desktop-version.patch11
-rw-r--r--dev-util/kernelshark/kernelshark-1.0.ebuild58
-rw-r--r--dev-util/kernelshark/kernelshark-9999.ebuild58
-rw-r--r--dev-util/kernelshark/metadata.xml12
-rw-r--r--dev-util/lcov/lcov-1.11.ebuild2
-rw-r--r--dev-util/lcov/lcov-1.9-r1.ebuild2
-rw-r--r--dev-util/lcov/lcov-9999.ebuild2
-rw-r--r--dev-util/lldb/Manifest2
-rw-r--r--dev-util/lldb/lldb-10.0.0.9999.ebuild (renamed from dev-util/lldb/lldb-8.0.9999.ebuild)18
-rw-r--r--dev-util/lldb/lldb-8.0.1.ebuild118
-rw-r--r--dev-util/lldb/lldb-9.0.0.9999.ebuild (renamed from dev-util/lldb/lldb-9999.ebuild)22
-rw-r--r--dev-util/lxqt-build-tools/lxqt-build-tools-0.6.0.ebuild2
-rw-r--r--dev-util/makepp/Manifest1
-rw-r--r--dev-util/makepp/makepp-2.0.99.2.ebuild43
-rw-r--r--dev-util/mdds/mdds-1.3.1.ebuild4
-rw-r--r--dev-util/mdds/mdds-1.4.3.ebuild2
-rw-r--r--dev-util/meson/Manifest1
-rw-r--r--dev-util/meson/meson-0.50.1.ebuild2
-rw-r--r--dev-util/meson/meson-0.51.1.ebuild72
-rw-r--r--dev-util/mingw64-runtime/metadata.xml1
-rw-r--r--dev-util/mingw64-runtime/mingw64-runtime-6.0.0-r2.ebuild113
-rw-r--r--dev-util/netsurf-buildsystem/netsurf-buildsystem-1.7-r1.ebuild2
-rw-r--r--dev-util/ninja/ninja-1.9.0.ebuild2
-rw-r--r--dev-util/ninja/ninja-9999.ebuild2
-rw-r--r--dev-util/ninka/ninka-2.0_pre1_p20170402.ebuild1
-rw-r--r--dev-util/obs-service-cpanspec/metadata.xml1
-rw-r--r--dev-util/obs-service-download_files/metadata.xml1
-rw-r--r--dev-util/obs-service-download_src_package/metadata.xml1
-rw-r--r--dev-util/obs-service-download_url/metadata.xml1
-rw-r--r--dev-util/obs-service-extract_file/metadata.xml1
-rw-r--r--dev-util/obs-service-format_spec_file/metadata.xml1
-rw-r--r--dev-util/obs-service-generator_driver_update_disk/metadata.xml1
-rw-r--r--dev-util/obs-service-git_tarballs/metadata.xml1
-rw-r--r--dev-util/obs-service-github_tarballs/metadata.xml1
-rw-r--r--dev-util/obs-service-meta/metadata.xml1
-rw-r--r--dev-util/obs-service-rearchive/metadata.xml1
-rw-r--r--dev-util/obs-service-recompress/metadata.xml1
-rw-r--r--dev-util/obs-service-set_version/metadata.xml1
-rw-r--r--dev-util/obs-service-source_validator/metadata.xml1
-rw-r--r--dev-util/obs-service-tar_scm/metadata.xml1
-rw-r--r--dev-util/obs-service-update_source/metadata.xml1
-rw-r--r--dev-util/obs-service-verify_file/metadata.xml1
-rw-r--r--dev-util/open-vcdiff/metadata.xml1
-rw-r--r--dev-util/osc/metadata.xml1
-rw-r--r--dev-util/packer/Manifest1
-rw-r--r--dev-util/packer/packer-1.4.1.ebuild35
-rw-r--r--dev-util/patchelf/patchelf-0.8.ebuild2
-rw-r--r--dev-util/perf/perf-4.14.33-r1.ebuild4
-rw-r--r--dev-util/perf/perf-4.20.3.ebuild6
-rw-r--r--dev-util/perf/perf-5.1.15.ebuild6
-rw-r--r--dev-util/pkgcheck/pkgcheck-9999.ebuild5
-rw-r--r--dev-util/pkgconf/Manifest2
-rw-r--r--dev-util/pkgconf/metadata.xml4
-rw-r--r--dev-util/pkgconf/pkgconf-1.6.3.ebuild (renamed from dev-util/pkgconf/pkgconf-1.3.7.ebuild)33
-rw-r--r--dev-util/pkgconf/pkgconf-9999.ebuild25
-rw-r--r--dev-util/pkgconfig-openbsd/metadata.xml1
-rw-r--r--dev-util/pycharm-community/Manifest3
-rw-r--r--dev-util/pycharm-community/pycharm-community-2019.1.1.ebuild55
-rw-r--r--dev-util/pycharm-community/pycharm-community-2019.1.3.ebuild2
-rw-r--r--dev-util/pycharm-community/pycharm-community-2019.2.ebuild (renamed from dev-util/pycharm-community/pycharm-community-2019.1.2.ebuild)0
-rw-r--r--dev-util/pycharm-professional/Manifest3
-rw-r--r--dev-util/pycharm-professional/pycharm-professional-2019.1.1.ebuild58
-rw-r--r--dev-util/pycharm-professional/pycharm-professional-2019.1.3.ebuild2
-rw-r--r--dev-util/pycharm-professional/pycharm-professional-2019.2.ebuild (renamed from dev-util/pycharm-professional/pycharm-professional-2019.1.2.ebuild)0
-rw-r--r--dev-util/radare2/Manifest2
-rw-r--r--dev-util/radare2/files/radare2-3.7.0-with-syscapstone-p1.patch24
-rw-r--r--dev-util/radare2/files/radare2-3.7.0-with-syscapstone-p2.patch22
-rw-r--r--dev-util/radare2/radare2-3.7.0.ebuild58
-rw-r--r--dev-util/radare2/radare2-3.7.1.ebuild56
-rw-r--r--dev-util/re2c/Manifest2
-rw-r--r--dev-util/re2c/re2c-1.2.1.ebuild26
-rw-r--r--dev-util/re2c/re2c-1.2.ebuild26
-rw-r--r--dev-util/redo/Manifest1
-rw-r--r--dev-util/redo/redo-0.31.ebuild6
-rw-r--r--dev-util/redo/redo-0.41.ebuild6
-rw-r--r--dev-util/redo/redo-0.42.ebuild48
-rw-r--r--dev-util/redo/redo-99999.ebuild6
-rw-r--r--dev-util/reswrap/metadata.xml1
-rw-r--r--dev-util/rocm-cmake/Manifest2
-rw-r--r--dev-util/rocm-cmake/metadata.xml14
-rw-r--r--dev-util/rocm-cmake/rocm-cmake-0.2.ebuild25
-rw-r--r--dev-util/rocm-cmake/rocm-cmake-2.7.0.ebuild26
-rw-r--r--dev-util/rocm-cmake/rocm-cmake-9999.ebuild26
-rw-r--r--dev-util/rocminfo/Manifest1
-rw-r--r--dev-util/rocminfo/files/rocminfo-2.6.0-cmake-variables.patch31
-rw-r--r--dev-util/rocminfo/metadata.xml14
-rw-r--r--dev-util/rocminfo/rocminfo-2.6.0.ebuild36
-rw-r--r--dev-util/rustfmt/Manifest44
-rw-r--r--dev-util/rustfmt/metadata.xml11
-rw-r--r--dev-util/rustfmt/rustfmt-0.8.6.ebuild66
-rw-r--r--dev-util/rustfmt/rustfmt-0.9.0.ebuild62
-rw-r--r--dev-util/sasm/Manifest1
-rw-r--r--dev-util/sasm/files/sasm-3.10.1-unbundle-qtsingleapplication.patch19
-rw-r--r--dev-util/sasm/sasm-3.10.1.ebuild (renamed from dev-util/sasm/sasm-9999.ebuild)23
-rw-r--r--dev-util/scanmem/Manifest1
-rw-r--r--dev-util/scanmem/scanmem-0.17.ebuild58
-rw-r--r--dev-util/sccache/Manifest8
-rw-r--r--dev-util/sccache/files/scheduler.confd-r112
-rw-r--r--[-rwxr-xr-x]dev-util/sccache/files/scheduler.initd0
-rw-r--r--dev-util/sccache/files/scheduler.initd-r117
-rw-r--r--dev-util/sccache/files/server.confd-r112
-rw-r--r--[-rwxr-xr-x]dev-util/sccache/files/server.initd0
-rw-r--r--dev-util/sccache/files/server.initd-r119
-rw-r--r--dev-util/sccache/sccache-0.2.10.ebuild358
-rw-r--r--dev-util/sccache/sccache-0.2.9.ebuild358
-rw-r--r--dev-util/scons/Manifest8
-rw-r--r--dev-util/scons/scons-3.0.5.ebuild2
-rw-r--r--dev-util/scons/scons-3.1.0.ebuild86
-rw-r--r--dev-util/scons/scons-3.1.1.ebuild86
-rw-r--r--dev-util/shellcheck-bin/Manifest2
-rw-r--r--dev-util/shellcheck-bin/shellcheck-bin-0.7.0.ebuild28
-rw-r--r--dev-util/shellcheck/Manifest1
-rw-r--r--dev-util/shellcheck/shellcheck-0.7.0.ebuild40
-rw-r--r--dev-util/shunit2/metadata.xml1
-rw-r--r--dev-util/smem/metadata.xml1
-rw-r--r--dev-util/spirv-headers/Manifest3
-rw-r--r--dev-util/spirv-headers/files/spirv-headers-Get-rid-of-custom-target.patch25
-rw-r--r--dev-util/spirv-headers/spirv-headers-1.3.1_pre20180710.ebuild17
-rw-r--r--dev-util/spirv-headers/spirv-headers-1.3.4_pre20180917.ebuild17
-rw-r--r--dev-util/spirv-headers/spirv-headers-1.3.4_pre20190302.ebuild2
-rw-r--r--dev-util/spirv-headers/spirv-headers-1.3.ebuild19
-rw-r--r--dev-util/spirv-tools/spirv-tools-2019.1-r2.ebuild2
-rw-r--r--dev-util/stubgen/metadata.xml1
-rw-r--r--dev-util/suse-build/metadata.xml1
-rw-r--r--dev-util/sysdig/Manifest1
-rw-r--r--dev-util/sysdig/sysdig-0.26.2.ebuild88
-rw-r--r--dev-util/sysprof/Manifest1
-rw-r--r--dev-util/sysprof/sysprof-3.32.0.ebuild74
-rw-r--r--dev-util/trace-cmd/Manifest3
-rw-r--r--dev-util/trace-cmd/files/trace-cmd-2.7-makefile.patch36
-rw-r--r--dev-util/trace-cmd/files/trace-cmd-2.7-soname.patch13
-rw-r--r--dev-util/trace-cmd/files/trace-cmd-2.8-python3-warnings.patch111
-rw-r--r--dev-util/trace-cmd/files/trace-cmd-2.8.3-python3-warnings.patch50
-rw-r--r--dev-util/trace-cmd/files/trace-cmd-2.8.3-soname.patch (renamed from dev-util/trace-cmd/files/trace-cmd-2.8-soname.patch)6
-rw-r--r--dev-util/trace-cmd/trace-cmd-2.7-r2.ebuild83
-rw-r--r--dev-util/trace-cmd/trace-cmd-2.8.3.ebuild (renamed from dev-util/trace-cmd/trace-cmd-2.8.ebuild)14
-rw-r--r--dev-util/trace-cmd/trace-cmd-9999.ebuild21
-rw-r--r--dev-util/uftrace/Manifest2
-rw-r--r--dev-util/uftrace/metadata.xml3
-rw-r--r--dev-util/uftrace/uftrace-0.9.3.ebuild (renamed from dev-util/uftrace/uftrace-0.9.1.ebuild)16
-rw-r--r--dev-util/vulkan-headers/Manifest3
-rw-r--r--dev-util/vulkan-headers/vulkan-headers-1.1.101.ebuild25
-rw-r--r--dev-util/vulkan-headers/vulkan-headers-1.1.106.ebuild2
-rw-r--r--dev-util/vulkan-headers/vulkan-headers-1.1.82.0.ebuild25
-rw-r--r--dev-util/vulkan-headers/vulkan-headers-1.1.92.0.ebuild25
-rw-r--r--dev-util/vulkan-headers/vulkan-headers-9999.ebuild2
-rw-r--r--dev-util/vulkan-tools/Manifest1
-rw-r--r--dev-util/vulkan-tools/vulkan-tools-1.1.106-r1.ebuild6
-rw-r--r--dev-util/vulkan-tools/vulkan-tools-1.1.106.ebuild92
-rw-r--r--dev-util/vulkan-tools/vulkan-tools-1.1.92.0.ebuild92
-rw-r--r--dev-util/vulkan-tools/vulkan-tools-9999.ebuild6
-rw-r--r--dev-util/xfce4-dev-tools/Manifest1
-rw-r--r--dev-util/xfce4-dev-tools/xfce4-dev-tools-4.14.0.ebuild17
-rw-r--r--dev-util/xxdi/metadata.xml1
-rw-r--r--dev-util/xxdi/xxdi-1.0.0.ebuild2
316 files changed, 3914 insertions, 5630 deletions
diff --git a/dev-util/android-studio/android-studio-3.3.0.20.182.5199772.ebuild b/dev-util/android-studio/android-studio-3.3.0.20.182.5199772.ebuild
index 008bd20b140..09471fbd560 100644
--- a/dev-util/android-studio/android-studio-3.3.0.20.182.5199772.ebuild
+++ b/dev-util/android-studio/android-studio-3.3.0.20.182.5199772.ebuild
@@ -47,7 +47,7 @@ RDEPEND=">=virtual/jdk-1.7
>=media-libs/fontconfig-2.10.92
>=media-libs/freetype-2.5.5
>=media-libs/libpng-1.2.51
- >=media-libs/mesa-10.2.8
+ >=media-libs/mesa-10.2.8[X(+)]
|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
>=sys-libs/ncurses-5.9-r3:5/5[tinfo]
>=sys-libs/zlib-1.2.8-r1
diff --git a/dev-util/android-studio/android-studio-3.4.0.18.183.5452501.ebuild b/dev-util/android-studio/android-studio-3.4.0.18.183.5452501.ebuild
index 8a6b5cc3520..060c081b0e8 100644
--- a/dev-util/android-studio/android-studio-3.4.0.18.183.5452501.ebuild
+++ b/dev-util/android-studio/android-studio-3.4.0.18.183.5452501.ebuild
@@ -52,7 +52,7 @@ RDEPEND="${DEPEND}
>=media-libs/fontconfig-2.10.92
>=media-libs/freetype-2.5.5
>=media-libs/libpng-1.2.51
- >=media-libs/mesa-10.2.8
+ >=media-libs/mesa-10.2.8[X(+)]
|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
>=sys-libs/ncurses-5.9-r3:5/5[tinfo]
>=sys-libs/zlib-1.2.8-r1
diff --git a/dev-util/android-studio/android-studio-3.4.1.0.183.5522156.ebuild b/dev-util/android-studio/android-studio-3.4.1.0.183.5522156.ebuild
index 655d30a45bd..239a3b30918 100644
--- a/dev-util/android-studio/android-studio-3.4.1.0.183.5522156.ebuild
+++ b/dev-util/android-studio/android-studio-3.4.1.0.183.5522156.ebuild
@@ -52,7 +52,7 @@ RDEPEND="${DEPEND}
>=media-libs/fontconfig-2.10.92
>=media-libs/freetype-2.5.5
>=media-libs/libpng-1.2.51
- >=media-libs/mesa-10.2.8
+ >=media-libs/mesa-10.2.8[X(+)]
|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
>=sys-libs/ncurses-5.9-r3:5/5[tinfo]
>=sys-libs/zlib-1.2.8-r1
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
index 9e63f95cdd3..db699e1b682 100644
--- a/dev-util/android-tools/android-tools-8.1.0_p1.ebuild
+++ b/dev-util/android-tools/android-tools-8.1.0_p1.ebuild
@@ -30,6 +30,7 @@ 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:=
diff --git a/dev-util/android-tools/android-tools-9.0.0_p3.ebuild b/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
index 7ba1bd76235..ad1df383e85 100644
--- a/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
+++ b/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
@@ -31,6 +31,7 @@ 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:=
diff --git a/dev-util/apitrace/apitrace-8.0.ebuild b/dev-util/apitrace/apitrace-8.0.ebuild
index 2e34348ebc2..d37d8c20af6 100644
--- a/dev-util/apitrace/apitrace-8.0.ebuild
+++ b/dev-util/apitrace/apitrace-8.0.ebuild
@@ -20,7 +20,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="${PYTHON_DEPS}
app-arch/brotli:=
media-libs/libpng:0=
- media-libs/mesa[egl?,${MULTILIB_USEDEP}]
+ media-libs/mesa[egl?,X(+),${MULTILIB_USEDEP}]
sys-libs/zlib[${MULTILIB_USEDEP}]
sys-process/procps:=
x11-libs/libX11
diff --git a/dev-util/bazel/Manifest b/dev-util/bazel/Manifest
index 928675d7143..bc96aabab66 100644
--- a/dev-util/bazel/Manifest
+++ b/dev-util/bazel/Manifest
@@ -3,3 +3,5 @@ DIST bazel-0.22.0-dist.zip 88633015 BLAKE2B 7cb7ef53c9acb4089b92d82679ad82739fd3
DIST bazel-0.24.1-dist.zip 174691842 BLAKE2B 56d42421ac6f5513f019f3b71ca0c5e7b499c199dd8d9f22ca4fdca832527a1974afffccd6bff6b1d29dc3156ee28ba7f91a9a37f2f8524da5c5f30645be97aa SHA512 a78c871eb517ec53a0d1d9592887288fa54e5e9f44b0b7dba44792a74a1ba0c98e38ff2f6094ab6e8b3add3ec4a0188de3b2489d94d419373e210d16db641774
DIST bazel-0.26.1-dist.zip 244633948 BLAKE2B 667078bda6e52f696127b7a4914ec52ab67a84f89ac957304a281268615158cc813d7d7cdac58b336dd8ef1d3cd117f1474f64f741e0a3119034dc43ca3b58b0 SHA512 f43f156947c2e9effb1f3ab79235d47d00254103b5a5aac62001008403216b2330c9062ce85d42be4fa582ad52d14ba52a47875df40c58a7e18c391684407574
DIST bazel-0.27.0-dist.zip 247946763 BLAKE2B f061793de89144c77bd42de56c495e8b3399ac1892bdd2b0e210102ea1c2835a848432b2964ddcc6ebe77aa580efa378d46afad1faa6dec0831666f201a6dd74 SHA512 f5c6a0c789eb55790479ff839f7f959e7d0e46e5f14b5cdcd720e4dc2c36122345c9dcd6bfa803f88fb5264553a3d63ae0c8e4c7b9779bfc65183e2aaee5a666
+DIST bazel-0.27.2-dist.zip 247948037 BLAKE2B ee3dafbb104f434080ad803cb40585e36a8c816eddac3d1a680752dd4ac65d588f1d5f4bb759dad0f59e9f6d7aad0ea5b54cd050d75a5434ee6ef079d8127641 SHA512 5fd7c2af2123424d3e5e4c9216de10d12ce604798f4831800c8d68cfd9bcf1133f4db9a947f0ee16db1a1513be17340ab8e36fba994a016d98c74ad5e026b4ab
+DIST bazel-0.28.1-dist.zip 256641169 BLAKE2B 489dfb1a27f83ff244cd05c11ec206689c12319a48f000379277073a108a79ad2dff61ed159efcbb1405531114ccb2d749e974004f969623cd4e9470166609f0 SHA512 640d3a9644436379e989d5993b5de9f2dc14d651a9f444c8795853989fdded7a62d71ab7cfa491d2aaf6402020c4931c8dc190d4dae63727b172ccb48ed55931
diff --git a/dev-util/bazel/bazel-0.24.1-r1.ebuild b/dev-util/bazel/bazel-0.24.1-r1.ebuild
index a1d730d5713..84224be1166 100644
--- a/dev-util/bazel/bazel-0.24.1-r1.ebuild
+++ b/dev-util/bazel/bazel-0.24.1-r1.ebuild
@@ -13,9 +13,10 @@ SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.z
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="examples test tools"
+IUSE="examples tools"
# strip corrupts the bazel binary
-RESTRICT="strip test? ( network-sandbox ) !test? ( test )"
+# test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794)
+RESTRICT="strip test"
RDEPEND=">=virtual/jdk-1.8:*"
DEPEND="${RDEPEND}
app-arch/unzip
diff --git a/dev-util/bazel/bazel-0.26.1-r1.ebuild b/dev-util/bazel/bazel-0.26.1-r1.ebuild
index a1d730d5713..84224be1166 100644
--- a/dev-util/bazel/bazel-0.26.1-r1.ebuild
+++ b/dev-util/bazel/bazel-0.26.1-r1.ebuild
@@ -13,9 +13,10 @@ SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.z
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="examples test tools"
+IUSE="examples tools"
# strip corrupts the bazel binary
-RESTRICT="strip test? ( network-sandbox ) !test? ( test )"
+# test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794)
+RESTRICT="strip test"
RDEPEND=">=virtual/jdk-1.8:*"
DEPEND="${RDEPEND}
app-arch/unzip
diff --git a/dev-util/bazel/bazel-0.27.0-r1.ebuild b/dev-util/bazel/bazel-0.27.0-r1.ebuild
index a1d730d5713..84224be1166 100644
--- a/dev-util/bazel/bazel-0.27.0-r1.ebuild
+++ b/dev-util/bazel/bazel-0.27.0-r1.ebuild
@@ -13,9 +13,10 @@ SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.z
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="examples test tools"
+IUSE="examples tools"
# strip corrupts the bazel binary
-RESTRICT="strip test? ( network-sandbox ) !test? ( test )"
+# test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794)
+RESTRICT="strip test"
RDEPEND=">=virtual/jdk-1.8:*"
DEPEND="${RDEPEND}
app-arch/unzip
diff --git a/dev-util/bazel/bazel-0.27.2.ebuild b/dev-util/bazel/bazel-0.27.2.ebuild
new file mode 100644
index 00000000000..84224be1166
--- /dev/null
+++ b/dev-util/bazel/bazel-0.27.2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 java-pkg-2 multiprocessing
+
+DESCRIPTION="Fast and correct automated build system"
+HOMEPAGE="https://bazel.build/"
+
+SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples tools"
+# strip corrupts the bazel binary
+# test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794)
+RESTRICT="strip test"
+RDEPEND=">=virtual/jdk-1.8:*"
+DEPEND="${RDEPEND}
+ app-arch/unzip
+ app-arch/zip"
+
+S="${WORKDIR}"
+
+bazel-get-flags() {
+ local i fs=()
+ for i in ${CFLAGS}; do
+ fs+=( "--copt=${i}" "--host_copt=${i}" )
+ done
+ for i in ${CXXFLAGS}; do
+ fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+ done
+ for i in ${CPPFLAGS}; do
+ fs+=( "--copt=${i}" "--host_copt=${i}" )
+ fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+ done
+ for i in ${LDFLAGS}; do
+ fs+=( "--linkopt=${i}" "--host_linkopt=${i}" )
+ done
+ echo "${fs[*]}"
+}
+
+pkg_setup() {
+ echo ${PATH} | grep -q ccache && \
+ ewarn "${PN} usually fails to compile with ccache, you have been warned"
+ java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+ # Only unpack the main distfile
+ unpack ${P}-dist.zip
+}
+
+src_prepare() {
+ default
+
+ # F: fopen_wr
+ # S: deny
+ # P: /proc/self/setgroups
+ # A: /proc/self/setgroups
+ # R: /proc/24939/setgroups
+ # C: /usr/lib/systemd/systemd
+ addpredict /proc
+}
+
+src_compile() {
+ export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) $(bazel-get-flags) --host_javabase=@local_jdk//:jdk"
+ VERBOSE=yes ./compile.sh || die
+
+ ./scripts/generate_bash_completion.sh \
+ --bazel=output/bazel \
+ --output=bazel-complete.bash \
+ --prepend=scripts/bazel-complete-header.bash \
+ --prepend=scripts/bazel-complete-template.bash
+}
+
+src_test() {
+ output/bazel test \
+ --verbose_failures \
+ --spawn_strategy=standalone \
+ --genrule_strategy=standalone \
+ --verbose_test_summary \
+ examples/cpp:hello-success_test || die
+ output/bazel shutdown
+}
+
+src_install() {
+ dobin output/bazel
+ newbashcomp bazel-complete.bash ${PN}
+ bashcomp_alias ${PN} ibazel
+ insinto /usr/share/zsh/site-functions
+ doins scripts/zsh_completion/_bazel
+
+ if use examples; then
+ docinto examples
+ dodoc -r examples/*
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+ # could really build tools but I don't know which ones
+ # are actually used
+ if use tools; then
+ docinto tools
+ dodoc -r tools/*
+ docompress -x /usr/share/doc/${PF}/tools
+ docompress -x /usr/share/doc/${PF}/tools/build_defs/pkg/testdata
+ fi
+}
diff --git a/dev-util/bazel/bazel-0.28.1.ebuild b/dev-util/bazel/bazel-0.28.1.ebuild
new file mode 100644
index 00000000000..84224be1166
--- /dev/null
+++ b/dev-util/bazel/bazel-0.28.1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 java-pkg-2 multiprocessing
+
+DESCRIPTION="Fast and correct automated build system"
+HOMEPAGE="https://bazel.build/"
+
+SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples tools"
+# strip corrupts the bazel binary
+# test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794)
+RESTRICT="strip test"
+RDEPEND=">=virtual/jdk-1.8:*"
+DEPEND="${RDEPEND}
+ app-arch/unzip
+ app-arch/zip"
+
+S="${WORKDIR}"
+
+bazel-get-flags() {
+ local i fs=()
+ for i in ${CFLAGS}; do
+ fs+=( "--copt=${i}" "--host_copt=${i}" )
+ done
+ for i in ${CXXFLAGS}; do
+ fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+ done
+ for i in ${CPPFLAGS}; do
+ fs+=( "--copt=${i}" "--host_copt=${i}" )
+ fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+ done
+ for i in ${LDFLAGS}; do
+ fs+=( "--linkopt=${i}" "--host_linkopt=${i}" )
+ done
+ echo "${fs[*]}"
+}
+
+pkg_setup() {
+ echo ${PATH} | grep -q ccache && \
+ ewarn "${PN} usually fails to compile with ccache, you have been warned"
+ java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+ # Only unpack the main distfile
+ unpack ${P}-dist.zip
+}
+
+src_prepare() {
+ default
+
+ # F: fopen_wr
+ # S: deny
+ # P: /proc/self/setgroups
+ # A: /proc/self/setgroups
+ # R: /proc/24939/setgroups
+ # C: /usr/lib/systemd/systemd
+ addpredict /proc
+}
+
+src_compile() {
+ export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) $(bazel-get-flags) --host_javabase=@local_jdk//:jdk"
+ VERBOSE=yes ./compile.sh || die
+
+ ./scripts/generate_bash_completion.sh \
+ --bazel=output/bazel \
+ --output=bazel-complete.bash \
+ --prepend=scripts/bazel-complete-header.bash \
+ --prepend=scripts/bazel-complete-template.bash
+}
+
+src_test() {
+ output/bazel test \
+ --verbose_failures \
+ --spawn_strategy=standalone \
+ --genrule_strategy=standalone \
+ --verbose_test_summary \
+ examples/cpp:hello-success_test || die
+ output/bazel shutdown
+}
+
+src_install() {
+ dobin output/bazel
+ newbashcomp bazel-complete.bash ${PN}
+ bashcomp_alias ${PN} ibazel
+ insinto /usr/share/zsh/site-functions
+ doins scripts/zsh_completion/_bazel
+
+ if use examples; then
+ docinto examples
+ dodoc -r examples/*
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+ # could really build tools but I don't know which ones
+ # are actually used
+ if use tools; then
+ docinto tools
+ dodoc -r tools/*
+ docompress -x /usr/share/doc/${PF}/tools
+ docompress -x /usr/share/doc/${PF}/tools/build_defs/pkg/testdata
+ fi
+}
diff --git a/dev-util/bin_replace_string/metadata.xml b/dev-util/bin_replace_string/metadata.xml
index 097975e3adc..58f638b2ac3 100644
--- a/dev-util/bin_replace_string/metadata.xml
+++ b/dev-util/bin_replace_string/metadata.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <!--maintainer-needed-->
</pkgmetadata>
diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest
index c3a90d5a2b6..6498fdc5f9f 100644
--- a/dev-util/bitcoin-tx/Manifest
+++ b/dev-util/bitcoin-tx/Manifest
@@ -1,4 +1,6 @@
DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
DIST bitcoin-0.17.1.knots20181229.patches.tar.xz 475988 BLAKE2B ce19ccbbeaac48f24b2833858a186494f84cb54ac380c42104f4d16b0a6acb44bc7a83c1b11311e2c566326d7067530ea5f34404def5f22b4825e2fa15aca22d SHA512 da89f9510ee523c712aa137512dda752ab8d115eb8a45a999aa742555621f557694db34162a1f6979922268a3e22563883ea6d9d9a47e5c7613235c0ff06fda0
+DIST bitcoin-0.18.0.knots20190502.patches.tar.xz 400252 BLAKE2B 0303bba89b3595a115ec8e5e743c362fc5feb0072ae493455cf3bcf1085b7f44d6b10142c05cb7ea59fadc630095de3a5f648007eb28f79551f2415db5c4f560 SHA512 b4c30c63cb6c770e04abd18e626db6e095b0d8b5aaf59e64b55eb8e19d4fdb559a3a2b939ab0e09967b4d3465b560e1379fa21b8efb3f25c22f84a2a1c655d16
DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
DIST bitcoin-v0.17.1.tar.gz 6224852 BLAKE2B efc86768ee2d23db83496ff9e62bc86d10c4d24a7343f4c706a4d336aeb94087b2d496db53e393beb5a9dc228bb9fe957ca89254c2fdaf9980b03029efbac2f8 SHA512 ef911ac6b49075a4f3d8db7f9f4dc59590d49847006fa36d7b8cce1634945d418accd95b12da505df38314fb7768f544863169d4b26b230e88dd627a83947466
+DIST bitcoin-v0.18.0.tar.gz 6533794 BLAKE2B 0eb7830e215757efb024be7aff73108c4a8e2f80a204ca71f1b3b6015933a1ab740ad006e58c473c4b9609b3e47885ba6564472a3514335ab6d7f99d32903822 SHA512 a2e38754d459fac0786eaa43f23c62ee326167f325d98964546217bcdc4f68ab88314bfb674ca4efd4cbc21fc3950bd029e1375ee101e0c72bbae7197fc31cf2
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.18.0.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.18.0.ebuild
new file mode 100644
index 00000000000..9c64bb0e597
--- /dev/null
+++ b/dev-util/bitcoin-tx/bitcoin-tx-0.18.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1
+
+BITCOINCORE_COMMITHASH="2472733a24a9364e4c6233ccd04166a26a68cc65"
+KNOTS_PV="${PV}.knots20190502"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="Command-line Bitcoin transaction tool"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
+SRC_URI="
+ https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
+ https://bitcoinknots.org/files/0.18.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="knots libressl"
+
+DEPEND="
+ >=dev-libs/boost-1.52.0:=[threads(+)]
+ >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
+ >=dev-libs/univalue-1.0.4:=
+ !libressl? ( dev-libs/openssl:0=[-bindist] )
+ libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( doc/bips.md doc/release-notes.md )
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+ if use knots; then
+ elog "You are building ${PN} from Bitcoin Knots."
+ elog "For more information, see:"
+ elog "https://bitcoinknots.org/files/0.18.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+ else
+ elog "You are building ${PN} from Bitcoin Core."
+ elog "For more information, see:"
+ elog "https://bitcoincore.org/en/2019/05/02/release-${PV}/"
+ fi
+}
+
+src_prepare() {
+ local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+
+ eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
+
+ if use knots; then
+ eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
+ eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
+ eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
+ fi
+
+ eapply_user
+
+ echo '#!/bin/true' >share/genbuild.sh || die
+ mkdir -p src/obj || die
+ echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
+
+ eautoreconf
+ rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+ local my_econf=(
+ --disable-asm
+ --without-qtdbus
+ --without-qrencode
+ --without-miniupnpc
+ --disable-tests
+ --disable-wallet
+ --disable-zmq
+ --enable-util-tx
+ --disable-util-cli
+ --disable-util-wallet
+ --disable-bench
+ --without-libs
+ --without-daemon
+ --without-gui
+ --without-rapidcheck
+ --disable-fuzz
+ --disable-ccache
+ --disable-static
+ --with-system-libsecp256k1
+ --with-system-univalue
+ )
+ econf "${my_econf[@]}"
+}
+
+src_install() {
+ default
+
+ newbashcomp contrib/${PN}.bash-completion ${PN}
+}
diff --git a/dev-util/bite/bite-9999.ebuild b/dev-util/bite/bite-9999.ebuild
index fc1ffd808d2..adddde77b9b 100644
--- a/dev-util/bite/bite-9999.ebuild
+++ b/dev-util/bite/bite-9999.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
@@ -31,7 +31,7 @@ RDEPEND="
app-crypt/gpgme[python,${PYTHON_USEDEP}]
"
if [[ ${PV} == *9999 ]] ; then
- RDEPEND+=" =dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
+ RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
SPHINX="dev-python/sphinx[${PYTHON_USEDEP}]"
else
RDEPEND+=" >=dev-python/snakeoil-0.8[${PYTHON_USEDEP}]"
diff --git a/dev-util/boost-build/boost-build-1.70.0.ebuild b/dev-util/boost-build/boost-build-1.70.0.ebuild
index 954e06df945..fd6a1f8d226 100644
--- a/dev-util/boost-build/boost-build-1.70.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.70.0.ebuild
@@ -65,7 +65,7 @@ src_prepare() {
cd "${S}/engine" || die
sed -i \
-e 's|-s\b||' \
- -e "/libpython/s/lib ]/$(get_libdir) ]/" \
+ -e "/libpython/s;lib ];$(get_libdir) ];" \
build.jam || die "sed failed"
# Force regeneration
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index a8609c80203..8781df460c0 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,2 +1,3 @@
DIST bpftrace-0.9.1.tar.gz 704365 BLAKE2B 03c73eac9cc116df916536239124a6a649aa1a390c97848baedaf5b329f5eda8752c9e39053e741a485d623240954f6659099f0c0ab65cc4bbf00fc6e52d0b46 SHA512 e813c598b3acb85d94e1cb02f75b5fa849f10ee1cc39fb73e843a797946d7642463bcc3d083ff377d68b9e2a1aabb56995ab4ebe2be822f4f393448c7f02ca4b
+DIST bpftrace-0.9.2.tar.gz 715019 BLAKE2B 1f20998bd379b91cb46d7e856a5d892e0de7ad6d9f85cb657fcf6a0c879167c0931d28c78e4be98adab349144fe0bc99871cf70556dd1998e5b8f918fa1702e3 SHA512 5c6ee5fec690a907c370ed0bed85906d304215d7f97b99a2cae90453061f522fa6369627c9524a5a24e97c6cbb595a880a2a1b1d71095fffb693a4cef172a6f0
DIST bpftrace-0.9.tar.gz 668655 BLAKE2B 650756ed7334cb92a64adc36a0bd86fff5c16c53fb94d57cc570dd3cd893d467e754da80c98da36c1ec1d14327fa6025b194d963e4a2d1bec99ebb868555b6bc SHA512 771c412a6b1ee7a7d5bba9e0910633056c6f5523e5d1efd9d7ccb5b9f9b462b7bda8d170c5ed0653f3c1bfd5cc77fce2fd552f12eb8222a8747620b3dc9b49f8
diff --git a/dev-util/bpftrace/bpftrace-0.9.2.ebuild b/dev-util/bpftrace/bpftrace-0.9.2.ebuild
new file mode 100644
index 00000000000..5fcb41040f5
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.9.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs linux-info cmake-utils
+
+DESCRIPTION="High-level tracing language for eBPF"
+HOMEPAGE="https://github.com/iovisor/bpftrace"
+
+if [[ ${PV} =~ 9{4,} ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/iovisor/${PN}"
+ BDEPEND=""
+else
+ MY_PV="${PV//_/}"
+ SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+ BDEPEND="app-arch/xz-utils "
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+COMMON_DEPEND="dev-util/systemtap
+ sys-devel/clang:=
+ dev-libs/libbpf:=
+ >=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
+ >=dev-util/bcc-0.10.0:=
+ virtual/libelf"
+DEPEND="${COMMON_DEPEND}
+ test? ( dev-cpp/gtest )"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND+="dev-util/cmake
+ sys-devel/flex
+ sys-devel/bison"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
+
+PATCHES=(
+ "${FILESDIR}/bpftrace-0.10_pre20190614-install-libs.patch"
+ "${FILESDIR}/bpftrace-mandir.patch"
+)
+
+# lots of fixing needed
+RESTRICT="test"
+
+pkg_pretend() {
+ local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~BPF_JIT ~BPF_EVENTS"
+
+ check_extra_config
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local -a mycmakeargs
+ mycmakeargs=(
+ "-DSTATIC_LINKING:BOOL=OFF"
+ "-DBUILD_TESTING:BOOL=OFF"
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index 281108e6967..f2c3fd7b696 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -1,3 +1,3 @@
DIST byacc-20170201.tgz 741550 BLAKE2B d72e2361cbc02d37754d7ca2b0cdabe39bc5b60728e7edf6c0040ca87f991469c918fb0d4c96239d1483ccce0b729698cae9fd6d9988626c1a7ca2d58f47bf1c SHA512 f45e6f5eefe4a4bbcd233fbe06cf25fecec3ecabebea9064db0f52d900ae90783dd180f90d70901f82e2b632ce0432d28a913d312b15225e6256344c176a3638
DIST byacc-20180609.tgz 745317 BLAKE2B d544e2c81540c711fac57ac3179aec9f44b4db808e44318b3046443c29870351b5251383542caec9f65e06a6d83f481f2c8c4e73a28e59d5a57e854532404df4 SHA512 45aa6de839ca23385ab832685fdaa49225dcde6a40bdb990eefde8ab1be2cfe063875072e844629ac91e9533e6e310fa0bb8a6bd01e246a1cefc67bbc3c175f9
-DIST byacc-20190616.tgz 799301 BLAKE2B 40f052820c6e1d6e15fbf870acb417b686f8768d3a528f07248965cc14fd1ea8894f2cf89c9e3e23694aadf14af4f275554d311b154e51250876fc649d766bf2 SHA512 015c4a640a0aea33c5efdfe9fb88a5d8ca7707caa123549ca5179b35d9f00b83d83ce4b7d52a38843c27169b24d956a9a501a4ae80b22df4f9854b886436bc42
+DIST byacc-20190617.tgz 799465 BLAKE2B 2baf34b20da049b3b1d2a569ec6b5470fe4935c9b13062fc58e6c73de6cbb1823736532686d4c9c083771432ce1caccc369c87070b27d59e9cb7c5c5bf1391c9 SHA512 79d04d7aa976e8b4e1bbd69f75ac1f0dbe005b1a7b072ce5ef75c877e8ece043e4adf48645c10ef036ee02de639b56b9befebb34f6e46cac1a59f8f641cc7cc8
diff --git a/dev-util/byacc/byacc-20170201.ebuild b/dev-util/byacc/byacc-20170201.ebuild
index 0ebf724c67b..e15ab9e8588 100644
--- a/dev-util/byacc/byacc-20170201.ebuild
+++ b/dev-util/byacc/byacc-20170201.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
@@ -9,7 +9,7 @@ SRC_URI="ftp://invisible-island.net/byacc/${P}.tgz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
diff --git a/dev-util/byacc/byacc-20190616.ebuild b/dev-util/byacc/byacc-20190617.ebuild
index 52031138194..52031138194 100644
--- a/dev-util/byacc/byacc-20190616.ebuild
+++ b/dev-util/byacc/byacc-20190617.ebuild
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 05f5851fdef..b3742172451 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,6 +1 @@
-DIST catalyst-2.0.18.tar.bz2 861398 BLAKE2B 70986d312410fb7abb5c8d7eacefa0f0150a3642e92e4f7b7e9944cf3653e7e2ba987ffb34a614b261a22ce3bb964488181c019f92bbc9c73567f89be04c0989 SHA512 5a1408ffe06ce5c06a6bca8f0e3ecd91c17cdc36e2dfa37881d843432bdfe987fd2cfd988cd5719bdf378c18c2e79ee59e281c3b4dba4ae9edfc2dd654b8ee4a
-DIST catalyst-3.0.1.tar.bz2 877731 BLAKE2B 0c0b67b4be26737fa6d81011a8a63cfd7f2f41e49a81ecd45f3c901ef70d04e0a72295b12609df036dd9be09241c33dda8fa7a204ad074683b18685d027efe2a SHA512 be7c4d6fcf1f41087995a1a3621fb0250dce6d0a96101255c70832d5cf727a94e924d86092b33464fc5e284173704d33d5aa0d0d49dfcce7369befa5fc8de4e8
-DIST catalyst-3.0.2.tar.bz2 878157 BLAKE2B 3711e89be416cd79e98b25fbc432375257749af96a1de6401749131a40c2f1f70975d0c449e1a116623c1aec4d3302670ac058fffd80c4f546fae0609d0c3b7f SHA512 02092b39c70095ab49db28c3289a5d3eb4f73cb3aeda79b3e707cbe2710761cf0060493da7d8a5098e1453320b65654bbe34dd37d5f07623fa90d52579869070
-DIST catalyst-3.0.3.tar.bz2 878309 BLAKE2B 38cba740718a034c104d272aa24fa6964a8dd7fc77d5ccbb481308bb0a38c01d3f0d64e48c1708cab4a723b5a4e0f23727d1c2a0dd0ae4832810e09f76aa335c SHA512 26024dbea3afbc843563a0bf2cd68cc953818caccdf8a42c45ac1df25bd396064a604787807e2db847b4467e9a19df6b2f746eb178d99cbe79889070a2fc4b8a
-DIST catalyst-3.0.4.tar.bz2 873281 BLAKE2B 8177cee09402ccd02343766facbac3011b45165211a207e8e2c07d53a40091202c84e8294a58ed02a193cab3b3d704fafb50322719257a62092fe39b895d7771 SHA512 5fc5ee9faba6874d1b57fed47a9f92fab9adc03544938d1b1f1d6d867215a36f1efd391849b21300034d27be3207bcc28b4792b8c9c4caec72040d4d30741c2a
DIST catalyst-3.0.5.tar.bz2 873286 BLAKE2B c4cafccb0dcee19d6b0dd30e57c99da81b3485342b6d5405cdbe2e2b59a4631f3223e7d13c5041783a7172361b4a1b69ee5ff68e29ee8bec2f76165acdc5686c SHA512 35cc16391100394f97af4cdfd14f9de2ab4532c97c213f43dd0be927766dc3892768be5aa899fc8919414743c9ea63b4489a2690437b3e7985951eb68c19d0a4
diff --git a/dev-util/catalyst/catalyst-2.0.18-r1.ebuild b/dev-util/catalyst/catalyst-2.0.18-r1.ebuild
deleted file mode 100644
index 9562f69636d..00000000000
--- a/dev-util/catalyst/catalyst-2.0.18-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == *9999* ]]; then
- SRC_ECLASS="git-2"
- EGIT_REPO_URI="anongit.gentoo.org/proj/catalyst.git"
- EGIT_MASTER="master"
- S="${WORKDIR}/${PN}"
-else
- SRC_URI="mirror://gentoo/${P}.tar.bz2
- https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
- https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2
- https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2
- https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2"
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils multilib python-single-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 kernel_linux"
-
-DEPEND="
- app-text/asciidoc
- ${PYTHON_DEPS}
-"
-RDEPEND="
- app-arch/lbzip2
- app-crypt/shash
- app-arch/tar[xattr]
- sys-fs/dosfstools
- virtual/cdrtools
- amd64? ( >=sys-boot/syslinux-3.72 )
- x86? ( >=sys-boot/syslinux-3.72 )
- ccache? ( dev-util/ccache )
- kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
- ${PYTHON_DEPS}
-"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-PATCHES=( "${FILESDIR}/catalyst-2.0.18-Do-notuntarwith--acls.patch" )
-
-pkg_setup() {
- if use ccache ; then
- einfo "Enabling ccache support for catalyst."
- else
- ewarn "By default, ccache support for catalyst is disabled."
- ewarn "If this is not what you intended,"
- ewarn "then you should add ccache to your USE."
- fi
-
- echo
- einfo "The template spec files are now installed by default. You can find"
- einfo "them under /usr/share/doc/${PF}/examples"
- einfo "and they are considered to be the authorative source of information"
- einfo "on catalyst."
- echo
-
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- epatch "${PATCHES[@]}"
-}
-
-src_install() {
- insinto /usr/$(get_libdir)/${PN}
- exeinto /usr/$(get_libdir)/${PN}
- doexe catalyst || die "copying catalyst"
-
- if [[ ${PV} == 3.9999* ]]; then
- doins -r modules files || die "copying files"
- else
- doins -r arch modules livecd || die "copying files"
- fi
-
- for x in targets/*; do
- exeinto /usr/$(get_libdir)/${PN}/$x
- doexe $x/* || die "copying ${x}"
- done
-
- # Here is where we actually enable ccache
- use ccache && \
- sed -i -e 's:options="autoresume kern:options="autoresume ccache kern:' \
- files/catalyst.conf
-
- sed -i -e "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
- files/catalyst.conf
-
- make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst
- insinto /etc/catalyst
- doins files/catalyst.conf files/catalystrc || die "copying configuration"
- insinto /usr/share/doc/${PF}/examples
- doins examples/* || die
- dodoc README AUTHORS
- doman files/catalyst.1 files/catalyst-spec.5
-
- python_fix_shebang "${ED}usr/$(get_libdir)/catalyst/catalyst"
- python_optimize "${ED}"
-}
-
-pkg_postinst() {
- einfo "You can find more information about catalyst by checking out the"
- einfo "catalyst project page at:"
- einfo "https://wiki.gentoo.org/wiki/Catalyst"
-}
diff --git a/dev-util/catalyst/catalyst-2.0.18-r4.ebuild b/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
deleted file mode 100644
index 98e502b926c..00000000000
--- a/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == *9999* ]]; then
- SRC_ECLASS="git-2"
- EGIT_REPO_URI="anongit.gentoo.org/proj/catalyst.git"
- EGIT_MASTER="master"
- S="${WORKDIR}/${PN}"
-else
- SRC_URI="mirror://gentoo/${P}.tar.bz2
- https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
- https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2
- https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2
- https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils multilib python-single-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 kernel_linux"
-
-DEPEND="
- app-text/asciidoc
- ${PYTHON_DEPS}
-"
-RDEPEND="
- app-arch/lbzip2
- app-crypt/shash
- app-arch/tar[xattr]
- sys-fs/dosfstools
- virtual/cdrtools
- amd64? ( >=sys-boot/syslinux-3.72 )
- x86? ( >=sys-boot/syslinux-3.72 )
- ccache? ( dev-util/ccache )
- kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
- ${PYTHON_DEPS}
-"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-PATCHES=(
- "${FILESDIR}/catalyst-2.0.18-Do-notuntarwith--acls.patch"
- "${FILESDIR}/catalyst-2.0.18-fix-quotes.patch"
- "${FILESDIR}/catalyst-2.0.18-remove-machine-id.patch"
- "${FILESDIR}/catalyst-2.0.18-stage1-export-ROOT.patch"
-)
-
-pkg_setup() {
- if use ccache ; then
- einfo "Enabling ccache support for catalyst."
- else
- ewarn "By default, ccache support for catalyst is disabled."
- ewarn "If this is not what you intended,"
- ewarn "then you should add ccache to your USE."
- fi
-
- echo
- einfo "The template spec files are now installed by default. You can find"
- einfo "them under /usr/share/doc/${PF}/examples"
- einfo "and they are considered to be the authorative source of information"
- einfo "on catalyst."
- echo
-
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- epatch "${PATCHES[@]}"
-}
-
-src_install() {
- insinto /usr/$(get_libdir)/${PN}
- exeinto /usr/$(get_libdir)/${PN}
- doexe catalyst || die "copying catalyst"
-
- if [[ ${PV} == 3.9999* ]]; then
- doins -r modules files || die "copying files"
- else
- doins -r arch modules livecd || die "copying files"
- fi
-
- for x in targets/*; do
- exeinto /usr/$(get_libdir)/${PN}/$x
- doexe $x/* || die "copying ${x}"
- done
-
- # Here is where we actually enable ccache
- use ccache && \
- sed -i -e 's:options="autoresume kern:options="autoresume ccache kern:' \
- files/catalyst.conf
-
- sed -i -e "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
- files/catalyst.conf
-
- make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst
- insinto /etc/catalyst
- doins files/catalyst.conf files/catalystrc || die "copying configuration"
- insinto /usr/share/doc/${PF}/examples
- doins examples/* || die
- dodoc README AUTHORS
- doman files/catalyst.1 files/catalyst-spec.5
-
- python_fix_shebang "${ED}usr/$(get_libdir)/catalyst/catalyst"
- python_optimize "${ED}"
-}
-
-pkg_postinst() {
- einfo "You can find more information about catalyst by checking out the"
- einfo "catalyst project page at:"
- einfo "https://wiki.gentoo.org/wiki/Catalyst"
-}
diff --git a/dev-util/catalyst/catalyst-3.0.1.ebuild b/dev-util/catalyst/catalyst-3.0.1.ebuild
deleted file mode 100644
index 7792b7e20a3..00000000000
--- a/dev-util/catalyst/catalyst-3.0.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == *9999* ]]; then
- SRC_ECLASS="git-2"
- EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git"
- EGIT_BRANCH="master"
- S="${WORKDIR}/${PN}"
-else
- SRC_URI="mirror://gentoo/${P}.tar.bz2
- https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2
- https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
- https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-fi
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1 multilib ${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 kernel_linux"
-
-DEPEND="
- app-text/asciidoc
- >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-"
-RDEPEND="
- >=dev-python/pydecomp-0.2[${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] )
- virtual/cdrtools
- amd64? ( >=sys-boot/syslinux-3.72 )
- x86? ( >=sys-boot/syslinux-3.72 )
- ccache? ( dev-util/ccache )
- kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
-"
-
-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-3.0.2-r1.ebuild b/dev-util/catalyst/catalyst-3.0.2-r1.ebuild
deleted file mode 100644
index 7aab281c337..00000000000
--- a/dev-util/catalyst/catalyst-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 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="mirror://gentoo/${P}.tar.bz2
- https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2
- https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
- https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
-fi
-
-PYTHON_COMPAT=( python{3_5,3_6} )
-
-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 kernel_linux system-bootloader"
-
-DEPEND="
- app-text/asciidoc
- >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-"
-RDEPEND="
- app-arch/lbzip2
- app-crypt/shash
- >=dev-python/pydecomp-0.2[${PYTHON_USEDEP}]
- >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
- sys-fs/dosfstools
- !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
- kernel_FreeBSD? ( app-arch/libarchive[xattr] )
- virtual/cdrtools
- amd64? ( >=sys-boot/syslinux-3.72 )
- x86? ( >=sys-boot/syslinux-3.72 )
- ccache? ( dev-util/ccache )
- 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-3.0.2.ebuild b/dev-util/catalyst/catalyst-3.0.2.ebuild
deleted file mode 100644
index 12d4b9dbf83..00000000000
--- a/dev-util/catalyst/catalyst-3.0.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 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="mirror://gentoo/${P}.tar.bz2
- https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2
- https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
- https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
-fi
-
-PYTHON_COMPAT=( python{3_5,3_6} )
-
-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 kernel_linux system-bootloader"
-
-DEPEND="
- app-text/asciidoc
- >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-"
-RDEPEND="
- >=dev-python/pydecomp-0.2[${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] )
- virtual/cdrtools
- amd64? ( >=sys-boot/syslinux-3.72 )
- x86? ( >=sys-boot/syslinux-3.72 )
- ccache? ( dev-util/ccache )
- 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-3.0.3.ebuild b/dev-util/catalyst/catalyst-3.0.3.ebuild
deleted file mode 100644
index 7aab281c337..00000000000
--- a/dev-util/catalyst/catalyst-3.0.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 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="mirror://gentoo/${P}.tar.bz2
- https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2
- https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
- https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
-fi
-
-PYTHON_COMPAT=( python{3_5,3_6} )
-
-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 kernel_linux system-bootloader"
-
-DEPEND="
- app-text/asciidoc
- >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-"
-RDEPEND="
- app-arch/lbzip2
- app-crypt/shash
- >=dev-python/pydecomp-0.2[${PYTHON_USEDEP}]
- >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
- sys-fs/dosfstools
- !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
- kernel_FreeBSD? ( app-arch/libarchive[xattr] )
- virtual/cdrtools
- amd64? ( >=sys-boot/syslinux-3.72 )
- x86? ( >=sys-boot/syslinux-3.72 )
- ccache? ( dev-util/ccache )
- 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-3.0.4.ebuild b/dev-util/catalyst/catalyst-3.0.4.ebuild
deleted file mode 100644
index 8126cc04819..00000000000
--- a/dev-util/catalyst/catalyst-3.0.4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 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 ~sh ~sparc ~x86 ~x86-fbsd"
-fi
-
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
-
-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? ( virtual/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-3.0.5.ebuild b/dev-util/catalyst/catalyst-3.0.5.ebuild
index 8126cc04819..0ca5875c8c6 100644
--- a/dev-util/catalyst/catalyst-3.0.5.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.5.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 ~sh ~sparc ~x86 ~x86-fbsd"
+ KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x86-fbsd"
fi
PYTHON_COMPAT=( python{3_5,3_6,3_7} )
diff --git a/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch b/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch
deleted file mode 100644
index f4cbcfbb7d3..00000000000
--- a/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 45286727a63d16d0688a88bf7cf68289efd26861 Mon Sep 17 00:00:00 2001
-From: "Anthony G. Basile" <blueness@gentoo.org>
-Date: Sun, 18 Jan 2015 22:21:16 -0500
-Subject: [PATCH] Do not untar with --acls, fixes bug #536762
-To: gentoo-catalyst@lists.gentoo.org
-
----
- modules/catalyst_support.py | 6 +++---
- modules/generic_stage_target.py | 18 +++++++++---------
- 2 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py
-index 0e9faac..702887d 100644
---- a/modules/catalyst_support.py
-+++ b/modules/catalyst_support.py
-@@ -108,9 +108,9 @@ contents_map={
- # 'find' is disabled because it requires the source path, which is not
- # always available
- #"find" :[calc_contents,"find %(path)s"],
-- "tar-tv":[calc_contents,"tar --xattrs --acls tvf %(file)s"],
-- "tar-tvz":[calc_contents,"tar --xattrs --acls tvzf %(file)s"],
-- "tar-tvj":[calc_contents,"tar --xattrs --acls -I lbzip2 -tvf %(file)s"],
-+ "tar-tv":[calc_contents,"tar --xattrs tvf %(file)s"],
-+ "tar-tvz":[calc_contents,"tar --xattrs tvzf %(file)s"],
-+ "tar-tvj":[calc_contents,"tar --xattrs -I lbzip2 -tvf %(file)s"],
- "isoinfo-l":[calc_contents,"isoinfo -l -i %(file)s"],
- # isoinfo-f should be a last resort only
- "isoinfo-f":[calc_contents,"isoinfo -f -i %(file)s"],
-diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
-index c7db027..cc24c63 100644
---- a/modules/generic_stage_target.py
-+++ b/modules/generic_stage_target.py
-@@ -660,10 +660,10 @@ class generic_stage_target(generic_target):
- self.settings["chroot_path"]+\
- " (This may take some time) ...\n"
- if "bz2" == self.settings["chroot_path"][-3:]:
-- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
-+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
- self.settings["chroot_path"]
- else:
-- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
-+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
- self.settings["chroot_path"]
- error_msg="Tarball extraction of "+\
- self.settings["source_path"]+" to "+\
-@@ -675,10 +675,10 @@ class generic_stage_target(generic_target):
- self.settings["chroot_path"]+\
- " (This may take some time) ...\n"
- if "bz2" == self.settings["chroot_path"][-3:]:
-- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
-+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
- self.settings["chroot_path"]
- else:
-- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
-+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
- self.settings["chroot_path"]
- error_msg="Tarball extraction of "+self.settings["source_path"]+\
- " to "+self.settings["chroot_path"]+" failed."
-@@ -777,9 +777,9 @@ class generic_stage_target(generic_target):
- "catalyst-hash")
- destdir=self.settings["snapshot_cache_path"]
- if "bz2" == self.settings["chroot_path"][-3:]:
-- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir
-+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir
- else:
-- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -xpf "+self.settings["snapshot_path"]+" -C "+destdir
-+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -xpf "+self.settings["snapshot_path"]+" -C "+destdir
- unpack_errmsg="Error unpacking snapshot"
- cleanup_msg="Cleaning up invalid snapshot cache at \n\t"+\
- self.settings["snapshot_cache_path"]+\
-@@ -796,10 +796,10 @@ class generic_stage_target(generic_target):
- cleanup_msg=\
- "Cleaning up existing portage tree (This can take a long time)..."
- if "bz2" == self.settings["chroot_path"][-3:]:
-- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\
-+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\
- self.settings["chroot_path"]+"/usr"
- else:
-- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -xpf "+self.settings["snapshot_path"]+" -C "+\
-+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -xpf "+self.settings["snapshot_path"]+" -C "+\
- self.settings["chroot_path"]+"/usr"
- unpack_errmsg="Error unpacking snapshot"
-
-@@ -1224,7 +1224,7 @@ class generic_stage_target(generic_target):
-
- print "Creating stage tarball..."
-
-- cmd("tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\
-+ cmd("tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\
- self.settings["stage_path"]+" .",\
- "Couldn't create stage tarball",env=self.env)
-
---
-2.2.2
-
diff --git a/dev-util/catalyst/files/catalyst-2.0.18-fix-quotes.patch b/dev-util/catalyst/files/catalyst-2.0.18-fix-quotes.patch
deleted file mode 100644
index ccaffbe6b03..00000000000
--- a/dev-util/catalyst/files/catalyst-2.0.18-fix-quotes.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 1eabce3a9c15c5caf022e71c1959e8c8f4819fad Mon Sep 17 00:00:00 2001
-From: "Anthony G. Basile" <blueness@gentoo.org>
-Date: Thu, 3 Mar 2016 20:48:43 -0500
-Subject: [PATCH] targets/support/chroot-functions.sh: correct quotes to allow
- expansion of $1
-
-This is a backport of commit b2473eff. The single quotes prevented the proper
-expansion of $1 in setup_pkgmgr(). Since this is usually called as
-`setup_pkgmgr "build"` during stage1 builds, it is surprising this was
-not caught earlier.
----
- targets/support/chroot-functions.sh | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
-index 3b7f77b..6c1a31c 100755
---- a/targets/support/chroot-functions.sh
-+++ b/targets/support/chroot-functions.sh
-@@ -172,12 +172,12 @@ setup_pkgmgr(){
- # Use --update or portage might just waste time/cycles and reinstall the same version.
- # Use --newuse to make sure it rebuilds with any changed use flags.
- if [ -n "$1" ];then
-- echo "Adding USE='${USE} $1' to make.conf for portage build"
-- [ -e /etc/portage/make.conf ] && echo 'USE="${USE} $1"' >> /etc/portage/make.conf
-+ echo "Adding USE=\"${USE} $1\" to make.conf for portage build"
-+ [ -e /etc/portage/make.conf ] && echo "USE=\"\${USE} $1\"" >> /etc/portage/make.conf
- run_merge --oneshot --update --newuse sys-apps/portage
-- sed -i '/USE="${USE} $1"/d' /etc/portage/make.conf
-+ sed -i "/USE=\"\${USE} $1\"/d" /etc/portage/make.conf
- else
-- echo "Updating portage with USE='${USE}'"
-+ echo "Updating portage with USE=\"${USE}\""
- run_merge --oneshot --update --newuse sys-apps/portage
- fi
- }
---
-2.4.10
-
diff --git a/dev-util/catalyst/files/catalyst-2.0.18-remove-machine-id.patch b/dev-util/catalyst/files/catalyst-2.0.18-remove-machine-id.patch
deleted file mode 100644
index 1c641fd2b90..00000000000
--- a/dev-util/catalyst/files/catalyst-2.0.18-remove-machine-id.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From fbf94254a714c8d72840faee42cf348eb69b1a43 Mon Sep 17 00:00:00 2001
-From: "Anthony G. Basile" <blueness@gentoo.org>
-Date: Fri, 8 Apr 2016 17:58:15 -0400
-Subject: [PATCH] targets/support/chroot-functions.sh: remove machine-id for
- systemd stages
-
----
- targets/support/chroot-functions.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
-index 6c1a31c..67874a0 100755
---- a/targets/support/chroot-functions.sh
-+++ b/targets/support/chroot-functions.sh
-@@ -223,6 +223,7 @@ cleanup_stages() {
- stage1|stage2|stage3|system)
- rm -f /var/lib/portage/world
- touch /var/lib/portage/world
-+ rm -f /etc/machine-id
- ;;
- *)
- echo "Skipping removal of world file for ${clst_target}"
---
-2.7.3
-
diff --git a/dev-util/catalyst/files/catalyst-2.0.18-stage1-export-ROOT.patch b/dev-util/catalyst/files/catalyst-2.0.18-stage1-export-ROOT.patch
deleted file mode 100644
index 67fc2c631b0..00000000000
--- a/dev-util/catalyst/files/catalyst-2.0.18-stage1-export-ROOT.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 5fd2d5edd3c4c1e99687beb9acc130bab162866b Mon Sep 17 00:00:00 2001
-From: "Anthony G. Basile" <blueness@gentoo.org>
-Date: Sat, 4 Jun 2016 12:43:44 -0400
-Subject: stage1-preclean-chroot.sh: export ROOT=/tmp/stage1root for
- setup_gcc()
-
-setup_gcc() calls gcc-config to select a particular gcc profile. At stage1 this
-needs to be done in the /tmp/stage1root chroot. gcc-config looks for ROOT to
-choose the root directory in which to make the selection. If we don't export
-ROOT, then setup_gcc is ineffective.
-
-X-Gentoo-Bug: 584234
-X-Gentoo-Bug-Url: https://bugs.gentoo.org/show_bug.cgi?id=584234
-
-Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
----
- targets/stage1/stage1-preclean-chroot.sh | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh
-index a80fc92..dc67521 100755
---- a/targets/stage1/stage1-preclean-chroot.sh
-+++ b/targets/stage1/stage1-preclean-chroot.sh
-@@ -1,5 +1,6 @@
- #!/bin/bash
-
-+export ROOT=/tmp/stage1root
- export RUN_DEFAULT_FUNCS="no"
-
- source /tmp/chroot-functions.sh
-@@ -8,8 +9,6 @@ update_env_settings
- show_debug
-
- # Now, some finishing touches to initialize gcc-config....
--unset ROOT
--
- setup_gcc
- setup_binutils
-
---
-cgit v0.12
-
diff --git a/dev-util/catfish/Manifest b/dev-util/catfish/Manifest
index e9b2ee46509..eeb6e43f8a1 100644
--- a/dev-util/catfish/Manifest
+++ b/dev-util/catfish/Manifest
@@ -1 +1,3 @@
DIST catfish-1.4.7.tar.bz2 162289 BLAKE2B 2f24485f0f059a177a8544632ab583acad1149f96921f8b10027e5788adb2eaf4da0911f3363174feef570c8f75615ec1f943a2d5d2e8622efd4be9892a0fcd2 SHA512 cafa8eaaa40522f50111b3bb9c09a116ebad827532b0cfc88bc643fb2e2d89edee53057fbbed23719f4091ca384d7ea025633e571e160d7dfced008f788a3ffd
+DIST catfish-1.4.8.tar.bz2 181027 BLAKE2B c03270832cb2e6bdc39528801d257d37c52f0c6f361c9225002c31a258a18a1c98cf7af640ca15a4f6e32ac4ac802bda84327123a7bf13d47a1410e67988bfab SHA512 46c9e9112116e0f8ee7957c5a71d16ecdde8c16a60a030f3339933a6f9e73d61d360fed52d5904b0fff21448050cc17df5af63f6254476404760fe9166dfad00
+DIST catfish-1.4.9.tar.bz2 182247 BLAKE2B 343a9a83bed73a5f0416fa2ec61869dd3fdb13b8bc45a46dba7d4901c36d97b17e9f32f616baae8cceece566f4e529d34e55f81cb071504b750f4edda048185b SHA512 c62596a09ed481eac5a4544dcfcc71c02177c115b6bf050b1f2421a575ef589c0c1569ef26d6864e472f2331f0561c7f1146c58bc7873af8036d6e7350465c3d
diff --git a/dev-util/catfish/catfish-1.4.8-r1.ebuild b/dev-util/catfish/catfish-1.4.8-r1.ebuild
new file mode 100644
index 00000000000..31a5b419e96
--- /dev/null
+++ b/dev-util/catfish/catfish-1.4.8-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+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"
+
+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
+"
+DEPEND="
+ dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+ sys-devel/gettext
+"
+
+python_install() {
+ distutils-r1_python_install
+ 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.8.ebuild b/dev-util/catfish/catfish-1.4.8.ebuild
new file mode 100644
index 00000000000..a6d1ef38c04
--- /dev/null
+++ b/dev-util/catfish/catfish-1.4.8.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit distutils-r1 gnome2-utils 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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+ dev-python/pexpect[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ x11-libs/gtk+:3[introspection]
+ virtual/freedesktop-icon-theme
+"
+DEPEND="
+ dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+ sys-devel/gettext
+"
+
+python_install() {
+ distutils-r1_python_install
+ rm -r "${ED%/}"/usr/share/doc/catfish || die
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+}
diff --git a/dev-util/catfish/catfish-1.4.9.ebuild b/dev-util/catfish/catfish-1.4.9.ebuild
new file mode 100644
index 00000000000..8833b3e2974
--- /dev/null
+++ b/dev-util/catfish/catfish-1.4.9.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+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
+"
+DEPEND="
+ dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+ sys-devel/gettext
+"
+
+python_install() {
+ distutils-r1_python_install
+ 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/cbindgen/cbindgen-0.9.0.ebuild b/dev-util/cbindgen/cbindgen-0.9.0.ebuild
index c2758e55253..56405284ac6 100644
--- a/dev-util/cbindgen/cbindgen-0.9.0.ebuild
+++ b/dev-util/cbindgen/cbindgen-0.9.0.ebuild
@@ -58,6 +58,6 @@ HOMEPAGE="https://github.com/eqrion/cbindgen/"
SRC_URI="$(cargo_crate_uris ${CRATES})"
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
BDEPEND=">=virtual/cargo-1.30.0"
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index ebf3be2e50c..61983edf083 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,7 +1,3 @@
-DIST ccache-3.2.4.tar.xz 302548 BLAKE2B 7d642dc3f944183660e79cfdfd68948528aa3ea4ef8162a4d04837c85ccace35107e663ec81a15438dab133fca2e8bf100fecd483f33c9b0aa52c68989ae8122 SHA512 d048b70804c81dece97f3ba511b3c109ec0d14e7dca69bc68faeeb61a4a7b5639c03e3e5ad7dad4e42b4bd198d7a7fffa4e3b7ef99590dfd4df0805db6c25db7
-DIST ccache-3.3.4.tar.xz 314468 BLAKE2B 6e465598df428979a2c821a698afef25c05d09045cbb54ec54cc3b65b8ce6416b6eb46fae0cf5d60f766129cef11eb01410b522318c67416fdf47f6e8fceae66 SHA512 891bcf11b27fa20a250bc86d182663e46af450a3a807b6cab502f202cd57123ce93bcb1fe5e48866feecda76912a5f742efa5869df9117d81624ba185dd4e02c
-DIST ccache-3.5.1a.tar.xz 335888 BLAKE2B 66c044b39dd42c91327e02528a4d6c917ac012c2d08190f7dbc2029ed6d1525aa3a6262fb7528f1721cec510306baa59b498a5afbcf955bb6aaf13594c00d178 SHA512 8a2e9eb06ba21fcf92084afd94fc221168693de545e0448f4da2098bef2bcbfdb017117c325b0bab4931b9e346dd8c1a9d1ebaed0cdc36496d9452985cdd1b43
-DIST ccache-3.5.tar.xz 334668 BLAKE2B e3e2b63e8c4c8074514fb3a5794325fa05a4d52f48fc436ab0ad21b643ca4d1a1502c989cb47ed68972b105d4f1642e4fadc5ecef1235fe2bd3be5d218094a79 SHA512 92181fb794f06dc231baa4193c37e8f1d844c9281fd64bcb8f4b35c87b4a88dfc9bf36b810b37151ee85699778fcd3783818949a7010e619aeca7e3b33b7a2e3
-DIST ccache-3.6.tar.xz 340608 BLAKE2B fa92180f53612f84b71c68da4acccefee129e5bfc9b269caa45a9c16219ed835ccf034d61ff938a54f3673fa23410d960475cc37cf5d27d7be641e7518a43f0a SHA512 13ce4c9084983ce77617cf005235987715cd6b630dac13a17cb9badce24aab71bff505e63da4206878e32d337cc674f05fbf78540711ec5b33a0b8384c47fa0d
DIST ccache-3.7.1.tar.xz 349276 BLAKE2B 4f36ccb378b614668777d8be32dd343a0e59e36885a845ba004082f7ca0f69a5e4d01ed08af445c33bff218d33ad0385ed6ade383c06da20e3d0271b2f7423dd SHA512 c2f369c861998f82600272deedc436840af7f85baa355a1e119dacea8f41275d601a0805c3e2a8bc434df621a4e52647bd8654a71c2329542a8b160f7f179cdf
-DIST ccache-3.7.tar.xz 348764 BLAKE2B a80ac0d5d94ff5d1aaee45a186037a9c8346c5e44d00afd29a4ba40b4fca877cd30b82357f344bed77f5caeb333bacfde8aff46d8fb866b484a3a1d3e5f513f5 SHA512 b8a5944072fcf8280b63ddbd6e2fcbc04d4ee99c0b2d3bfb9b47f61e760ce1dc5e191cf3f6437431b6d08af6cfb2162d6a2021ad49fd6746e531eb03cc26fd2e
+DIST ccache-3.7.2.tar.xz 351168 BLAKE2B 6e5c8847f961bd5aa2cf325e582ece9e8bfb9c015fe3dcb01c8ca1e1834fdfb82a351ec49e203721486817df58c6aebf28e0af011f470fb739d5016f72191654 SHA512 3290f0609c27a2f063e632392be01ef163273115700f87a6d2954fcfd52fcc14bf66fc147ecbd2b692258317e113bf8be9f7efdf377560e2e8d9dd67cef58147
+DIST ccache-3.7.3.tar.xz 351416 BLAKE2B f825eea87e89246edecbbc0b02cd0f67bbb0e9eb082a4f0c3d9aadca14a20e2d8e9af5f2c067d78393ea92c11878a11423402160210f3f79a3135d345225e0ad SHA512 74e6dd9558273af74aaf085d932955e8ded3d9f7d7b316172109af8f703f00a75fcc27187469d9cb5ba8654bcad12e406bede77cfcacbc0a752d5ca42e52c628
diff --git a/dev-util/ccache/ccache-3.2.4.ebuild b/dev-util/ccache/ccache-3.2.4.ebuild
deleted file mode 100644
index 41c25b6006e..00000000000
--- a/dev-util/ccache/ccache-3.2.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils readme.gentoo
-
-DESCRIPTION="fast compiler cache"
-HOMEPAGE="https://ccache.samba.org/"
-SRC_URI="https://www.samba.org/ftp/ccache/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="app-arch/xz-utils
- sys-libs/zlib"
-RDEPEND="${DEPEND}
- sys-apps/gentoo-functions"
-
-src_prepare() {
- # make sure we always use system zlib
- rm -rf zlib || die
- epatch "${FILESDIR}"/${PN}-3.1.10-size-on-disk.patch #456178
- sed \
- -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
- "${FILESDIR}"/ccache-config-3 > ccache-config || die
-}
-
-src_install() {
- DOCS=( AUTHORS.txt MANUAL.txt NEWS.txt README.txt )
- default
-
- dobin ccache-config
-
- DOC_CONTENTS="
-To use ccache with **non-Portage** C compiling, add
-${EPREFIX}/usr/lib/ccache/bin to the beginning of your path, before ${EPREFIX}usr/bin.
-Portage 2.0.46-r11+ will automatically take advantage of ccache with
-no additional steps. If this is your first install of ccache, type
-something like this to set a maximum cache size of 2GB:\\n
-# ccache -M 2G\\n
-If you are upgrading from an older version than 3.x you should clear all of your caches like so:\\n
-# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C\\n
-ccache now supports sys-devel/clang and dev-lang/icc, too!"
-
- readme.gentoo_create_doc
-}
-
-pkg_prerm() {
- if [[ -z ${REPLACED_BY_VERSION} ]] ; then
- "${EROOT}"/usr/bin/ccache-config --remove-links
- "${EROOT}"/usr/bin/ccache-config --remove-links ${CHOST}
- fi
-}
-
-pkg_postinst() {
- "${EROOT}"/usr/bin/ccache-config --install-links
- "${EROOT}"/usr/bin/ccache-config --install-links ${CHOST}
-
- # nuke broken symlinks from previous versions that shouldn't exist
- rm -f "${EROOT}"/usr/lib/ccache/bin/${CHOST}-cc || die
- rm -rf "${EROOT}"/usr/lib/ccache.backup || die
-
- readme.gentoo_print_elog
-}
diff --git a/dev-util/ccache/ccache-3.3.4-r1.ebuild b/dev-util/ccache/ccache-3.3.4-r1.ebuild
deleted file mode 100644
index f031f691f2a..00000000000
--- a/dev-util/ccache/ccache-3.3.4-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit readme.gentoo-r1
-
-DESCRIPTION="fast compiler cache"
-HOMEPAGE="https://ccache.samba.org/"
-SRC_URI="https://www.samba.org/ftp/ccache/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd"
-IUSE=""
-
-DEPEND="app-arch/xz-utils
- sys-libs/zlib"
-RDEPEND="${DEPEND}
- dev-util/shadowman
- sys-apps/gentoo-functions"
-
-src_prepare() {
- # make sure we always use system zlib
- rm -rf zlib || die
- eapply "${FILESDIR}"/${PN}-3.3-size-on-disk.patch #456178
- eapply_user
- sed \
- -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
- "${FILESDIR}"/ccache-config-3 > ccache-config || die
-}
-
-src_install() {
- DOCS=( AUTHORS.txt MANUAL.txt NEWS.txt README.md )
- default
-
- dobin ccache-config
- insinto /usr/share/shadowman/tools
- newins - ccache <<<'/usr/lib/ccache/bin'
-
- DOC_CONTENTS="
-To use ccache with **non-Portage** C compiling, add
-${EPREFIX}/usr/lib/ccache/bin to the beginning of your path, before ${EPREFIX}/usr/bin.
-Portage 2.0.46-r11+ will automatically take advantage of ccache with
-no additional steps. If this is your first install of ccache, type
-something like this to set a maximum cache size of 2GB:\\n
-# ccache -M 2G\\n
-If you are upgrading from an older version than 3.x you should clear all of your caches like so:\\n
-# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C\\n
-ccache now supports sys-devel/clang and dev-lang/icc, too!"
-
- readme.gentoo_create_doc
-}
-
-pkg_prerm() {
- if [[ -z ${REPLACED_BY_VERSION} && ${ROOT} == / ]] ; then
- eselect compiler-shadow remove ccache
- fi
-}
-
-pkg_postinst() {
- if [[ ${ROOT} == / ]]; then
- eselect compiler-shadow update ccache
- fi
-
- # nuke broken symlinks from previous versions that shouldn't exist
- rm -rf "${EROOT}"/usr/lib/ccache.backup || die
-
- readme.gentoo_print_elog
-}
diff --git a/dev-util/ccache/ccache-3.5-r1.ebuild b/dev-util/ccache/ccache-3.5-r1.ebuild
deleted file mode 100644
index d1a32f96e90..00000000000
--- a/dev-util/ccache/ccache-3.5-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1
-
-DESCRIPTION="fast compiler cache"
-HOMEPAGE="https://ccache.samba.org/"
-SRC_URI="https://www.samba.org/ftp/ccache/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-IUSE=""
-
-DEPEND="app-arch/xz-utils
- sys-libs/zlib"
-RDEPEND="${DEPEND}
- dev-util/shadowman
- sys-apps/gentoo-functions"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.4-size-on-disk.patch #456178
- "${FILESDIR}"/${PN}-3.5-nvcc-test.patch
-)
-
-src_prepare() {
- default
-
- # make sure we always use system zlib
- rm -rf src/zlib || die
- sed \
- -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
- "${FILESDIR}"/ccache-config-3 > ccache-config || die
-}
-
-src_compile() {
- emake V=1
-}
-
-src_test() {
- emake check V=1
-}
-
-src_install() {
- DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
- default
-
- dobin ccache-config
- insinto /usr/share/shadowman/tools
- newins - ccache <<<'/usr/lib/ccache/bin'
-
- DOC_CONTENTS="
-To use ccache with **non-Portage** C compiling, add
-${EPREFIX}/usr/lib/ccache/bin to the beginning of your path, before ${EPREFIX}/usr/bin.
-Portage 2.0.46-r11+ will automatically take advantage of ccache with
-no additional steps. If this is your first install of ccache, type
-something like this to set a maximum cache size of 2GB:\\n
-# ccache -M 2G\\n
-If you are upgrading from an older version than 3.x you should clear all of your caches like so:\\n
-# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C\\n
-ccache now supports sys-devel/clang and dev-lang/icc, too!"
-
- readme.gentoo_create_doc
-}
-
-pkg_prerm() {
- if [[ -z ${REPLACED_BY_VERSION} && ${ROOT:-/} == / ]] ; then
- eselect compiler-shadow remove ccache
- fi
-}
-
-pkg_postinst() {
- if [[ ${ROOT:-/} == / ]]; then
- eselect compiler-shadow update ccache
- fi
-
- # nuke broken symlinks from previous versions that shouldn't exist
- rm -rf "${EROOT}"/usr/lib/ccache.backup || die
-
- readme.gentoo_print_elog
-}
diff --git a/dev-util/ccache/ccache-3.5.1a.ebuild b/dev-util/ccache/ccache-3.5.1a.ebuild
deleted file mode 100644
index 7491315da2e..00000000000
--- a/dev-util/ccache/ccache-3.5.1a.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1
-
-DESCRIPTION="fast compiler cache"
-HOMEPAGE="https://ccache.samba.org/"
-SRC_URI="https://www.samba.org/ftp/ccache/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-IUSE=""
-
-DEPEND="app-arch/xz-utils
- sys-libs/zlib"
-RDEPEND="${DEPEND}
- dev-util/shadowman
- sys-apps/gentoo-functions"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.4-size-on-disk.patch #456178
- "${FILESDIR}"/${PN}-3.5-nvcc-test.patch
-)
-
-S=${WORKDIR}/${P%a} # 3.5.1a->3.5.1, bug #674516
-
-src_prepare() {
- default
-
- # make sure we always use system zlib
- rm -rf src/zlib || die
- sed \
- -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
- "${FILESDIR}"/ccache-config-3 > ccache-config || die
-}
-
-src_compile() {
- emake V=1
-}
-
-src_test() {
- emake check V=1
-}
-
-src_install() {
- DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
- default
-
- dobin ccache-config
- insinto /usr/share/shadowman/tools
- newins - ccache <<<'/usr/lib/ccache/bin'
-
- DOC_CONTENTS="
-To use ccache with **non-Portage** C compiling, add
-${EPREFIX}/usr/lib/ccache/bin to the beginning of your path, before ${EPREFIX}/usr/bin.
-Portage 2.0.46-r11+ will automatically take advantage of ccache with
-no additional steps. If this is your first install of ccache, type
-something like this to set a maximum cache size of 2GB:\\n
-# ccache -M 2G\\n
-If you are upgrading from an older version than 3.x you should clear all of your caches like so:\\n
-# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C\\n
-ccache now supports sys-devel/clang and dev-lang/icc, too!"
-
- readme.gentoo_create_doc
-}
-
-pkg_prerm() {
- if [[ -z ${REPLACED_BY_VERSION} && ${ROOT:-/} == / ]] ; then
- eselect compiler-shadow remove ccache
- fi
-}
-
-pkg_postinst() {
- if [[ ${ROOT:-/} == / ]]; then
- eselect compiler-shadow update ccache
- fi
-
- # nuke broken symlinks from previous versions that shouldn't exist
- rm -rf "${EROOT}"/usr/lib/ccache.backup || die
-
- readme.gentoo_print_elog
-}
diff --git a/dev-util/ccache/ccache-3.7.1.ebuild b/dev-util/ccache/ccache-3.7.1.ebuild
index b8912ddeeee..7e0c22e120a 100644
--- a/dev-util/ccache/ccache-3.7.1.ebuild
+++ b/dev-util/ccache/ccache-3.7.1.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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd"
IUSE=""
DEPEND="app-arch/xz-utils
diff --git a/dev-util/ccache/ccache-3.7.ebuild b/dev-util/ccache/ccache-3.7.2.ebuild
index a2c8a134a09..71b2e79bcbd 100644
--- a/dev-util/ccache/ccache-3.7.ebuild
+++ b/dev-util/ccache/ccache-3.7.2.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 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 ~amd64-fbsd"
IUSE=""
DEPEND="app-arch/xz-utils
diff --git a/dev-util/ccache/ccache-3.6.ebuild b/dev-util/ccache/ccache-3.7.3.ebuild
index 905e13b6111..f3a519ee73c 100644
--- a/dev-util/ccache/ccache-3.6.ebuild
+++ b/dev-util/ccache/ccache-3.7.3.ebuild
@@ -6,12 +6,12 @@ EAPI=7
inherit readme.gentoo-r1
DESCRIPTION="fast compiler cache"
-HOMEPAGE="https://ccache.samba.org/"
-SRC_URI="https://www.samba.org/ftp/ccache/${P}.tar.xz"
+HOMEPAGE="https://ccache.dev/"
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
IUSE=""
DEPEND="app-arch/xz-utils
@@ -21,9 +21,7 @@ RDEPEND="${DEPEND}
sys-apps/gentoo-functions"
PATCHES=(
- "${FILESDIR}"/${PN}-3.4-size-on-disk.patch #456178
"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
- "${FILESDIR}"/${PN}-3.6-disable-sized-cleanup.patch #649440
)
src_prepare() {
diff --git a/dev-util/ccache/files/ccache-3.1.10-size-on-disk.patch b/dev-util/ccache/files/ccache-3.1.10-size-on-disk.patch
deleted file mode 100644
index 5e502912bfa..00000000000
--- a/dev-util/ccache/files/ccache-3.1.10-size-on-disk.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.gentoo.org/56178
-
-stick to the size of files on disk rather than their byte size.
-this func is only used for stats management, so this should be safe.
-
---- a/util.c
-+++ b/util.c
-@@ -845,12 +845,7 @@ file_size(struct stat *st)
- #ifdef _WIN32
- return (st->st_size + 1023) & ~1023;
- #else
-- size_t size = st->st_blocks * 512;
-- if ((size_t)st->st_size > size) {
-- /* probably a broken stat() call ... */
-- size = (st->st_size + 1023) & ~1023;
-- }
-- return size;
-+ return st->st_blocks * 512;
- #endif
- }
-
diff --git a/dev-util/ccache/files/ccache-3.3-size-on-disk.patch b/dev-util/ccache/files/ccache-3.3-size-on-disk.patch
index e4e2ff8c647..277e9a6469a 100644
--- a/dev-util/ccache/files/ccache-3.3-size-on-disk.patch
+++ b/dev-util/ccache/files/ccache-3.3-size-on-disk.patch
@@ -1,4 +1,5 @@
-https://bugs.gentoo.org/56178
+https://bugs.gentoo.org/456178
+https://github.com/ccache/ccache/issues/442
stick to the size of files on disk rather than their byte size.
this func is only used for stats management, so this should be safe.
diff --git a/dev-util/ccache/files/ccache-3.4-size-on-disk.patch b/dev-util/ccache/files/ccache-3.4-size-on-disk.patch
index 4f39a0348f2..a2f4a554cab 100644
--- a/dev-util/ccache/files/ccache-3.4-size-on-disk.patch
+++ b/dev-util/ccache/files/ccache-3.4-size-on-disk.patch
@@ -1,4 +1,5 @@
-https://bugs.gentoo.org/56178
+https://bugs.gentoo.org/456178
+https://github.com/ccache/ccache/issues/442
stick to the size of files on disk rather than their byte size.
this func is only used for stats management, so this should be safe.
diff --git a/dev-util/ccache/files/ccache-3.6-disable-sized-cleanup.patch b/dev-util/ccache/files/ccache-3.6-disable-sized-cleanup.patch
index 2b12542d26f..dcb5cf1f497 100644
--- a/dev-util/ccache/files/ccache-3.6-disable-sized-cleanup.patch
+++ b/dev-util/ccache/files/ccache-3.6-disable-sized-cleanup.patch
@@ -1,4 +1,5 @@
https://bugs.gentoo.org/649440
+https://github.com/ccache/ccache/issues/442
Disable cleanup based on free filesystem size.
diff --git a/dev-util/cgvg/Manifest b/dev-util/cgvg/Manifest
index ba5f760fb27..8de8ea193bf 100644
--- a/dev-util/cgvg/Manifest
+++ b/dev-util/cgvg/Manifest
@@ -1,2 +1 @@
-DIST cgvg-1.6.2.tar.gz 41790 BLAKE2B 7d3313172862c6b1cd41b3ab824b5c164b498012b8c3a9017804569757aaee0f4e20f7dd14c458eafed6629480e6a0e5c450ed16a06f627735f74c57b1156ad2 SHA512 b2b4ec973515a4282c7b5d4ac1009682ac64f632509717fda88c3fa91ee59c21c950b085b86c551d8f2fd75539a319eec0c8837655ad025042cbf6e101c92173
DIST cgvg-1.6.3.tar.gz 42130 BLAKE2B e272a42cbc2c5edf08459273eb9f71036ec1afde4d20bb39593028eaf40026b83707b327ef8892a39b1e6f0f399dff3b52f9ff023e9092e26439d1e935da99d5 SHA512 9aeebd0952fc6a99ebeca54bbc54f9ff8858baed3b6c16ae391c033ba6ec6c411e34da88e25ec1208c8f0c536a47424ef09af15bf650485d54921b33c652e0ab
diff --git a/dev-util/cgvg/cgvg-1.6.2.ebuild b/dev-util/cgvg/cgvg-1.6.2.ebuild
deleted file mode 100644
index cc5658993b5..00000000000
--- a/dev-util/cgvg/cgvg-1.6.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="A tiny version of cscope that is much more useful in certian instances"
-HOMEPAGE="http://uzix.org/cgvg.html"
-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 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-lang/perl"
-DEPEND="${RDEPEND}"
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS NEWS README TODO
-}
diff --git a/dev-util/cgvg/cgvg-1.6.3.ebuild b/dev-util/cgvg/cgvg-1.6.3.ebuild
index 3ebddf1f1c2..de3f1d26502 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 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
RDEPEND="dev-lang/perl"
DEPEND="${RDEPEND}"
diff --git a/dev-util/cgvg/metadata.xml b/dev-util/cgvg/metadata.xml
index 097975e3adc..58f638b2ac3 100644
--- a/dev-util/cgvg/metadata.xml
+++ b/dev-util/cgvg/metadata.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <!--maintainer-needed-->
</pkgmetadata>
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index 7e7ff32aa27..826bcde1fb8 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -1,3 +1 @@
-DIST devscripts_2.18.11.tar.xz 793112 BLAKE2B 8c1d40a13f6ce1bd804d7fb1300721485aea88b3ea2ad35c59c87f8fd85057cd26b1f40ea73d1919d45b8f0765610724fd3018c05d09e287554725f4425e146c SHA512 4c6c4b0e08115accaebed89fd5362842e6b8daaf9e1725684d0af1ad8cada7bd7aadce8640b766cfdd3a5784bb32ea177019781b2f13bb5da6b55389579ff07e
-DIST devscripts_2.19.3.tar.xz 810356 BLAKE2B af3f3e44d2f206226667bf6d3a0d1275ff2cc88e890817f2982c1c47bd8cbf8ca6a75357a4fa1dd2958be9ec97b870a2ee612c478a75bb23256c8aa5bae1f2fc SHA512 c5745e7aaa7ddac1be2f1da68b6c03c35e6b2ecde824a7c951ecf0fd0132315ebf40f62013de6da51f79ed473e3462634fd4057704236f5a1abd479b734c959b
-DIST devscripts_2.19.5.tar.xz 840936 BLAKE2B 790e31194f54513dd17ddb05cd1c94dfa1186ec2b4784c668c4119d0d10fb150061bd13362600b1955875cf33d36f38e1419735abec1a9fcc260baceea3e409e SHA512 23cfe9bd8288a9d3a2449a16f46a7c1960813a335cad99b8fcada074610837795be2a26768dab555dad84e4fb7cb7d99ba22979eda9c995b14d0297c7a1bb1c5
+DIST devscripts_2.19.6.tar.xz 844316 BLAKE2B 93eddc1d5ff78c579a28f8f54ce317cc251864917aa579094bd392f0811f07dc38447b3bd36a608431cb3d576b05c5e1f6cdc51a453b1c07389a5e1794f1acb5 SHA512 9313af1777d9a9932a81f95492b7cd423afbeacc8afbf6d9400e6430d2ce83abef0e0228a581f705f661183f605f2cadc95e11f1a43daf11fb968bcefc352422
diff --git a/dev-util/checkbashisms/checkbashisms-2.19.3.ebuild b/dev-util/checkbashisms/checkbashisms-2.19.3.ebuild
deleted file mode 100644
index 326e6817dff..00000000000
--- a/dev-util/checkbashisms/checkbashisms-2.19.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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://anonscm.debian.org/cgit/collab-maint/devscripts.git"
-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
- !<dev-util/rpmdevtools-8.3-r1"
-
-S="${WORKDIR}/${MY_P}/scripts"
-
-src_prepare() {
- default
-
- eapply -p2 "${FILESDIR}"/${PN}-2.18.6-command-vV.patch
-
- sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
-}
-
-src_compile() { :; }
-
-src_install() {
- newbin ${PN}.pl ${PN}
- doman ${PN}.1
-}
diff --git a/dev-util/checkbashisms/checkbashisms-2.19.5.ebuild b/dev-util/checkbashisms/checkbashisms-2.19.5.ebuild
deleted file mode 100644
index e48d94ca95a..00000000000
--- a/dev-util/checkbashisms/checkbashisms-2.19.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 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://anonscm.debian.org/cgit/collab-maint/devscripts.git"
-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
- !<dev-util/rpmdevtools-8.3-r1"
-
-S="${WORKDIR}/${MY_P}/scripts"
-
-src_prepare() {
- default
-
- eapply -p2 "${FILESDIR}"/${PN}-2.18.6-command-vV.patch
-
- sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
-}
-
-src_compile() { :; }
-
-src_install() {
- newbin ${PN}.pl ${PN}
- doman ${PN}.1
-}
diff --git a/dev-util/checkbashisms/checkbashisms-2.18.11.ebuild b/dev-util/checkbashisms/checkbashisms-2.19.6.ebuild
index 6cbe1ced247..425cf48b474 100644
--- a/dev-util/checkbashisms/checkbashisms-2.18.11.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.19.6.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
MY_PN="devscripts"
MY_P="${MY_PN}-${PV}"
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index 1e2f5444d6c..97281d77969 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1 +1 @@
-DIST clion-2019.1.3.tar.gz 431393782 BLAKE2B 5612f8109d7ad7dc98990a8f549383086263a980b482fba0c2357e86fc09b474e597b0ce8f911f287b7ba6837247f2be47372a79ce416bb16e10c0ffdbec2588 SHA512 9c0971db22f87447edfcc6c6089470bbda507bff5755ccf4efff3dfb4704ebcb4b1b0fa71580824af2ee0a1bf0036475220deb5948bdf2f12e4f151cd55a230e
+DIST clion-2019.2.tar.gz 485913295 BLAKE2B db723c1785cdf09f35299f89bb89f21c4f4ea96cc89de73484e31d042088cf613f634fc16e4c9d927f6903be3c401002836c0628cb80be7b029c4b28a67515ee SHA512 eb0a1acb9f267fa36f3cb2924cd9caa2f84367401c271d99458fc90b40cd62f97f566270ef1cd03bd0ce4160ab4bc92182fd468b860c67f2358e3c6adb021ddb
diff --git a/dev-util/clion/clion-2019.1.3.ebuild b/dev-util/clion/clion-2019.2.ebuild
index ac0d030149b..b3360455dab 100644
--- a/dev-util/clion/clion-2019.1.3.ebuild
+++ b/dev-util/clion/clion-2019.2.ebuild
@@ -40,7 +40,7 @@ src_prepare() {
use arm || remove_me+=( bin/fsnotifier-arm )
use x86 || remove_me+=( bin/fsnotifier lib/pty4j-native/linux/x86)
- use custom-jdk || remove_me+=( jre64 )
+ use custom-jdk || remove_me+=( jbr )
rm -rv "${remove_me[@]}" || die
}
@@ -63,8 +63,8 @@ src_install() {
fi
if use custom-jdk; then
- if [[ -d jre64 ]]; then
- fperms 755 "${dir}"/jre64/bin/{java,jjs,keytool,orbd,pack200,policytool,rmid,rmiregistry,servertool,tnameserv,unpack200}
+ if [[ -d jbr ]]; then
+ fperms 755 "${dir}"/jbr/bin/{jaotc,java,javac,jdb,jjs,jrunscript,keytool,pack200,rmid,rmiregistry,serialver,unpack200}
fi
fi
diff --git a/dev-util/cloc/Manifest b/dev-util/cloc/Manifest
index ba469c18438..0c48374dc7a 100644
--- a/dev-util/cloc/Manifest
+++ b/dev-util/cloc/Manifest
@@ -1,4 +1,4 @@
DIST cloc-1.72.tar.gz 347245 BLAKE2B 8ce6915322c6cb4682994034525b7c1e3dfa674832c24dd3d3998f3472f83739764aa61beb80ccda51147b663d4555f060b0098fbf307b81418d58ca72b4f14b SHA512 e83567fcc2703b6de761c44d3b85e4c176eaff9f35419a202bd4c00b5cc9160d39251deb762d57b40aacf4fe6322cf79877032ed29abec2a5f00c1abb8d44021
DIST cloc-1.76.tar.gz 419678 BLAKE2B bb9ddee89a3efe6d7ea913ddf04a28e4120da82df93ef611f7b19bc9662664787b54a2b063139f8d17db3c69a27f74ff4d2c6263100d68b8d2b92c50ddd2f360 SHA512 3f16f084be1828557e4120a8e41b276336ac240c5de4dc765066277d848ce9af20f31b36ec4beb863066d8b3e9287ea0e0b2a8f1abd15532957f53d2d3935ecd
DIST cloc-1.80.tar.gz 453965 BLAKE2B 63032d0ebff7536a4c0cb07ab7791177310b8544cd878093cc89b753997707768198ed59ff451e6de72bbdd4a9ffd3bf84b113243534c466f6a91befc4593014 SHA512 3f41a0e2bd4becbb393e24834c45d9998217443d5c6d0478be5ce4f9506bb8dcb44088ce4a2c75c06cb6af47b4432f3dc58db9009f9a350a00dd80802109117f
-DIST {P}.tar.gz 494399 BLAKE2B 9bf8e1304d9efbf918b39287342edbd0daadd9e27cedb3a6e5eda9fa8062dc34f56f1e1a949ee1027bb683554ba68aca07d66907795d8bc9ff4ca584c70e83dd SHA512 31a0b9119cfde77572dc9e79ac01e497de57bd98da97dd94dba8269888bf92c55d47e136dc718b98cf648673aa0ac3205bec5cb7b9363e3b750f01aa0a4f1f90
+DIST cloc-1.82.tar.gz 494399 BLAKE2B 9bf8e1304d9efbf918b39287342edbd0daadd9e27cedb3a6e5eda9fa8062dc34f56f1e1a949ee1027bb683554ba68aca07d66907795d8bc9ff4ca584c70e83dd SHA512 31a0b9119cfde77572dc9e79ac01e497de57bd98da97dd94dba8269888bf92c55d47e136dc718b98cf648673aa0ac3205bec5cb7b9363e3b750f01aa0a4f1f90
diff --git a/dev-util/cloc/cloc-1.82.ebuild b/dev-util/cloc/cloc-1.82.ebuild
index b88f813f79e..604486f6f0c 100644
--- a/dev-util/cloc/cloc-1.82.ebuild
+++ b/dev-util/cloc/cloc-1.82.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Count Lines of Code"
HOMEPAGE="https://github.com/AlDanial/cloc"
-SRC_URI="https://github.com/AlDanial/${PN}/archive/${PV}.tar.gz -> {P}.tar.gz"
+SRC_URI="https://github.com/AlDanial/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 3b819dfce1a..72bd0360ab9 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,4 +1,4 @@
DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226 SHA512 99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26
-DIST cmake-3.14.3.tar.gz 8851085 BLAKE2B 92da2c563f7ddc3b12457f63eead850eb99b123298632b5a9e8f80f3e32db20e2b25bc60778855400261d13d4ef42600162248f4a92907a0c581e202fc6620eb SHA512 e257a96334f21f2b2f17e8d43aa32c2b069d13194604393c5ac9d3da193000d5328181c6cf861696186d022aba57679ee2d08073d8a7112727746b2b145a47e2
-DIST cmake-3.14.5.tar.gz 8854929 BLAKE2B 3e783de1ce541039c80228a56fed4fd28e9ef2ea48f274995f6f26f8b149f1684aab6da518f27106f364a4f0a6f370334f3a85dd61f1bcce22c34337ef4afdaa SHA512 9acd2de17db86052801194cac570bfc104320c249b83058aa59554b42c3d5af9c9293d1c069f3fe8512a80103d511186d840168cbc190ce9584ca99cb9b11e46
-DIST cmake-3.15.0-rc4.tar.gz 9267525 BLAKE2B 14cf10e511beedbb96f7c2e231bd6d81bb8973b98a5ea51888e41b2cc0544a25a52735556176f92c6951084b87d201cdd85ff3be0f331d7c7f1125e12b743c18 SHA512 e607f2b3866c35ad63490eb0b15c87fd0df271186840d4a2bf1f7adc88d072fd7f1088e0c8387be5ad39b9d8a45148e9619b1b7e7bfa9d1f3d91e2ee482c335d
+DIST cmake-3.14.6.tar.gz 8861359 BLAKE2B 257a9a89fe880f8945f47a4bb1980e66f0f28ee5cebeb161012860ae8578487e50c60060ad5144ec6f5b7ea860112edd01909ebceec24b8370e3769ff2a79e99 SHA512 8cf3afadec3fe931d9f954e3148a398939cd16c1fbcb4c5303ac635e2b5029960867f317fd13a46fceebe46e7328689e847f03d7d7c74bb31e23c9cc55838f56
+DIST cmake-3.15.1.tar.gz 9268592 BLAKE2B 3b0dbca9203b1029922d06df9abc3bbfa6f7b8320e43b11b468cd7e129171e2bb1b645fc07bf2d46c9b3c08642f1a11741240d0029f96ac3b2d7a8bb44d398da SHA512 6900a84c7764034331fb6f00801841a7a3e667ac39813c35ceb3db983b33a5bf6addbbc8539c39a0c0be9e10204c79d6236886a9d50ce901a56275b53619ec73
+DIST cmake-3.15.2.tar.gz 9269449 BLAKE2B 539a1dede60741f5159fef72f6a7fdd7dd4fd457fab73d33f01b042adee7b5179b2b620ece0556f1612745f911ffe6cd714efb18a4663ac67ed6a20e09feb233 SHA512 154494fe4c8673c3b17a6f1823c55f06fbb35d7ea048b63a5c3e3157108f222693cf1606c879a3cf425edea686dfe19e27974b338e5d281ec118b1a51c632ccc
diff --git a/dev-util/cmake/cmake-3.14.3.ebuild b/dev-util/cmake/cmake-3.14.6.ebuild
index 01f4a37c833..01f4a37c833 100644
--- a/dev-util/cmake/cmake-3.14.3.ebuild
+++ b/dev-util/cmake/cmake-3.14.6.ebuild
diff --git a/dev-util/cmake/cmake-3.15.0_rc4.ebuild b/dev-util/cmake/cmake-3.15.1.ebuild
index 06184a6bfe5..06184a6bfe5 100644
--- a/dev-util/cmake/cmake-3.15.0_rc4.ebuild
+++ b/dev-util/cmake/cmake-3.15.1.ebuild
diff --git a/dev-util/cmake/cmake-3.14.5.ebuild b/dev-util/cmake/cmake-3.15.2.ebuild
index b04b6c2e433..06184a6bfe5 100644
--- a/dev-util/cmake/cmake-3.14.5.ebuild
+++ b/dev-util/cmake/cmake-3.15.2.ebuild
@@ -56,7 +56,7 @@ PATCHES=(
#"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
# handle gentoo packaging in find modules
- "${FILESDIR}"/${PN}-3.14.0_rc1-FindBLAS.patch
+ "${FILESDIR}"/${PN}-3.15.0_rc2-FindBLAS.patch
"${FILESDIR}"/${PN}-3.14.0_rc1-FindLAPACK.patch
"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
diff --git a/dev-util/cmocka/Manifest b/dev-util/cmocka/Manifest
index 1709a3dcbbe..06a150ece92 100644
--- a/dev-util/cmocka/Manifest
+++ b/dev-util/cmocka/Manifest
@@ -1,2 +1 @@
-DIST cmocka-1.1.3.tar.xz 78744 BLAKE2B 5043a496afab08837a73c2e0ff9c9b3c3880a2fd394a768b1f8b51d2fec517a5527e93b7e660f8dcc73af79aaf88e224f4e2869c7e31540f8e54c76481905ff6 SHA512 b1a2ce72234256d653eebf95f8744a34525b9027e1ecf6552e1620c83a4bdda8b5674b748cc5fd14abada1e374829e2e7f0bcab0b1c8d6c3b7d9b7ec474b6ed3
DIST cmocka-1.1.5.tar.xz 81004 BLAKE2B 5625dc293ad481c654848f3de806ef88d1b651192c2461e52b54bf9d443b5e2ea5d2a685ab85b044685f57e5723ade6c4c17e38624f59c4eab240cb4feeaab1e SHA512 cad7f04757183d004f6eaad39036fc0e24c5e0e987f80e85bc43bc66dba22389cb02b08e25531cc28a541d0a24a86b29be134a2d6fc339128e87d66952f502bd
diff --git a/dev-util/cmocka/cmocka-1.1.3.ebuild b/dev-util/cmocka/cmocka-1.1.3.ebuild
deleted file mode 100644
index 59978fb7fdf..00000000000
--- a/dev-util/cmocka/cmocka-1.1.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-DESCRIPTION="Unit testing framework for C"
-HOMEPAGE="https://cmocka.org/"
-SRC_URI="https://cmocka.org/files/1.1/${P}.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs test"
-
-BDEPEND="
- doc? ( app-doc/doxygen[dot] )
-"
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-PATCHES=(
- "${FILESDIR}/${P}-fix-doxygen.patch" # bug 671404
- "${FILESDIR}/${P}-examples.patch"
-)
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DWITH_EXAMPLES=$(usex examples)
- -DWITH_STATIC_LIB=$(usex static-libs)
- -DUNIT_TESTING=$(usex test)
- $(multilib_is_native_abi && cmake-utils_use_find_package doc Doxygen \
- || echo -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON)
- )
-
- cmake-utils_src_configure
-}
-
-multilib_src_compile() {
- cmake-utils_src_compile
- multilib_is_native_abi && use doc && cmake-utils_src_compile docs
-}
-
-multilib_src_install() {
- if multilib_is_native_abi && use doc; then
- local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
- fi
-
- cmake-utils_src_install
-}
diff --git a/dev-util/cmocka/cmocka-1.1.5.ebuild b/dev-util/cmocka/cmocka-1.1.5.ebuild
index 0e7a9f96a01..d547545d0bc 100644
--- a/dev-util/cmocka/cmocka-1.1.5.ebuild
+++ b/dev-util/cmocka/cmocka-1.1.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://cmocka.org/files/1.1/${P}.tar.xz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="doc examples static-libs test"
BDEPEND="
diff --git a/dev-util/cmocka/files/cmocka-1.1.3-examples.patch b/dev-util/cmocka/files/cmocka-1.1.3-examples.patch
deleted file mode 100644
index 3d5fcc8098f..00000000000
--- a/dev-util/cmocka/files/cmocka-1.1.3-examples.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From ee264da1aa222b354cee36184ab48c2072f62243 Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Wed, 23 Jan 2019 11:20:31 +0100
-Subject: [PATCH] cmake: Add WITH_EXAMPLES options
-
-This is turned on by default, but you can disable it, if you just
-package cmocka for an opterating system.
-
-Fixes #14
-
-Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
----
- CMakeLists.txt | 4 +++-
- DefineOptions.cmake | 1 +
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7778039..702be97 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,7 +60,9 @@ if (UNIT_TESTING)
- add_subdirectory(tests)
- endif (UNIT_TESTING)
-
--add_subdirectory(example)
-+if (WITH_EXAMPLES)
-+ add_subdirectory(example)
-+endif ()
-
- # pkg-config file
- configure_file(cmocka.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/cmocka.pc)
-diff --git a/DefineOptions.cmake b/DefineOptions.cmake
-index 5bc1ef3..911ff1d 100644
---- a/DefineOptions.cmake
-+++ b/DefineOptions.cmake
-@@ -1,5 +1,6 @@
- option(WITH_STATIC_LIB "Build with a static library" OFF)
- option(WITH_CMOCKERY_SUPPORT "Install a cmockery header" OFF)
-+option(WITH_EXAMPLES "Build examples" ON)
- option(UNIT_TESTING "Build with unit testing" OFF)
- option(PICKY_DEVELOPER "Build with picky developer flags" OFF)
-
---
-2.18.1
-
diff --git a/dev-util/cmocka/files/cmocka-1.1.3-fix-doxygen.patch b/dev-util/cmocka/files/cmocka-1.1.3-fix-doxygen.patch
deleted file mode 100644
index c093021aa82..00000000000
--- a/dev-util/cmocka/files/cmocka-1.1.3-fix-doxygen.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 1abfea55df24e83c2ea321b5f2b75e1a58963bc6 Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Wed, 24 Oct 2018 16:33:39 +0200
-Subject: cmake: Fix doxygen generation
-
-Fixes #12
-
-Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
----
- CMakeLists.txt | 2 +-
- doc/CMakeLists.txt | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 88408a9..7778039 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -51,9 +51,9 @@ if (MINGW)
- endif (MINGW)
-
- # check subdirectories
--add_subdirectory(doc)
- add_subdirectory(include)
- add_subdirectory(src)
-+add_subdirectory(doc)
-
- include(AddCMockaTest)
- if (UNIT_TESTING)
-diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
-index a7bc65e..6ac7494 100644
---- a/doc/CMakeLists.txt
-+++ b/doc/CMakeLists.txt
-@@ -38,7 +38,7 @@ if (DOXYGEN_FOUND)
-
- doxygen_add_docs(docs
- ${cmocka-library_SOURCE_DIR}
-- ${cmocka-headers_SOURCE_DIR}
-+ ${cmocka-header_SOURCE_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR})
- endif(DOXYGEN_FOUND)
-
---
-cgit v1.2.1
diff --git a/dev-util/codeblocks/metadata.xml b/dev-util/codeblocks/metadata.xml
index 4d0690ce374..e0bd14a62a1 100644
--- a/dev-util/codeblocks/metadata.xml
+++ b/dev-util/codeblocks/metadata.xml
@@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>torokhov_s_a@mail.ru</email>
+ <email>torokhov-s-a@yandex.ru</email>
<name>Sergey Torokhov</name>
</maintainer>
<maintainer type="project">
diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest
index 6b417b9ada1..7e5b58932f4 100644
--- a/dev-util/conan/Manifest
+++ b/dev-util/conan/Manifest
@@ -1 +1,2 @@
DIST conan-1.0.4.tar.gz 580404 BLAKE2B a3099e7f5bdb882591bab031da267f3df5582975d93a840cd7bf42d7b5b57850d42a28ea33440f6570149b7db8c2ae6a395460f375fee084a9336435d42e7df6 SHA512 47fe9632b0007cdc0456004e6c9122df387869c33b58694b4a2dca9956daf977532f79c204207b21d3a4e7d90337a25dba49cf84cba98c1f9bde3170f1a185a9
+DIST conan-1.18.1.tar.gz 532813 BLAKE2B d4c8ec62100b8c4038f9bef8338aa0afccc38ab39d8d953c41934efc43d6ba8e5abda1438e3f8c3f4bba4b770b871a1afc5ef19749771a55873b35f28a427b1b SHA512 f9c4c4cb768c3f015a84adb3d4926cf91a372a8dae6655df9396b645c24c8694f47795064c0e93ee799864d19f6f77983da0a1679ad511d8f11702250ae95124
diff --git a/dev-util/conan/conan-1.18.1.ebuild b/dev-util/conan/conan-1.18.1.ebuild
new file mode 100644
index 00000000000..150071e1dc0
--- /dev/null
+++ b/dev-util/conan/conan-1.18.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Distributed C/C++ package manager"
+HOMEPAGE="https://conan.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+# overly strict requirements?
+# https://github.com/conan-io/conan/blob/develop/conans/requirements.txt
+RDEPEND="
+ >=dev-python/pyjwt-1.4[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
+ >=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+ >=dev-python/patch-1.16[${PYTHON_USEDEP}]
+ >=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
+ >=dev-python/six-1.10[${PYTHON_USEDEP}]
+ >=dev-python/node-semver-0.6.1[${PYTHON_USEDEP}]
+ >=dev-python/distro-1.0.2[${PYTHON_USEDEP}]
+ >=dev-python/pylint-2.3.1[${PYTHON_USEDEP}]
+ >=dev-python/future-0.16.0[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+ >=dev-python/astroid-1.6.5[${PYTHON_USEDEP}]
+ >=dev-python/deprecation-2.0[${PYTHON_USEDEP}]
+ >=dev-python/tqdm-4.28.1[${PYTHON_USEDEP}]
+ >=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+ >=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
+ >=dev-python/typed-ast-1.1.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ ${RDEPEND}
+ dev-lang/go
+ >=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
+ >=dev-python/nose-parameterized-0.5.0[${PYTHON_USEDEP}]
+ >=dev-python/webtest-2.0.18[${PYTHON_USEDEP}]
+ dev-util/cmake
+ )
+"
+
+src_prepare() {
+ default
+ # Fix strict dependencies
+ sed -i \
+ -e "s:patch==1.16:patch>=1.16:g" \
+ -e "s:node-semver==0.6.1:node-semver>=0.6.1:g" \
+ -e "s:future==0.16.0:future>=0.16.0:g" \
+ conans/requirements.txt
+}
+
+python_test() {
+ cd "${BUILD_DIR}"/lib || die
+ PYTHONPATH=. nosetests -v . || die
+}
diff --git a/dev-util/conan/metadata.xml b/dev-util/conan/metadata.xml
index af7e11d6bb6..eec79f76ea9 100644
--- a/dev-util/conan/metadata.xml
+++ b/dev-util/conan/metadata.xml
@@ -2,8 +2,8 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>beschindler@gmail.com</email>
- <name>Benjamin Schindler</name>
+ <email>azamat.hackimov@gmail.com</email>
+ <name>Azamat H. Hackimov</name>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
diff --git a/dev-util/conf2struct/conf2struct-0_pre0.ebuild b/dev-util/conf2struct/conf2struct-0_pre0-r1.ebuild
index c027b8564d6..631e635694c 100644
--- a/dev-util/conf2struct/conf2struct-0_pre0.ebuild
+++ b/dev-util/conf2struct/conf2struct-0_pre0-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/yrutschle/conf2struct.git"
inherit git-r3
else
- KEYWORDS="~amd64"
+ KEYWORDS="~amd64 ~arm"
GIT_COMMIT="10ea3356b65e712fb000f4d37f00e1dc09c1e722"
SRC_URI="https://github.com/yrutschle/conf2struct/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${PN}-${GIT_COMMIT}"
@@ -25,14 +25,19 @@ PATCHES=(
"${FILESDIR}/${P}-dest-exists.patch"
)
-LICENSE="GPL-2"
+LICENSE="BSD-2"
SLOT="0"
-IUSE="caps pcre systemd tcpd"
+IUSE=""
RDEPEND="dev-libs/libconfig
dev-perl/Conf-Libconfig"
DEPEND="${RDEPEND}"
+src_compile(){
+ # -j1 due to parallel make issue reported upstream at: https://github.com/yrutschle/conf2struct/issues/10
+ emake -j1 CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
src_install(){
emake DESTDIR="${D}" prefix="${EPREFIX%/}/usr" install
}
diff --git a/dev-util/conf2struct/conf2struct-9999.ebuild b/dev-util/conf2struct/conf2struct-9999.ebuild
index 3ab3bce60c3..b853d93f1b8 100644
--- a/dev-util/conf2struct/conf2struct-9999.ebuild
+++ b/dev-util/conf2struct/conf2struct-9999.ebuild
@@ -15,14 +15,18 @@ else
SRC_URI="https://github.com/yrutschle/conf2struct/archive/v${PV}.tar.gz -> ${P}.tar.gz"
fi
-LICENSE="GPL-2"
+LICENSE="BSD-2"
SLOT="0"
-IUSE="caps pcre systemd tcpd"
+IUSE=""
RDEPEND="dev-libs/libconfig
dev-perl/Conf-Libconfig"
DEPEND="${RDEPEND}"
+src_compile(){
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
src_install(){
emake DESTDIR="${D}" prefix="${EPREFIX%/}/usr" install
}
diff --git a/dev-util/cppcheck/cppcheck-1.86.ebuild b/dev-util/cppcheck/cppcheck-1.86.ebuild
index cb394ed32bb..e5e40d68d20 100644
--- a/dev-util/cppcheck/cppcheck-1.86.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.86.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}/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/cpputest/cpputest-3.8.ebuild b/dev-util/cpputest/cpputest-3.8.ebuild
index 4c3046bb40e..f76d8b2c919 100644
--- a/dev-util/cpputest/cpputest-3.8.ebuild
+++ b/dev-util/cpputest/cpputest-3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,9 +11,8 @@ LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 ~arm x86"
IUSE="test"
+RESTRICT="!test? ( test )"
-DEPEND="
- test? ( >=dev-cpp/gtest-1.8.0 )
-"
+DEPEND="test? ( >=dev-cpp/gtest-1.8.0 )"
DOCS=( AUTHORS README.md README_CppUTest_for_C.txt )
diff --git a/dev-util/ctags/Manifest b/dev-util/ctags/Manifest
index 0e5f747b355..2998e6449f9 100644
--- a/dev-util/ctags/Manifest
+++ b/dev-util/ctags/Manifest
@@ -1,3 +1 @@
-DIST ctags-20161028.tar.xz 852108 BLAKE2B a4c954c560bb2d0165c12b4ec4f7b7c2c674acde98d438d9388f5d6102d325759faa3d4801eb0f63da70064fdeb32ef1c1cdd4124ade8d87cd9632b77c823e1a SHA512 2b991ca47fc77d26da43f55753624d1b21363dbeec4aff3daa57762ff81df97b18b067e8989f5d92d36dd8c02abc04ad42296dd5da3659ae0c8901001287c75e
-DIST ctags-20170704.tar.gz 1295281 BLAKE2B b58917a876d90df528f51bcd572301dcba8fa8ce8998bdb0a245d7d58033e37c2984af963a312c83b364dafd37633270f5f5d06fdb635a927066282e9382f6a2 SHA512 6ed134347a4be16a5dcff35186bd949e73bea645908a5ac43082b92fdfa6040b0b99ea04590948ae8308d4e9eb1042c83a4f0df006709f15cebfbf0741d73641
DIST ctags-20190331.tar.gz 1537104 BLAKE2B 354ddf48cdc9421e70d9d37ec7251e51f7f78564dc4f6236d12e2e18519369c39c22585830fd301b7eff4898d550b824776541198b8c4a31425711776b14fde4 SHA512 414faef7628ecaa66fcd5f172781a32194e1d58637dded1f7e55c138239ad777796bb1510bd447af3ad8243b7178e6f4859139305b0c0efe298182408f34524c
diff --git a/dev-util/ctags/ctags-20161028.ebuild b/dev-util/ctags/ctags-20161028.ebuild
deleted file mode 100644
index 64b0e6eb148..00000000000
--- a/dev-util/ctags/ctags-20161028.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors"
-HOMEPAGE="https://ctags.io/ https://github.com/universal-ctags/ctags"
-SRC_URI="https://dev.gentoo.org/~radhermit/vim/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="json xml yaml"
-
-COMMON_DEPEND="
- json? ( dev-libs/jansson )
- xml? ( dev-libs/libxml2:2 )
- yaml? ( dev-libs/libyaml )
-"
-RDEPEND="
- ${COMMON_DEPEND}
- app-eselect/eselect-ctags
-"
-DEPEND="
- ${COMMON_DEPEND}
- dev-python/docutils
- virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${P}-automagic-deps.patch )
-
-src_prepare() {
- default
- ./autogen.sh || die
-}
-
-src_configure() {
- econf \
- $(use_enable json) \
- $(use_enable xml) \
- $(use_enable yaml) \
- --disable-readlib \
- --disable-etags \
- --enable-tmpdir="${EPREFIX}"/tmp
-}
-
-src_install() {
- emake prefix="${ED}"/usr mandir="${ED}"/usr/share/man install
-
- # namepace collision with X/Emacs-provided /usr/bin/ctags -- we
- # rename ctags to exuberant-ctags (Mandrake does this also).
- mv "${ED}"/usr/bin/{ctags,exuberant-ctags} || die
- mv "${ED}"/usr/share/man/man1/{ctags,exuberant-ctags}.1 || die
-}
-
-pkg_postinst() {
- eselect ctags update
-
- if [[ -z "$REPLACING_VERSIONS" ]]; then
- elog "You can set the version to be started by /usr/bin/ctags through"
- elog "the ctags eselect module. \"man ctags.eselect\" for details."
- fi
-}
-
-pkg_postrm() {
- eselect ctags update
-}
diff --git a/dev-util/ctags/ctags-20170704.ebuild b/dev-util/ctags/ctags-20170704.ebuild
deleted file mode 100644
index 2b2fbbbe1bb..00000000000
--- a/dev-util/ctags/ctags-20170704.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-COMMITHASH="0645b2c833e4ca956970cc96fab32a1b04c0c55c"
-
-DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors"
-HOMEPAGE="https://ctags.io/ https://github.com/universal-ctags/ctags"
-SRC_URI="https://github.com/universal-ctags/ctags/archive/${COMMITHASH}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="json xml yaml"
-
-CDEPEND="
- json? ( dev-libs/jansson )
- xml? ( dev-libs/libxml2:2 )
- yaml? ( dev-libs/libyaml )
-"
-
-RDEPEND="
- ${CDEPEND}
- app-eselect/eselect-ctags
-"
-
-DEPEND="
- ${CDEPEND}
- dev-python/docutils
- virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN}-${COMMITHASH}"
-
-src_prepare() {
- default
- ./misc/dist-test-cases > makefiles/test-cases.mak || die
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable json) \
- $(use_enable xml) \
- $(use_enable yaml) \
- --disable-readlib \
- --disable-etags \
- --enable-tmpdir="${EPREFIX}"/tmp
-}
-
-src_install() {
- emake prefix="${ED}"/usr mandir="${ED}"/usr/share/man install
-
- # namepace collision with X/Emacs-provided /usr/bin/ctags -- we
- # rename ctags to exuberant-ctags (Mandrake does this also).
- mv "${ED}"/usr/bin/{ctags,exuberant-ctags} || die
- mv "${ED}"/usr/share/man/man1/{ctags,exuberant-ctags}.1 || die
-}
-
-pkg_postinst() {
- eselect ctags update
-
- if [[ -z "$REPLACING_VERSIONS" ]]; then
- elog "You can set the version to be started by /usr/bin/ctags through"
- elog "the ctags eselect module. \"man ctags.eselect\" for details."
- fi
-}
-
-pkg_postrm() {
- eselect ctags update
-}
diff --git a/dev-util/cucumber-core/Manifest b/dev-util/cucumber-core/Manifest
index 9affd1084a9..73efe846ff9 100644
--- a/dev-util/cucumber-core/Manifest
+++ b/dev-util/cucumber-core/Manifest
@@ -1,2 +1 @@
-DIST cucumber-core-1.5.0.gem 45056 BLAKE2B 39c56fd48386556f36921694940d8d8be7e2345c81bec83e7a47b4a07e96b22f4d30898cbdcedeebc44be671c166b42cb52d55c36b7196eb05b9cb82333a76d3 SHA512 544d2c5707bde46d0c12dc975b3858e663776d9bc87ef044681525a547ef2de171a74ba0c53fb28dafcbdf90a153bea5357ec1a129f11b2c0dfedd288c5def74
DIST cucumber-core-3.2.1.tar.gz 49868 BLAKE2B e5d18797fb6821fa9c300898bc8c14d57559b790d77a191d7147a987e27893ce89076716f82fa2048632e1b033ad607c748fe29f6b8fc600abd523290c4a9f50 SHA512 ba45e804d8454a6ef306eb90f32e6cdf3ee25fdd6613e9ba8308ecfce4044f27ee3dc012ad7f9ca481e94fe5e1d9deb9e0c46ca811a8e25bb27981a78c528ddb
diff --git a/dev-util/cucumber-core/cucumber-core-1.5.0.ebuild b/dev-util/cucumber-core/cucumber-core-1.5.0.ebuild
deleted file mode 100644
index 0e0b55d4e91..00000000000
--- a/dev-util/cucumber-core/cucumber-core-1.5.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
-LICENSE="Ruby"
-
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
-SLOT="0"
-IUSE="test"
-
-ruby_add_bdepend "
- test? (
- >=dev-ruby/unindent-1.0
- )"
-
-ruby_add_rdepend "
- >=dev-ruby/gherkin-4.0:4
-"
-
-all_ruby_prepare() {
- # Avoid dependency on kramdown to keep dependency list manageable for all arches.
- rm -f spec/readme_spec.rb || die
-}
diff --git a/dev-util/cucumber-rails/Manifest b/dev-util/cucumber-rails/Manifest
index 5ee3ff90ac1..0f5c5bdc99f 100644
--- a/dev-util/cucumber-rails/Manifest
+++ b/dev-util/cucumber-rails/Manifest
@@ -1,2 +1,3 @@
DIST cucumber-rails-1.6.0.gem 409088 BLAKE2B 05263cd0183a6b6ae4a3091eba6e4d6f6bc1f21f434757e86b0f150c1c18c98773b210db31a4f58710c05d09324605048586aa8d62274ed1861dd7e2bba97b25 SHA512 dab37f8777e2bc06c07141baa84091cd5128fa90631f1ecf381e2a8fb22f024a1f5af96edd212148c4a9e30791efb9f2602a71058f3b7c6fc494dfd10bfefb00
DIST cucumber-rails-1.7.0.gem 411648 BLAKE2B 09f6e79384869e0d901cb7dda607f2db29b0a924cd57fac56f88e5a90ef5f79348246e91195ecb437ae88e2e5f3f2e17bbfc651b8ff6e01cfc92cc86c544b5be SHA512 05f91606ebfd5db6608120b7057c767efaccee1dfb2eb99113e9cc6f55e594bd4181f54c8a38780b451bf7dc53862180e80a3c62a81ee8b1ea6aaf54682599c2
+DIST cucumber-rails-1.8.0.gem 43008 BLAKE2B ac2fbc89ea952add031429b281986de37b3a8511e398b34d49435c70221b3c454589c51acd5b1fcecdf0285a8e446d4c2c0e0a77216eb78f8fa222086fb6db36 SHA512 757f50719309418353cf1e6b42902ce6166806d2e2a9cd1a27842ffde3d8ce61af97de12f4ffa9e31a50693cc8c40ece9a74e5ec91973096e77860b56034d439
diff --git a/dev-util/cucumber-rails/cucumber-rails-1.8.0.ebuild b/dev-util/cucumber-rails/cucumber-rails-1.8.0.ebuild
new file mode 100644
index 00000000000..c81500b4da1
--- /dev/null
+++ b/dev-util/cucumber-rails/cucumber-rails-1.8.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+# There are also cucumber features. They require a Rails project with
+# factory girl which we don't have packaged yet.
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="cucumber-rails.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios for Rails"
+HOMEPAGE="https://github.com/cucumber/cucumber/wikis"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64"
+SLOT="1"
+IUSE=""
+
+# Restrict tests since Appraisal is now mandatory to manage different
+# rails versions, even for the specs.
+RESTRICT="test"
+#ruby_add_bdepend "
+# test? (
+# >=dev-ruby/ammeter-0.2.2
+# >=dev-ruby/rspec-rails-2.7.0:2
+# )"
+
+ruby_add_rdepend "
+ >=dev-util/cucumber-3.0.2 <dev-util/cucumber-4
+ >=dev-ruby/nokogiri-1.8
+ >=dev-ruby/capybara-2.12:* <dev-ruby/capybara-4:*
+ >=dev-ruby/railties-4.2:* <dev-ruby/railties-7:*
+ >=dev-ruby/mime-types-2.0:* <dev-ruby/mime-types-4:*"
+
+all_ruby_prepare() {
+ rm Gemfile || die
+ sed -i -e '/[Bb]undler/d' Rakefile || die
+ sed -i -e '/git ls/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-util/cutter/cutter-1.8.0.ebuild b/dev-util/cutter/cutter-1.8.0.ebuild
index e1e21ad2836..36ab4ff606e 100644
--- a/dev-util/cutter/cutter-1.8.0.ebuild
+++ b/dev-util/cutter/cutter-1.8.0.ebuild
@@ -15,7 +15,8 @@ LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="jupyter webengine"
-REQUIRED_USE="webengine? ( jupyter )"
+REQUIRED_USE="webengine? ( jupyter )
+ ${PYTHON_REQUIRED_USE}"
DEPEND="
${PYTHON_DEPS}
diff --git a/dev-util/cutter/cutter-1.8.2.ebuild b/dev-util/cutter/cutter-1.8.2.ebuild
index dde00637bbf..c31e6b2f6d5 100644
--- a/dev-util/cutter/cutter-1.8.2.ebuild
+++ b/dev-util/cutter/cutter-1.8.2.ebuild
@@ -15,7 +15,8 @@ LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="jupyter webengine"
-REQUIRED_USE="webengine? ( jupyter )"
+REQUIRED_USE="webengine? ( jupyter )
+ ${PYTHON_REQUIRED_USE}"
DEPEND="
${PYTHON_DEPS}
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index d547332b7d3..b82251befad 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,3 +1,3 @@
-DIST debhelper_12.1.1.tar.xz 483732 BLAKE2B 39938f9ec0793154da6405c1b0ef2a8a10a10753475b09f8fbc6e7411457713eb7bc035dfc21f9b7b9f82ec276674802c0cd7599252956cf455cc8d203070a9c SHA512 ab006450258c6c3d5c89bddb8bc5a87d61d80e8232cbbd2f15a32d1045d1fa9f1858df536d8cf813048f4e755a8e5bca765f1da7800ebf8f1237096e659d9ddd
-DIST debhelper_12.1.tar.xz 483568 BLAKE2B 3ffefced2759224fbc9f00c05be03379bf34f8f954be871700b0467629f2437c890ea5f334fc1cdb47baf9ec0e19c886cbbc881cbda39733374a4e09bba3e413 SHA512 557db22d6aac8953cdc41fb6fcb0c06566154ac30aeade4df6c100534505c79d9c34d1f8cc3b41e83740cbe90eb2bf18b21fc0fe49cdbee6d709949c7689ebfb
+DIST debhelper_12.3.tar.xz 493796 BLAKE2B 65ed2b494bd7dc70ecefe1a999681af1648385ec4addde8dbe39a650e37d4613c1712ba8005dd1efc8bcc688c02f23d02afe661e6126d29d8855930a34ed74d7 SHA512 94abe39f4df1d0b95b49fc20141f46f8f0438de89f904556dcb26f9ddcb6530d04d92c2c719549c0f1f5bc8c5edc395fd770e74097b353ec521affa227d77f4f
+DIST debhelper_12.4.tar.xz 493916 BLAKE2B f1478c30a1043f66eea4aa3bbe0cd5bcc10b9d8d2a2caf9ec82b6eaaa4bff03ee7c72ee2aa87ff96827a09b6f33874fd85d7743df2f5c8b1eaaf957c3cbc4066 SHA512 82897feadfa953d12bbc6e5e8fb1fbccd4de9e42cafa5c23e188960ff11e7c14a5db0ba7a5a50873b2f399da71580a36b27156c03a11d418c58fbe5cc431b006
DIST debhelper_9.20160814.tar.xz 344328 BLAKE2B 38791ab3dfb74d12e44226b79a377889911a08505cdb45cc0a6e653906edbafcac1038d1d9ff9f5fd9f714ed36681562ce7fb1c9c1109a8528523100128fced6 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62
diff --git a/dev-util/debhelper/debhelper-12.1.1.ebuild b/dev-util/debhelper/debhelper-12.3.ebuild
index e546013a4fd..e546013a4fd 100644
--- a/dev-util/debhelper/debhelper-12.1.1.ebuild
+++ b/dev-util/debhelper/debhelper-12.3.ebuild
diff --git a/dev-util/debhelper/debhelper-12.1.ebuild b/dev-util/debhelper/debhelper-12.4.ebuild
index e546013a4fd..e546013a4fd 100644
--- a/dev-util/debhelper/debhelper-12.1.ebuild
+++ b/dev-util/debhelper/debhelper-12.4.ebuild
diff --git a/dev-util/debootstrap/debootstrap-1.0.115.ebuild b/dev-util/debootstrap/debootstrap-1.0.115.ebuild
index 8214beb8d50..5ce11a6bce2 100644
--- a/dev-util/debootstrap/debootstrap-1.0.115.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.115.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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="
app-arch/dpkg
diff --git a/dev-util/debugedit/debugedit-4.14.2-r2.ebuild b/dev-util/debugedit/debugedit-4.14.2-r2.ebuild
index f14f43e3c56..99c6e92c458 100644
--- a/dev-util/debugedit/debugedit-4.14.2-r2.ebuild
+++ b/dev-util/debugedit/debugedit-4.14.2-r2.ebuild
@@ -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 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="
diff --git a/dev-util/desktop-file-utils/Manifest b/dev-util/desktop-file-utils/Manifest
index 668a0227b87..81b434acf96 100644
--- a/dev-util/desktop-file-utils/Manifest
+++ b/dev-util/desktop-file-utils/Manifest
@@ -1 +1,2 @@
DIST desktop-file-utils-0.23.tar.xz 132000 BLAKE2B 95273125dd8332db7438c3a4a7a5ecc4566d552c1fc9ff94a68fdf13f5fca74f943e02a10b1fb4417494f9fd44daa9f80c519215982cee8e082648027a010e7b SHA512 66a8ddfbb2be8edc14e16427e0dafa6fb1ef7491c816f19221fb5d5782e964cdcc3ae89807339f1c565af828aa83403cc56edeb2d03b3f93e013f3c5e9e6fe6a
+DIST desktop-file-utils-0.24.tar.xz 137424 BLAKE2B 3cce27caa14782ef10886fdc0602c0378c1bad0d49a4b99077436a9951f13ccdb539fdc2b9d27b54430fce94fb0ee0268746b216cc5d6c1b9ba517e1af81b4ce SHA512 b19d700d4403c8757c62e49bb7650e0138a85e799f79de07b0d0099a52398a3ead90c8125ccc883df6e2a3f8f5f97696009ebb7452dc7acc25afeef20e06fde0
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.23.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.23.ebuild
index 2135025ef09..e3606f62447 100644
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.23.ebuild
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.23.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="emacs"
RDEPEND=">=dev-libs/glib-2.12:2
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild
new file mode 100644
index 00000000000..ea5cfbc8ebf
--- /dev/null
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit elisp-common
+
+DESCRIPTION="Command line utilities to work with desktop menu entries"
+HOMEPAGE="https://freedesktop.org/wiki/Software/desktop-file-utils"
+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 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="emacs"
+
+RDEPEND=">=dev-libs/glib-2.12:2
+ emacs? ( virtual/emacs )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ app-arch/xz-utils
+ virtual/pkgconfig
+"
+
+SITEFILE=50${PN}-gentoo.el
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README )
+
+src_prepare() {
+ default
+ sed -i -e '/SUBDIRS =/s:misc::' Makefile.in || die
+}
+
+src_configure() {
+ econf "$(use_with emacs lispdir "${SITELISP}"/${PN})"
+}
+
+src_compile() {
+ default
+ use emacs && elisp-compile misc/desktop-entry-mode.el
+}
+
+src_install() {
+ default
+ if use emacs; then
+ elisp-install ${PN} misc/*.el misc/*.elc || die
+ elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+ fi
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index 9c56917e7e0..a4dd31b08ce 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -1,4 +1,3 @@
DIST dialog-1.3-20170131.tgz 507783 BLAKE2B a98c436eabc8d06619bd64a8b1d647a0712630f0f89565253636ef2f38333ca6926177aa0c2001305b0c06fc7a1f576cda87da493183402ef9ec3cdc3fa8be23 SHA512 818b4e9d0d5ee55377b78ccceacf59a78e5e6d6fbc09e24a19e62b4988ff8de32f3364132b9ee88c86e126114eda45c82d86397d5f26fae81a6bda91be979786
-DIST dialog-1.3-20181022.tgz 531815 BLAKE2B c6a34010eb991683356338009998964fde60bcae4181d8b07e6d5b9f0d0e9a61d3f0b112fad02c151b1774380e18b87f93f43fdfe35e0fba86914c029eaa274c SHA512 5d7891086ab6d2f4a815538513b09754a56368bbb0ec3bd107346fd2ed6ae10fa858173447fa609cce28a91e234ed8067d9439efeb973593fff2df1e811a8925
-DIST dialog-1.3-20181107.tgz 531872 BLAKE2B 7724d66bbb953ff118baf5f135810f40fca30bde6a4a340306da322e9adb4b40e105376c316945b7f70ee2be2698f1bee88bd040c22b5662685448145ccff0a8 SHA512 69cb367bc9a1d6dcd69b74f7eae9b4318f0bfd9c0eae48144da119df10f7f81ed4c215a8882d72dfbbd9ff41c5e591c80b168b9552e014454cc80c9aa37dca55
-DIST dialog-1.3-20190211.tar.gz 534749 BLAKE2B 3b721cf98b961c60a97975b7720722d4a46a47d7b861fb7c27de2db2fc3fa704d249b40bf28a6845f68cffabf41b66d77d5f1acf49a342e38cb83a24907e9379 SHA512 247639190c97c1baa6aa2cc75bc17593a0e33fcfcfd6dbc4a1903b55709f8f102c965de03f0620c48463f018525eb77f9b62b39db8331b811a227bbf39b254c4
+DIST dialog-1.3-20190728.tar.gz 534764 BLAKE2B c38df2a2a71036a60c08b2f9caa0cb0b6be9f07ed0137d592ed48c6f3e57a0d24760ff85df44f0fdb4cc690b47c6a206f6eaf84a7ea7e71366424dedb7a9e1d6 SHA512 e539f9691fbca289192deec87439b9d6a463b875b24082f6684c2a1c7f7b46bed1ba29a5380dd93dadd800a99bc7c60c9d065d7230bf21dcfbb8f361d7d15de6
+DIST dialog-1.3-20190808.tar.gz 537376 BLAKE2B 38c849ef12ae6c5fc703fe5f8d172c92ba9c6d498e163d622b5dfc7c638a7058fbca79ecfbf1f3e4f274fd53c6cce0d4ef0f67fc5efb8dc16b451064d609e214 SHA512 780cecaf68616723242426f9e78c772f81ec63f0761f67061c4fa06510ba9ca229c921ee15443b63c1581726751f79bf3e6d3b6b8148bbbb3a986043b6b82f86
diff --git a/dev-util/dialog/dialog-1.3.20181022.ebuild b/dev-util/dialog/dialog-1.3.20181022.ebuild
deleted file mode 100644
index 1d1adc03257..00000000000
--- a/dev-util/dialog/dialog-1.3.20181022.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils multilib versionator
-
-DIA_P="${PN}-$(replace_version_separator 2 '-')"
-DESCRIPTION="tool to display dialog boxes from a shell"
-HOMEPAGE="https://invisible-island.net/dialog/"
-SRC_URI="https://dev.gentoo.org/~jer/${DIA_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="examples minimal nls static-libs unicode"
-
-RDEPEND="
- >=sys-libs/ncurses-5.2-r5:=[unicode?]
-"
-DEPEND="
- ${RDEPEND}
- nls? ( sys-devel/gettext )
- !minimal? ( sys-devel/libtool )
- !<=sys-freebsd/freebsd-contrib-8.9999
-"
-S=${WORKDIR}/${DIA_P}
-
-src_prepare() {
- default
- sed -i -e '/LIB_CREATE=/s:${CC}:& ${LDFLAGS}:g' configure || die
- sed -i '/$(LIBTOOL_COMPILE)/s:$: $(LIBTOOL_OPTS):' makefile.in || die
-}
-
-src_configure() {
- econf \
- --disable-rpath-hack \
- $(use_enable nls) \
- $(use_with !minimal libtool) \
- --with-libtool-opts=$(usex static-libs '' '-shared') \
- --with-ncurses$(usex unicode w '')
-}
-
-src_install() {
- use minimal && default || emake DESTDIR="${D}" install-full
-
- use examples && dodoc -r samples
-
- dodoc CHANGES README
-
- prune_libtool_files
-}
diff --git a/dev-util/dialog/dialog-1.3.20190211.ebuild b/dev-util/dialog/dialog-1.3.20190728.ebuild
index 021642f2571..021642f2571 100644
--- a/dev-util/dialog/dialog-1.3.20190211.ebuild
+++ b/dev-util/dialog/dialog-1.3.20190728.ebuild
diff --git a/dev-util/dialog/dialog-1.3.20181107.ebuild b/dev-util/dialog/dialog-1.3.20190808.ebuild
index 1d1adc03257..021642f2571 100644
--- a/dev-util/dialog/dialog-1.3.20181107.ebuild
+++ b/dev-util/dialog/dialog-1.3.20190808.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,7 +7,7 @@ inherit eutils multilib versionator
DIA_P="${PN}-$(replace_version_separator 2 '-')"
DESCRIPTION="tool to display dialog boxes from a shell"
HOMEPAGE="https://invisible-island.net/dialog/"
-SRC_URI="https://dev.gentoo.org/~jer/${DIA_P}.tgz"
+SRC_URI="https://dev.gentoo.org/~jer/${DIA_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/15"
diff --git a/dev-util/diffoscope/metadata.xml b/dev-util/diffoscope/metadata.xml
index c6b5b3df221..3899d895c5b 100644
--- a/dev-util/diffoscope/metadata.xml
+++ b/dev-util/diffoscope/metadata.xml
@@ -13,7 +13,6 @@
</longdescription>
<use>
<flag name="binutils">Use <pkg>sys-devel/binutils</pkg></flag>
- <flag name="colord">Use <pkg>x11-misc/colord</pkg></flag>
<flag name="cpio">Use <pkg>app-arch/cpio</pkg></flag>
<flag name="diff">Use <pkg>sys-apps/diffutils</pkg></flag>
<flag name="docx">Use <pkg>app-text/docx2txt</pkg></flag>
diff --git a/dev-util/dogtail/dogtail-0.9.10.ebuild b/dev-util/dogtail/dogtail-0.9.10.ebuild
index dee95fd8941..982905cafca 100644
--- a/dev-util/dogtail/dogtail-0.9.10.ebuild
+++ b/dev-util/dogtail/dogtail-0.9.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.com/${PN}/${PN}/raw/released/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE=""
RDEPEND="
diff --git a/dev-util/drone-cli/Manifest b/dev-util/drone-cli/Manifest
index f2f39e84507..f50a0fcab40 100644
--- a/dev-util/drone-cli/Manifest
+++ b/dev-util/drone-cli/Manifest
@@ -2,3 +2,5 @@ DIST drone-cli-0.8.6.tar.gz 1778122 BLAKE2B 040c93386330990a5f4e38f6ca353226145a
DIST drone-cli-1.0.8.tar.gz 2724807 BLAKE2B f8bdbd90687e59cf104d3506957616c13ddfae5e31bde0569eaa36644da40310fb24396cc49527b454478de7ef1e3cdcfa6b0b07c6b0f1b80fac9210ddd336e7 SHA512 67f7ab7c8b4d215564421470bd3894670b0b28fe8ffdcc9ed15be9081fcce380ad1ab791d463f09f441a28c17285f507b64fcd43104a369e0f8dbc39300ba91a
DIST drone-cli-1.1.0.tar.gz 2725959 BLAKE2B 684d03de78c07fd3a901132734c0e8f9fef129f4443b9af33a1b2205168289e3bfb357faf21e5d5e63f6fae21d864a475575cb3d1f60a499b846963cde7814e0 SHA512 ba059250cf73982b662e5fb9f4570381ca4ff2618a759dc497f793e7bba7d7094cc28fb90390c61b642caab0ee5d33ddc1c5a25cea13c6aaea8e50ac24868927
DIST drone-cli-1.1.1.tar.gz 2840804 BLAKE2B 393e4f0cabc30c322dd31b5d3c7bdd846a3960eaab532669020e55a7b83ca7884125a0c47c5a1540101b0ad6dbc3f147470e18164cbe4f79dbc93dc033081abe SHA512 bc75683a6aea1d11c22a635a4386c3c0ead17f15f0b59ebc692fa0a5a346e90b3e6d1b16bdc21f807c91080f3c969d254db2cefb07113b3e4b3409425eebacc3
+DIST drone-cli-1.1.3.tar.gz 2841895 BLAKE2B 8e44ed377064d7e08184f56457390caef7861bb1ab5512e4ec679cd6e9a0ca018311b2d8abe0df2323eaa9ceada89323517d5c934781093905121c3f6eb52123 SHA512 423c0907499119137fea014b4f6d51154f98b82f4fadf69852bbb0722ae29d9a8e62ff49aa19f92dfcaa676385acc03ef3fd2a51553369d607473dd29b1453cc
+DIST drone-cli-1.1.4.tar.gz 2843182 BLAKE2B 395501216d09f907897d3d5f7a64e93956786030a354365400e8ec73e2ecb361958f7f9468c3819a77908251450954c91db7369f803516ff2fbeb2050ad6efe7 SHA512 6a0df849f4086913137e36248925fea70e106b95225708bfd37b9a23199d4bed35c6fa18757311cfe23e8c8eef5d66acde207827a7220cec868ffe515539471f
diff --git a/dev-util/drone-cli/drone-cli-1.1.3.ebuild b/dev-util/drone-cli/drone-cli-1.1.3.ebuild
new file mode 100644
index 00000000000..ca7f0b0fdc7
--- /dev/null
+++ b/dev-util/drone-cli/drone-cli-1.1.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/drone/drone-cli"
+
+inherit golang-build golang-vcs-snapshot
+
+ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Command-line interface for Drone"
+HOMEPAGE="https://github.com/drone/drone-cli"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+RDEPEND="!!<dev-util/drone-0.7"
+
+src_compile() {
+ pushd src || die
+ GOPATH="${WORKDIR}/${P}"\
+ go install -ldflags "-X main.version=${PV}" ${EGO_PN}/drone || die
+ popd || die
+}
+
+src_install() {
+ dobin bin/drone
+ dodoc src/${EGO_PN}/README.md
+}
diff --git a/dev-util/drone-cli/drone-cli-1.1.4.ebuild b/dev-util/drone-cli/drone-cli-1.1.4.ebuild
new file mode 100644
index 00000000000..ca7f0b0fdc7
--- /dev/null
+++ b/dev-util/drone-cli/drone-cli-1.1.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/drone/drone-cli"
+
+inherit golang-build golang-vcs-snapshot
+
+ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Command-line interface for Drone"
+HOMEPAGE="https://github.com/drone/drone-cli"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+RDEPEND="!!<dev-util/drone-0.7"
+
+src_compile() {
+ pushd src || die
+ GOPATH="${WORKDIR}/${P}"\
+ go install -ldflags "-X main.version=${PV}" ${EGO_PN}/drone || die
+ popd || die
+}
+
+src_install() {
+ dobin bin/drone
+ dodoc src/${EGO_PN}/README.md
+}
diff --git a/dev-util/edb-debugger/metadata.xml b/dev-util/edb-debugger/metadata.xml
index cf47b0a1cf3..d22e537d27a 100644
--- a/dev-util/edb-debugger/metadata.xml
+++ b/dev-util/edb-debugger/metadata.xml
@@ -11,7 +11,6 @@
</maintainer>
<use>
<flag name="legacy-mem-write">Probe if writes to /proc/PID/mem are broken.</flag>
- <flag name="graphviz">Add support for the Graphviz library</flag>
<flag name="jumbo-build">Experimental jumbo (also known as unity) build capability</flag>
<flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>
</use>
diff --git a/dev-util/edi/metadata.xml b/dev-util/edi/metadata.xml
index 8b902f0f90c..9fbd2808478 100644
--- a/dev-util/edi/metadata.xml
+++ b/dev-util/edi/metadata.xml
@@ -2,11 +2,8 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>juippis@gmail.com</email>
- </maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
+ <email>juippis@gentoo.org</email>
+ <name>Joonas Niilola</name>
</maintainer>
<use>
<flag name="clang">
diff --git a/dev-util/electron/Manifest b/dev-util/electron/Manifest
index e28f90476e0..df07a0f907b 100644
--- a/dev-util/electron/Manifest
+++ b/dev-util/electron/Manifest
@@ -1,31 +1,13 @@
DIST asar-0.13.0.tar.gz 1622264 BLAKE2B 018bccc3d2b54040fe7c6e6c1ecfbe0ab4d52554feab78fae41a09d35b7e934720cba45f77239eda46d746390c4f072b3e0eecdf7f0953882d6f27cb940de018 SHA512 619b59e9576a185905b455b780630188ce32aed72b424c69967a7bf15236d1edf2f5d92f7dde972599679c88fe0a80f05295a3d82b2ae0944be08d332a659aee
DIST browserify-14.0.0.tar.gz 1847439 BLAKE2B 50d84f51d8640fa881751339e1d37f04d6ba3ea5aa17222c1e9a29bc805ade5f14ce95bb97fb494e0a1a71e6a5da672566aeb0fbbea4b48d9ad19d20405a0b11 SHA512 fea8219ab2c5b422c15cc8c305a8aa0396f3de46c8d602eb4976af1d2b0a043214f808e3fa8e31cae0ad7c76d9ddc38239d0208911105f9c851efddfaf96b0c7
-DIST chromium-56.0.2924.87.tar.xz 514429808 BLAKE2B 96e688230266f00917c6a6ebfaeb9b4e1cbe882a6bd907034a339d7a7b36fe97b451978898fb910938a36e47a9e25fb88117fe764dae759127d391e902533b47 SHA512 1c154004a9bca73e2491c73520a5f7d5c50c5b9d66e8e2660bf46585dd9b6ad3db706a9d824356f319794fa790bc3918ae6199843bcba717b9e74efbf26882c9
-DIST chromium-58.0.3029.110.tar.xz 518167664 BLAKE2B dc9b4eee10236b892c82c6c12f649aed30454124496794485430e6119ee83e420564b2f2fbd21a3d1525cfb3de3524210c50770cbf74b2dbfdb18b35445a740a SHA512 412dc94e23d6699b959f23956f5f82f4c600050649a8a2e694bb2c6e166245e3670f4549ee1c08a0df05b4e361f040d1739515180b8631adbfac9c907af8d93f
DIST chromium-61.0.3163.100.tar.xz 556305252 BLAKE2B 88b9dc05d626ec33c2044cd8bb5a5bd2e36c4ba5c231230b5b6529d62cc100874099d17633ca320a0c668b130797d6b222107d2efcd6f80b5b0b460d378f4454 SHA512 4dfd3a493ceb7c605eeab6f387541273d529e8b935a6104927e34836469aedcfcbb4a1154591585621d5c2e842e68701d32328acba842f840a20498822165f78
-DIST electron-1.6.18.tar.gz 4965032 BLAKE2B ecb085a75717fb472740583dbd31634bd8b4be8365fdaf3334e558a8076577d3a973ba78c87136bdf42be14a8fcbe0b7816f49a1eccc162c62941485a2bb09fb SHA512 bd10d34e9a91350671a8c1af807fd01d7379bd7c9eca7c3f096349a5dbefaa78e063ee6a27fa5029a19daec0ca70fbe45f9964e27945a5f47ac83416540aacda
-DIST electron-1.7.16.tar.gz 5174554 BLAKE2B 421fde393533c4af26a046a3a1a6ef067306ac6990fe9b7f74436b00e939b85d07f39bb7b9f02547288105adfd069f2640238e83cf444a3a99723441da0556f9 SHA512 84815598f14330916dc65f1326a841e73a8c1551c4b9ba21667562f6c67eb770529b3049d53951e91b07356e4d7cfc3ed3a5e3722305d7282adfc871c3195a35
-DIST electron-2.0.10.tar.gz 3012289 BLAKE2B 3d4f2560e754917c7e72e6450ccf9d6d5f8a7741fb5c426d6db9cad01780be5531671bea55eb9033f5de288617d8cc366a17b1a77eac5bd32440ff8e9ee53a5e SHA512 5663e9b018a51bf7f7c87a8c5b51cf631a91980bf01fdcb207f2054da2bfaffdebfe027bd8c27dfa0af523fd09ec1c52076a7f6de9c5bf9a0ffbb898d1797b59
DIST electron-2.0.17.tar.gz 3015019 BLAKE2B 314d155e772492d81ca2b092b9ee264a82feffdfc85c05a4f18e4f9c3b151afb8012bdab2e1edbc8889db0433c04d6124b539ed7cc974dc23a43286c058a19a6 SHA512 8ecf9786b4b77483f1c3b77789a91b997254645343fff9a30cf846715a2eba53f338eb2de2eee2dd1164424c07697ffe3d21931c56f373e70e77f8e0a96bee0a
DIST electron-breakpad-67f738b7adb47dc1e3b272fb99062f4192fa6651.tar.gz 5168487 BLAKE2B 41583e3297c2e8a612720f2087720cb7bc4ebf0aaaf5481029bd65458b26e5e824da283f474cf70d8933f80538e9f6c4b8a5843f27a6448b727ec9f12578b526 SHA512 303d1545dbe8e5fdece0fcd90c2ad09fab24483b176df1491580b9b382a607c0a814681cd58bcb7166b9cfc5af882a2b0d2fcc175d23f747b37c921040b68310
-DIST electron-breakpad-e35167de7516448fcc2bf687ad580b9d8b6aedc2.tar.gz 5161275 BLAKE2B a8414bb2876031f71e5c0c9263cf7ee03c4af9d8dee2890bb4c39c82869282bc20b4c2807068ab72bcb96e71559dbea083ca27b9cddbc991bf1dc7e6c16a5dc3 SHA512 dce89f5976ddac0f87f70f11cc5fdf44a29198b302ed6eecd2c7530ccb33613563ef2ce797b7187c986d3b900b212eede8530e1e8f3b6a88ac727ff9623dd333
-DIST electron-brightray-909c49265493bd095c27cefd999567be2107899a.tar.gz 98022 BLAKE2B a90ab9d0480c1d1f7d5f40ccf9bf8f4568175c9662bc47f9754a293018d6cc8930cf6e104aea57f660893c44837b3f48ddaacc3bdc2bcf347f1a60f93a987f4a SHA512 e1df1159a97c87e1edce9ea896d790e3004cc836d879385cdc5324c1961209ebf884fb7771861f4c6bf86b50ff1d8818540555bbcc77bf10987e0a68cd855127
DIST electron-chromium-breakpad-82f0452e6b687b3c1e14e08d172b2f3fb79ae91a.tar.gz 1141359 BLAKE2B 7145fc178dcb62e9f14123da03e98f5e37c29f3a58799e675b3638eb0694771d1320de8bc70d97daa5c8c21db548efa3aa3c86d2018d6cea95f288b39cae4020 SHA512 4c8353a34061f4e061bb9e23945c0fb7a56f1b9f249b323cd3315cafcecdaca5c1f63940e2334ded03413cf26f5aa4a5bd8f1720fb2ba422a97d70f121d7d3d4
-DIST electron-chromium-breakpad-c566c50d81f7b1edeaee9f11f5d07bda858d6b64.tar.gz 1141356 BLAKE2B 6a16d29639c668a6360514ed56373f4da5396650ba63d3aa7a3bca66a89ef1b2244bbe4a2e02ea0439f999c872bbb12e0d1289051c49cebf3d931ae7255b83b7 SHA512 9fb07facb147d401655cefea103cb1499de9ca27093c756a3b5d6ff1117a288ac491fedf01df61775ce6590e852e942cf7db1e135d6d30e94188283a53dd8e10
DIST electron-grit-9536fb6429147d27ef1563088341825db0a893cd.tar.gz 378461 BLAKE2B cb194cca884419f1c85524740860db244b06a237428add2cd9afaae8e0fe63ccb266b8e5e44f2125da57d263f167aec6c46c9c3451c5217100d58825f4322ecd SHA512 515797740421d5f80912b33dab2039c35b2ae432a0c4351aa031461ef6c82b7a1775c3d4d41ba6c646f81ba3ddf3bbfcb35b81da1ef88b486a2a67d15f09ec86
-DIST electron-libchromiumcontent-4a4acde5522c21fe2f0a21f5ca29f99e90b03adc.tar.gz 73046 BLAKE2B 051b69473c5a97746aa2f18fc94d4909ad52e0a0edc638ba3950d70b46fb798523da0d62f4a7f427187f80406f8efc3c9e04039f90567521c4f29adb0ab82fbf SHA512 960f8b27adcf0df459bae024092971e8c10f1dfa933e3374303d7fd0ecaf2cf201674c474dfce6500609d229f1b4441968dfbc46a2d6220723b7ceebec277dba
-DIST electron-libchromiumcontent-a9b88fab38a8162bb485cc5854973f71ea0bc7a6.tar.gz 427806 BLAKE2B 21274045953499b7656366520d93acb63515995e7d6614afa5bba097e80bf833611fd715f0a8782dbdcb3c7c11ce2c4f5c2789483d4847e5bd73567123022dfd SHA512 da23b6119aa39d2ebc39b20280e2b6c0c26eba3e45271a3b8b196149ae8fb17f7ae63b97821ecdbc74c8d28617e361a3570e89c716d560a3b0caa7fa1f673f09
-DIST electron-libchromiumcontent-cbd04c0dccc7655cd42f02baee3a622d5170ac08.tar.gz 161487 BLAKE2B de2f7f708aafc2f9033fb0dbee50880f9441196c81ba355bae966a1ffbb0c2f30c86cbb30021af599ac3abf071431f99c07a7a51b45db41901624148e1988369 SHA512 f207fdddecda879ff3c83e1503af0e919c1f6fe2e3666ac9d40c9fc21dfb3a679e1f0ab3ce7b89057a412934c5a9c96ed846761c669875ee0c3a1955308be184
DIST electron-libchromiumcontent-daf9bdcdfdfd6bad258b5e1e48b2e17d06c1a987.tar.gz 168368 BLAKE2B f915cb7e0f6be5f64c3bca64a121c1acf39d0a11cd67c4113d29757f7f44827d5807058c4b29e04c0ae8ab053e42aa66ba3da57b0a9b9bd4c7f22e7f56b91aae SHA512 6d4ca21f463540eec825dfe5075770b341de606c1726ce443b72cdf09c7153e201dbc7c2a4bacdcd926634e9b3795e59b3f1b27f017c7bc0a7507c9a4b6f5ce5
DIST electron-native-mate-6a3d238b7e1e3742f2bb495336a84021d927a24f.tar.gz 24130 BLAKE2B b807a13d01ccd07a3310d8551cafee69a111bb342ee9e15bc0a20243c6f98638e3f18ddd716389fcabace064d4b98acbe50ff6eed862d8d46d152c8bd6f562b2 SHA512 c9ca33f7f96f52aae132f0e4cbd141fe28cea96b9e2c9fadcac40e3bd09d417469fac2851ad1c49790a4533174df0bec9d5ad45203a1358b3d4a2c0df49903fa
-DIST electron-native-mate-7d9c1a80f025f4c46f7da8ea73246fe0f1968579.tar.gz 24066 BLAKE2B 622d0ee16fd35a98c154bad7cd271350b6d0c2da0d1df1b0effde6ddb52eea3530921a746c96eed2130ae403c3ef00dac8a86a8a896afcc9b4e74d03a17fb727 SHA512 99a6e67469852a84a7a4b1585a1ff9d32491f9bab511a3853c630ac30bf1c703d0b1c0f8830a546f2665dfe87f1f582860dfabb332909f6973e64dff2ed4b5f4
-DIST electron-native-mate-fd0e7dc4ab778f0d1ccda6c9640464ea06ee771e.tar.gz 23926 BLAKE2B 72ec5ee020ac18c5b3a8b6552698ed845cb0c401c0b02a4627479c98c581018658471df95de9d242db85ac9a4588b5f80b488180049271322545d69ecbf01123 SHA512 8715c417473340163ca3db2754ab10619679ac72378ff5c7f63899fe891d5c83e7b3db6832af885de63eb5a732ed54f393bcc3aeb8ddd38569e74023c46f72ac
DIST electron-node-51abeb37cad3f2098c0f0fffdff739f4ac2393e8.tar.gz 50344964 BLAKE2B 36f91e8ae7d1ae4e99c44128398589e015224c664c86d3869327a4c433fdf8efdb758d4462ec3d8997399bf6d62cfe63f91ae8ee4886aab7817b1654c94592a2 SHA512 8f31577a4ef836b5535ec69d8a020c06e92c01667a0d4b857fcb6789025a6903d42ba3f9b51fd0828d39e88dd7ba44a07cfb3a59023b04c4f5cb89e1a27874bc
-DIST electron-node-9b1683e7000481ec6214eafa3eef7ac4594eb410.tar.gz 46194500 BLAKE2B 36537f40a597f9ed969abe385de8cf58fd2f48526021461ab5feb0e061a2dc0d4a49109191254e69b685101f6aa79d1c870091f0eae251ba8b3bc0b3e6a975e6 SHA512 f258cf5597154e976e1e4c0b81f6b63e9b344e4a28492137b80d59dc841490d4ad69e6bab2456a6334a42e51dfe2862cc389e837a4baac90a698ff60e5b08ab4
-DIST electron-node-a992f2ff412b85606ec1d4c1eb00ad832fa1e640.tar.gz 46772284 BLAKE2B 453ade1d1540f099d7225f3c758fc1455dcae3a6b8ada00c20b85519bfd61beb3fc3beb083f063de2ce52c5b2e83eb67acea23f2605e201031b42552747e522b SHA512 532bc27e026fd032e8747150bac885277ae2e6cede3053e61690b846e380d664daa0b49e843c44d937a5f84f902f149323b8dc873dcfcf8ddc27b6feb1df750d
-DIST electron-patches-b04011d68866c1159eb35b1a5260d519172cc05b.tar.gz 92135 BLAKE2B f8b1bb5523021734901e0e1a8a01e565e2f826a1f861a7e38e19f92b214035e2fe4f3ac27d411ff129597ceaaac5fee43a6981158adbf4f4f3711424bfe7dae0 SHA512 fff7172ed830a948a70bedb9fbd34f22fa9cc7c995b1ce852ffa75ed4e69d9867b399864857f958334e857616c297e7f8cb0a5e49d263b6d1958ce22fd71ef3d
-DIST electron-patches-f0fb7725cfe73704dce84ec51bdccc024dc7ceff.tar.gz 88340 BLAKE2B 759f8da023fae94ac0639387ace26694b2ff9dfd978f783cae2f1ccaaf749200ec2cdcfb771fbd3dc8a605521886c8e3383b7ed565eb250f753d238fd30ad6ef SHA512 c542d8fcf95123dc4ebced608ae0d1d9bc04db67f89c50f219bdf4ed8e916059333d1e3571387bf2992b46c3b0a02692f7ec2531920f693db30c7ed401bb73d4
-DIST electron-pdf-viewer-a050a339cfeabcfb5f07c313161d2ee27b6c3a39.tar.gz 38431 BLAKE2B 962b1eeaa74544d57a5664fc6965b9f43e6d94671a08be024bb3001d7cf7e3ee02b2c63c2074e2ed4d6484dc5db7515cb170bf7432a8d11ccf595716e5c4500e SHA512 a028b67c0644d4ddcfc5aee4e2abb305648eb666082ea2c151cb6b9b3972503093cadb32b102aa19b04c8e863c2ac55bb20cccbf2abbf7832f9cfd3c3618612e
+DIST electron-patches-26715595f4fe3658a73adb0d2fb338f62c79e492.tar.gz 115022 BLAKE2B 04f0982d9ac63068fd9e83f53341e43fec8f375d9591777dbcb6612213ecf0473be6d38883cdf0f99fe412f65b494d8765818260ecefd9e77dbd503d5459d9be SHA512 8d05f21d2ab4242cd896f58d1608ccee5ba3b65dae73cacb2261458e2f163e216176276d036cf8fe3375c06a94d08f7a04af79e92eb3d4312d975acd870103d8
DIST electron-pdf-viewer-a5251e497fb52e699b28f627e3cbb6d8cefb62df.tar.gz 42117 BLAKE2B afd5ca8897ff70cc8d1d51855c6b1cfdf9a6e1ffb667c740f323ef9e4e11ed22ecac7e8c0447dbaa6488e4b11ba4e8606e654f792bb42d0b4c805e7d4a32aab4 SHA512 2db9c756ebff5148c6011775b2740671b7ab6693242400b417893eace648720c51e709bd108d766910f24b543b88c60fd292ba9aa8aa88bff1ea40d43961ad5b
-DIST electron-pdf-viewer-beb36874a6b61d7a18b92bf7dcd1f0661e4c59cf.tar.gz 38752 BLAKE2B 0fa9e928d64d31fec04c542cb4a4277497d42c621a500cbcb77783bdd20f6251ac075f779229a1f43645f8181734b8a213fa77dc2b906b7846f725978996b488 SHA512 76f996b4a14290f1c3d061c9c2bb3d5869c53c1ef0e395b8faa6dd3470787dd2c6f492d5dcba18d805c0ccc1c6e2a3a602bf873876075d160f69a899a79d953d
DIST ninja-1.8.2.tar.gz 185226 BLAKE2B c464c50829a0e9f0f6fd4b860946b14bf07f752adb8e7857d4072a1c1f06977eda283f633041929065c9164377ca769b3293b04fc9ceab583371708a9c4e8f2a SHA512 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2
diff --git a/dev-util/electron/electron-1.6.18.ebuild b/dev-util/electron/electron-1.6.18.ebuild
deleted file mode 100644
index fc39f787b71..00000000000
--- a/dev-util/electron/electron-1.6.18.ebuild
+++ /dev/null
@@ -1,883 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
- hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
- sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 eapi7-ver gnome2-utils flag-o-matic multilib \
- multiprocessing pax-utils portability python-any-r1 toolchain-funcs \
- virtualx xdg-utils
-
-# Keep this in sync with vendor/brightray/vendor/libchromiumcontent/VERSION
-CHROMIUM_VERSION="56.0.2924.87"
-# Keep this in sync with vendor/breakpad
-BREAKPAD_COMMIT="c566c50d81f7b1edeaee9f11f5d07bda858d6b64"
-# Keep this in sync with vendor/breakpad/src (and find the corresponding
-# commit in https://github.com/google/breakpad/)
-BREAKPAD_SRC_COMMIT="e35167de7516448fcc2bf687ad580b9d8b6aedc2"
-# Keep this in sync with vendor/brightray
-BRIGHTRAY_COMMIT="909c49265493bd095c27cefd999567be2107899a"
-# Keep this in sync with vendor/node
-NODE_COMMIT="9b1683e7000481ec6214eafa3eef7ac4594eb410"
-# Keep this in sync with vendor/native_mate
-NATIVE_MATE_COMMIT="fd0e7dc4ab778f0d1ccda6c9640464ea06ee771e"
-# Keep this in sync with vendor/pdf_viewer
-PDF_VIEWER_COMMIT="a050a339cfeabcfb5f07c313161d2ee27b6c3a39"
-# Keep this in sync with vendor/pdf_viewer/vendor/grit
-GRIT_COMMIT="9536fb6429147d27ef1563088341825db0a893cd"
-# Keep this in sync with script/lib/config.py:LIBCHROMIUMCONTENT_COMMIT
-LIBCHROMIUMCONTENT_COMMIT="a9b88fab38a8162bb485cc5854973f71ea0bc7a6"
-# Keep this in sync with package.json#devDependencies
-ASAR_VERSION="0.13.0"
-BROWSERIFY_VERSION="14.0.0"
-GENTOO_PATCHES_VERSION="f0fb7725cfe73704dce84ec51bdccc024dc7ceff"
-
-PATCHES_P="gentoo-electron-patches-${GENTOO_PATCHES_VERSION}"
-CHROMIUM_P="chromium-${CHROMIUM_VERSION}"
-BREAKPAD_P="chromium-breakpad-${BREAKPAD_COMMIT}"
-BREAKPAD_SRC_P="breakpad-${BREAKPAD_SRC_COMMIT}"
-BRIGHTRAY_P="brightray-${BRIGHTRAY_COMMIT}"
-NODE_P="node-${NODE_COMMIT}"
-NATIVE_MATE_P="native-mate-${NATIVE_MATE_COMMIT}"
-PDF_VIEWER_P="pdf-viewer-${PDF_VIEWER_COMMIT}"
-GRIT_P="grit-${GRIT_COMMIT}"
-LIBCHROMIUMCONTENT_P="libchromiumcontent-${LIBCHROMIUMCONTENT_COMMIT}"
-ASAR_P="asar-${ASAR_VERSION}"
-BROWSERIFY_P="browserify-${BROWSERIFY_VERSION}"
-
-DESCRIPTION="Cross platform application development framework based on web technologies"
-HOMEPAGE="https://electronjs.org/"
-SRC_URI="
- https://commondatastorage.googleapis.com/chromium-browser-official/${CHROMIUM_P}.tar.xz
- https://github.com/electron/electron/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/electron/chromium-breakpad/archive/${BREAKPAD_COMMIT}.tar.gz -> electron-${BREAKPAD_P}.tar.gz
- https://github.com/google/breakpad/archive/${BREAKPAD_SRC_COMMIT}.tar.gz -> electron-${BREAKPAD_SRC_P}.tar.gz
- https://github.com/electron/brightray/archive/${BRIGHTRAY_COMMIT}.tar.gz -> electron-${BRIGHTRAY_P}.tar.gz
- https://github.com/electron/node/archive/${NODE_COMMIT}.tar.gz -> electron-${NODE_P}.tar.gz
- https://github.com/zcbenz/native-mate/archive/${NATIVE_MATE_COMMIT}.tar.gz -> electron-${NATIVE_MATE_P}.tar.gz
- https://github.com/electron/pdf-viewer/archive/${PDF_VIEWER_COMMIT}.tar.gz -> electron-${PDF_VIEWER_P}.tar.gz
- https://github.com/elprans/grit/archive/${GRIT_COMMIT}.tar.gz -> electron-${GRIT_P}.tar.gz
- https://github.com/electron/libchromiumcontent/archive/${LIBCHROMIUMCONTENT_COMMIT}.tar.gz -> electron-${LIBCHROMIUMCONTENT_P}.tar.gz
- https://github.com/elprans/asar/releases/download/v${ASAR_VERSION}-gentoo/asar-build.tar.gz -> ${ASAR_P}.tar.gz
- https://github.com/elprans/node-browserify/releases/download/${BROWSERIFY_VERSION}-gentoo/browserify-build.tar.gz -> ${BROWSERIFY_P}.tar.gz
- https://github.com/elprans/gentoo-electron-patches/archive/${GENTOO_PATCHES_VERSION}.tar.gz -> electron-patches-${GENTOO_PATCHES_VERSION}.tar.gz
-"
-
-S="${WORKDIR}/${P}"
-CHROMIUM_S="${S}/chromium"
-NODE_S="${S}/vendor/node"
-BREAKPAD_S="${S}/vendor/breakpad"
-BREAKPAD_SRC_S="${BREAKPAD_S}/src"
-BRIGHTRAY_S="${S}/vendor/brightray"
-NATIVE_MATE_S="${S}/vendor/native_mate"
-PDF_VIEWER_S="${S}/vendor/pdf_viewer"
-GRIT_S="${PDF_VIEWER_S}/vendor/grit"
-LIBCC_S="${BRIGHTRAY_S}/vendor/libchromiumcontent"
-
-LICENSE="BSD"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-IUSE="cups custom-cflags gnome gnome-keyring kerberos lto neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc"
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
-
-# Native Client binaries are compiled with different set of flags, bug #452066.
-QA_FLAGS_IGNORED=".*\.nexe"
-
-# Native Client binaries may be stripped by the build system, which uses the
-# right tools for it, bug #469144 .
-QA_PRESTRIPPED=".*\.nexe"
-
-COMMON_DEPEND="
- app-arch/bzip2:=
- >=app-eselect/eselect-electron-2.0
- cups? ( >=net-print/cups-1.3.11:= )
- >=dev-libs/elfutils-0.149
- dev-libs/expat:=
- dev-libs/glib:2
- >=dev-libs/icu-58:=
- >=dev-libs/jsoncpp-0.5.0-r1:=
- dev-libs/nspr:=
- >=dev-libs/nss-3.14.3:=
- >=dev-libs/re2-0.2016.05.01:=
- gnome? ( >=gnome-base/gconf-2.24.0:= )
- gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
- >=media-libs/alsa-lib-1.0.19:=
- media-libs/fontconfig:=
- media-libs/freetype:=
- media-libs/libexif:=
- media-libs/libjpeg-turbo:=
- media-libs/libpng:=
- media-libs/libvpx:=[svc]
- media-libs/speex:=
- pulseaudio? ( media-sound/pulseaudio:= )
- system-ffmpeg? ( >=media-video/ffmpeg-3:= )
- sys-apps/dbus:=
- sys-apps/pciutils:=
- >=sys-libs/libcap-2.22:=
- virtual/udev
- x11-libs/cairo:=
- x11-libs/gdk-pixbuf:2
- x11-libs/libdrm
- x11-libs/libnotify:=
- x11-libs/libX11:=
- x11-libs/libXcomposite:=
- x11-libs/libXcursor:=
- x11-libs/libXdamage:=
- x11-libs/libXext:=
- x11-libs/libXfixes:=
- >=x11-libs/libXi-1.6.0:=
- x11-libs/libXinerama:=
- x11-libs/libXrandr:=
- x11-libs/libXrender:=
- x11-libs/libXScrnSaver:=
- x11-libs/libXtst:=
- x11-libs/pango:=
- app-arch/snappy:=
- dev-libs/libxml2:=[icu]
- dev-libs/libxslt:=
- media-libs/flac:=
- >=media-libs/harfbuzz-1.3.1:=[icu(+)]
- >=media-libs/libwebp-0.4.0:=
- sys-libs/zlib:=[minizip]
- kerberos? ( virtual/krb5 )
-"
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND="${COMMON_DEPEND}
- !<dev-util/electron-0.36.12-r4
- x11-misc/xdg-utils
- virtual/opengl
- virtual/ttf-fonts
- x11-libs/gtk+:2
- selinux? ( sec-policy/selinux-chromium )
- tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
-"
-# dev-vcs/git - https://bugs.gentoo.org/593476
-DEPEND="${COMMON_DEPEND}
- >=app-arch/gzip-1.7
- !arm? (
- dev-lang/yasm
- )
- dev-lang/perl
- dev-perl/JSON
- >=dev-util/gperf-3.0.3
- dev-util/ninja
- net-libs/nodejs
- sys-apps/hwids[usb(+)]
- >=sys-devel/bison-2.4.3
- sys-devel/flex
- virtual/pkgconfig
- dev-vcs/git
- x11-libs/gtk+:2
- x11-libs/gtk+:3
- $(python_gen_any_dep '
- dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
- >=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]
- dev-python/html5lib[${PYTHON_USEDEP}]
- dev-python/simplejson[${PYTHON_USEDEP}]
- ')
-"
-
-# Keep this in sync with the python_gen_any_dep call.
-python_check_deps() {
- has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" &&
- has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" &&
- has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" &&
- has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]"
-}
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
- EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-pre_build_checks() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- local -x CPP="$(tc-getCXX) -E"
- if tc-is-clang && ! ver_test "$(clang-fullversion)" -ge 3.9.1; then
- # bugs: #601654
- die "At least clang 3.9.1 is required"
- fi
- if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 4.9; then
- # bugs: #535730, #525374, #518668, #600288
- die "At least gcc 4.9 is required"
- fi
- fi
-
- # LTO pass requires more file descriptors
- if use lto; then
- local lto_n_rlimit_min="16384"
- local maxfiles=$(ulimit -n -H)
- if [ "${maxfiles}" -lt "${lto_n_rlimit_min}" ]; then
- eerror ""
- eerror "Building with USE=\"lto\" requires file descriptor" \
- "limit to be no less than ${lto_n_rlimit_min}."
- eerror "The current limit for portage is ${maxfiles}."
- eerror "Please add the following to /etc/security/limits.conf:"
- eerror ""
- eerror " root hard nofile ${lto_n_rlimit_min}"
- eerror " root soft nofile ${lto_n_rlimit_min}"
- eerror ""
- die
- fi
- fi
-
- # Check build requirements, bug #541816 and bug #471810 .
- CHECKREQS_MEMORY="3G"
- use lto && CHECKREQS_MEMORY="7G"
- CHECKREQS_DISK_BUILD="5G"
- eshopts_push -s extglob
- if is-flagq '-g?(gdb)?([1-9])'; then
- CHECKREQS_DISK_BUILD="25G"
- CHECKREQS_MEMORY="16G"
- fi
- eshopts_pop
- check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
- pre_build_checks
-}
-
-pkg_setup() {
- pre_build_checks
-
- # Make sure the build system will use the right python, bug #344367.
- python-any-r1_pkg_setup
-
- chromium_suid_sandbox_check_kernel_config
-}
-
-_unnest_patches() {
- local _s="${1%/}/"
- local path
- local relpath
- local out
-
- (find "${_s}" -mindepth 2 -name '*.patch' -printf "%P\n" || die) \
- | while read -r path; do
- relpath="$(dirname ${path})"
- out="${_s}/__${relpath////_}_$(basename ${path})"
- sed -r -e "s|^([-+]{3}) ([ab])/(.*)$|\1 \2/${relpath}/\3|g" \
- "${_s}/${path}" > "${out}" || die
- done
-}
-
-_get_install_suffix() {
- local c=(${SLOT//\// })
- local slot=${c[0]}
- local suffix
-
- if [[ "${slot}" == "0" ]]; then
- suffix=""
- else
- suffix="-${slot}"
- fi
-
- echo -n "${suffix}"
-}
-
-_get_install_dir() {
- echo -n "/usr/$(get_libdir)/electron$(_get_install_suffix)"
-}
-
-_get_target_arch() {
- local myarch="$(tc-arch)"
- local target_arch
-
- if [[ $myarch = amd64 ]] ; then
- target_arch=x64
- elif [[ $myarch = x86 ]] ; then
- target_arch=ia32
- elif [[ $myarch = arm64 ]] ; then
- target_arch=arm64
- elif [[ $myarch = arm ]] ; then
- target_arch=arm
- else
- die "Failed to determine target arch, got '$myarch'."
- fi
-
- echo -n "${target_arch}"
-}
-
-src_prepare() {
- mv "${WORKDIR}/${CHROMIUM_P}" "${CHROMIUM_S}" || die
- rm -r "${NODE_S}" &&
- mv "${WORKDIR}/${NODE_P}" "${NODE_S}" || die
- rm -r "${BREAKPAD_S}" &&
- mv "${WORKDIR}/${BREAKPAD_P}" "${BREAKPAD_S}" || die
- rm -r "${BREAKPAD_SRC_S}" &&
- mv "${WORKDIR}/${BREAKPAD_SRC_P}/src" "${BREAKPAD_SRC_S}" || die
- rm -r "${BRIGHTRAY_S}" &&
- mv "${WORKDIR}/${BRIGHTRAY_P}" "${BRIGHTRAY_S}" || die
- rm -r "${NATIVE_MATE_S}" &&
- mv "${WORKDIR}/${NATIVE_MATE_P}" "${NATIVE_MATE_S}" || die
- rm -r "${PDF_VIEWER_S}" &&
- mv "${WORKDIR}/${PDF_VIEWER_P}" "${PDF_VIEWER_S}" || die
- rm -r "${GRIT_S}" &&
- mv "${WORKDIR}/${GRIT_P}" "${GRIT_S}" || die
- rm -r "${LIBCC_S}" &&
- mv "${WORKDIR}/${LIBCHROMIUMCONTENT_P}" "${LIBCC_S}" || die
- rsync -a "${WORKDIR}/${ASAR_P}/node_modules/" \
- "${S}/node_modules/" || die
- rsync -a "${WORKDIR}/${BROWSERIFY_P}/node_modules/" \
- "${S}/node_modules/" || die
-
- # node patches
- cd "${NODE_S}" || die
- # make sure node uses the correct version of v8
- rm -r deps/v8 || die
- ln -s "${CHROMIUM_S}/v8" deps/ || die
-
- # make sure we use python2.* while using gyp
- sed -i -e "s/python/${EPYTHON}/" \
- deps/npm/node_modules/node-gyp/gyp/gyp || die
- sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" \
- deps/npm/node_modules/node-gyp/lib/configure.js || die
-
- python_fix_shebang "${CHROMIUM_S}/build/gyp_chromium"
- python_fix_shebang "${S}/tools/"
-
- # less verbose install output (stating the same as portage, basically)
- sed -i -e "/print/d" tools/install.py || die
-
- # proper libdir, hat tip @ryanpcmcquen
- # https://github.com/iojs/io.js/issues/504
- local LIBDIR=$(get_libdir)
- sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
- sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
- sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
-
- # Apply libcc Chromium patches.
- cd "${CHROMIUM_S}" || die
- _unnest_patches "${LIBCC_S}/patches"
- eapply "${LIBCC_S}/patches"
-
- # Apply Gentoo patches
- cd "${S}" || die
- _unnest_patches "${WORKDIR}/${PATCHES_P}/${PV}"
- eapply "${WORKDIR}/${PATCHES_P}/${PV}"
-
- # Merge chromiumcontent component into chromium source tree.
- mkdir -p "${CHROMIUM_S}/chromiumcontent" || die
- cp -a "${LIBCC_S}/chromiumcontent" "${CHROMIUM_S}/" || die
- cp -a "${LIBCC_S}/tools/linux/" "${CHROMIUM_S}/tools/" || die
-
- local keeplibs=(
- base/third_party/dmg_fp
- base/third_party/dynamic_annotations
- base/third_party/icu
- base/third_party/nspr
- base/third_party/superfasthash
- base/third_party/symbolize
- base/third_party/valgrind
- base/third_party/xdg_mime
- base/third_party/xdg_user_dirs
- breakpad/src/third_party/curl
- chrome/third_party/mozilla_security_manager
- courgette/third_party
- net/third_party/mozilla_security_manager
- net/third_party/nss
- third_party/WebKit
- third_party/analytics
- third_party/angle
- third_party/angle/src/common/third_party/numerics
- third_party/angle/src/third_party/compiler
- third_party/angle/src/third_party/libXNVCtrl
- third_party/angle/src/third_party/murmurhash
- third_party/angle/src/third_party/trace_event
- third_party/boringssl
- third_party/brotli
- third_party/cacheinvalidation
- third_party/catapult
- third_party/catapult/third_party/polymer
- third_party/catapult/third_party/py_vulcanize
- third_party/catapult/third_party/py_vulcanize/third_party/rcssmin
- third_party/catapult/third_party/py_vulcanize/third_party/rjsmin
- third_party/catapult/tracing/third_party/d3
- third_party/catapult/tracing/third_party/gl-matrix
- third_party/catapult/tracing/third_party/jszip
- third_party/catapult/tracing/third_party/mannwhitneyu
- third_party/ced
- third_party/cld_2
- third_party/cld_3
- third_party/cros_system_api
- third_party/devscripts
- third_party/dom_distiller_js
- third_party/fips181
- third_party/flatbuffers
- third_party/flot
- third_party/google_input_tools
- third_party/google_input_tools/third_party/closure_library
- third_party/google_input_tools/third_party/closure_library/third_party/closure
- third_party/hunspell
- third_party/iccjpeg
- third_party/inspector_protocol
- third_party/jinja2
- third_party/jstemplate
- third_party/khronos
- third_party/leveldatabase
- third_party/libXNVCtrl
- third_party/libaddressinput
- third_party/libjingle
- third_party/libphonenumber
- third_party/libsecret
- third_party/libsrtp
- third_party/libudev
- third_party/libusb
- third_party/libwebm
- third_party/libxml/chromium
- third_party/libyuv
- third_party/lss
- third_party/lzma_sdk
- third_party/markupsafe
- third_party/mesa
- third_party/modp_b64
- third_party/mt19937ar
- third_party/openh264
- third_party/openmax_dl
- third_party/opus
- third_party/ots
- third_party/pdfium
- third_party/pdfium/third_party/agg23
- third_party/pdfium/third_party/base
- third_party/pdfium/third_party/bigint
- third_party/pdfium/third_party/freetype
- third_party/pdfium/third_party/lcms2-2.6
- third_party/pdfium/third_party/libjpeg
- third_party/pdfium/third_party/libopenjpeg20
- third_party/pdfium/third_party/libpng16
- third_party/pdfium/third_party/libtiff
- third_party/pdfium/third_party/zlib_v128
- third_party/ply
- third_party/polymer
- third_party/protobuf
- third_party/protobuf/third_party/six
- third_party/qcms
- third_party/sfntly
- third_party/skia
- third_party/smhasher
- third_party/sqlite
- third_party/tcmalloc
- third_party/usrsctp
- third_party/web-animations-js
- third_party/webdriver
- third_party/webrtc
- third_party/widevine
- third_party/woff2
- third_party/x86inc
- third_party/zlib/google
- url/third_party/mozilla
- v8/src/third_party/valgrind
- v8/third_party/inspector_protocol
-
- # gyp -> gn leftovers
- base/third_party/libevent
- third_party/adobe
- third_party/speech-dispatcher
- third_party/usb_ids
- third_party/xdg-utils
- third_party/yasm/run_yasm.py
- )
- if ! use system-ffmpeg; then
- keeplibs+=( third_party/ffmpeg )
- fi
-
- cd "${CHROMIUM_S}" || die
-
- # Remove most bundled libraries. Some are still needed.
- ebegin "Unbundling libraries"
- build/linux/unbundle/remove_bundled_libraries.py \
- "${keeplibs[@]}" --do-remove || die
- eend
-
- cd "${S}" || die
-
- eapply_user
-}
-
-src_configure() {
- local myconf_gn=""
- local myconf_gyp=""
-
- cd "${CHROMIUM_S}" || die
-
- # GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
- myconf_gn+=" is_debug=false"
-
- # Disable nacl, we can't build without pnacl (http://crbug.com/269560).
- myconf_gn+=" enable_nacl=false"
-
- # Use system-provided libraries.
- # TODO: use_system_hunspell (upstream changes needed).
- # TODO: use_system_libsrtp (bug #459932).
- # TODO: use_system_libusb (http://crbug.com/266149).
- # TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
- # TODO: use_system_protobuf (bug #525560).
- # TODO: use_system_ssl (http://crbug.com/58087).
- # TODO: use_system_sqlite (http://crbug.com/22208).
-
- # libevent: https://bugs.gentoo.org/593458
- local gn_system_libraries=(
- flac
- harfbuzz-ng
- icu
- libjpeg
- libpng
- libvpx
- libwebp
- libxml
- libxslt
- re2
- snappy
- yasm
- zlib)
- if use system-ffmpeg; then
- gn_system_libraries+=( ffmpeg )
- fi
- build/linux/unbundle/replace_gn_files.py \
- --system-libraries ${gn_system_libraries[@]} || die
-
- # Optional dependencies.
- myconf_gn+=" use_cups=$(usex cups true false)"
- myconf_gn+=" use_gconf=$(usex gnome true false)"
- myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
- myconf_gn+=" use_gtk3=false"
- myconf_gn+=" use_kerberos=$(usex kerberos true false)"
- myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-
- # TODO: link_pulseaudio=true for GN.
-
- myconf_gn+=" fieldtrial_testing_like_official_build=true"
-
- if tc-is-clang; then
- myconf_gn+=" is_clang=true clang_base_path=\"/usr\" clang_use_chrome_plugins=false"
- else
- myconf_gn+=" is_clang=false"
- fi
-
- # Never use bundled gold binary. Disable gold linker flags for now.
- # Do not use bundled clang.
- # Trying to use gold results in linker crash.
- myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false"
-
- ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
- myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
- myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
- # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
- # Note: these are for Gentoo use ONLY. For your own distribution,
- # please get your own set of keys. Feel free to contact chromium@gentoo.org
- # for more info.
- local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
- myconf_gn+=" google_api_key=\"${google_api_key}\""
- myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
- myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
-
- local target_arch=$(_get_target_arch)
- local ffmpeg_target_arch="${target_arch}"
-
- if [[ ${ffmpeg_target_arch} = arm ]]; then
- ffmpeg_target_arch=$(usex neon arm-neon arm)
- fi
-
- # Make sure that -Werror doesn't get added to CFLAGS by the build system.
- # Depending on GCC version the warnings are different and we don't want
- # the build to fail because of that.
- myconf_gn+=" treat_warnings_as_errors=false"
-
- # Disable fatal linker warnings, bug 506268.
- myconf_gn+=" fatal_linker_warnings=false"
-
- # Avoid CFLAGS problems, bug #352457, bug #390147.
- if ! use custom-cflags; then
- replace-flags "-Os" "-O2"
- strip-flags
-
- filter-flags "-Wl,--as-needed"
-
- # Prevent linker from running out of address space, bug #471810 .
- if use x86; then
- filter-flags "-g*"
- fi
-
- # Prevent libvpx build failures. Bug 530248, 544702, 546984.
- if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
- filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
- fi
- fi
-
- # Make sure the build system will use the right tools, bug #340795.
- tc-export AR CC CXX NM
-
- # https://bugs.gentoo.org/588596
- append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
-
- # Define a custom toolchain for GN
- myconf_gn+=" custom_toolchain=\"${FILESDIR}/toolchain:default\""
-
- myconf_gn+=" icu_use_data_file=false"
-
- use lto && myconf_gn+=" allow_posix_link_time_opt=true"
-
- # Tools for building programs to be executed on the build system, bug #410883.
- if tc-is-cross-compiler; then
- export AR_host=$(tc-getBUILD_AR)
- export CC_host=$(tc-getBUILD_CC)
- export CXX_host=$(tc-getBUILD_CXX)
- export NM_host=$(tc-getBUILD_NM)
- fi
-
- # Bug 491582.
- export TMPDIR="${WORKDIR}/temp"
- mkdir -p -m 755 "${TMPDIR}" || die
-
- if ! use system-ffmpeg; then
- local build_ffmpeg_args=""
- if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
- build_ffmpeg_args+=" --disable-asm"
- fi
-
- # Re-configure bundled ffmpeg. See bug #491378 for example reasons.
- einfo "Configuring bundled ffmpeg..."
- pushd third_party/ffmpeg > /dev/null || die
- chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
- --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
- chromium/scripts/copy_config.sh || die
- chromium/scripts/generate_gn.py || die
- popd > /dev/null || die
- fi
-
- third_party/libaddressinput/chromium/tools/update-strings.py || die
-
- touch chrome/test/data/webui/i18n_process_css_test.html || die
-
- einfo "Configuring bundled nodejs..."
- pushd "${S}/vendor/node" > /dev/null || die
- # Make sure gyp_node does not run
- echo '#!/usr/bin/env python' > tools/gyp_node.py || die
- # --shared-libuv cannot be used as electron's node fork
- # patches uv_loop structure.
- ./configure --shared --without-bundled-v8 --shared-openssl \
- --shared-http-parser --shared-zlib --without-npm \
- --with-intl=system-icu --without-dtrace \
- --dest-cpu=${target_arch} --prefix="" || die
- popd > /dev/null || die
-
- # libchromiumcontent configuration
- myconf_gn+=" root_extra_deps = [\"//chromiumcontent:chromiumcontent\"]"
- myconf_gn+=" is_electron_build = true"
- myconf_gn+=" is_component_build = false"
-
- einfo "Configuring chromiumcontent..."
- # TODO: bootstrapped gn binary hangs when using tcmalloc with portage's sandbox.
- tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "${myconf_gn} use_allocator=\"none\"" || die
- # Remove the glibc allocator shim so that it doesn't get picked up
- # by Electron's build_libs script.
- rm out/Release/obj/base/allocator/unified_allocator_shim/allocator_shim_default_dispatch_to_glibc.o || die
-
- myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
- out/Release/gn gen --args="${myconf_gn}" out/Release || die
-
- cd "${S}" || die
-}
-
-eninja() {
- if [[ -z ${NINJAOPTS+set} ]]; then
- local jobs=$(makeopts_jobs)
- local loadavg=$(makeopts_loadavg)
-
- if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
- NINJAOPTS+=" -j ${jobs}"
- fi
- if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
- NINJAOPTS+=" -l ${loadavg}"
- fi
- fi
- set -- ninja -v ${NINJAOPTS} "$@"
- echo "$@"
- "$@" || die
-}
-
-src_compile() {
- local compile_target="${S}/out/R"
- local myconf_gyp=""
- local chromium_target="${CHROMIUM_S}/out/Release"
- local libcc_path="${S}/vendor/brightray/vendor/libchromiumcontent"
- local libcc_dist_path="${libcc_path}/dist/main"
- local libcc_dist_static_path="${libcc_dist_path}/static_library"
- local libcc_dist_shared_path="${libcc_dist_path}/shared_library"
- local libcc_output="${CHROMIUM_S}/out/Release/obj/chromiumcontent"
- local libcc_output_shared="${libcc_output}-shared"
- local target_arch=$(_get_target_arch)
- local l=""
- local create_dist_args=""
-
- tc-export AR CC CXX NM
-
- mkdir -p "${compile_target}" || die
-
- cd "${CHROMIUM_S}" || die
-
- # Build mksnapshot and pax-mark it.
- eninja -C "${chromium_target}" mksnapshot || die
- pax-mark m "${chromium_target}/mksnapshot"
- cp -a "${chromium_target}/mksnapshot" "${compile_target}/" || die
-
- # Build chromedriver.
- eninja -C "${chromium_target}" chromedriver
- cp -a "${chromium_target}/chromedriver" "${compile_target}/" || die
-
- # Build libchromiumcontent components.
- eninja -C "${chromium_target}" chromiumcontent:chromiumcontent
-
- cd "${S}" || die
-
- # Gather and prepare built components of libchromiumcontent.
- create_dist_args+=" --target_arch=${target_arch} --component=static_library"
- create_dist_args+=" --no_zip"
- create_dist_args+=" --system-icu"
- CHROMIUM_BUILD_DIR="${chromium_target}" \
- "${EPYTHON}" "${libcc_path}"/script/create-dist ${create_dist_args} || die
-
- # v8 is built as a shared library, so copy it manually
- # for generate_filenames_gypi to find.
- mkdir -p "${libcc_dist_shared_path}" || die
- cp "${chromium_target}/libv8.so" "${libcc_dist_shared_path}" || die
-
- "${EPYTHON}" "${libcc_path}"/tools/generate_filenames_gypi.py \
- "${libcc_dist_path}/filenames.gypi" \
- "${CHROMIUM_S}" \
- "${libcc_dist_shared_path}" \
- "${libcc_dist_static_path}"
-
- # Configure electron.
- myconf_gyp+="
- $(gyp_use cups)
- $(gyp_use gnome use_gconf)
- $(gyp_use gnome-keyring use_gnome_keyring)
- $(gyp_use gnome-keyring linux_link_gnome_keyring)
- $(gyp_use lto)"
-
- myconf_gyp+=" -Duse_system_icu=1"
-
- if [[ $(tc-getCC) == *clang* ]]; then
- myconf_gyp+=" -Dclang=1"
- else
- myconf_gyp+=" -Dclang=0"
- fi
-
- # Never use bundled gold binary. Disable gold linker flags for now.
- # Do not use bundled clang.
- myconf_gyp+="
- -Dclang_use_chrome_plugins=0
- -Dhost_clang=0
- -Dlinux_use_bundled_binutils=0
- -Dlinux_use_bundled_gold=0
- -Dlinux_use_gold_flags=0
- -Dsysroot="
-
- myconf_gyp+=" -Dtarget_arch=${target_arch}"
- myconf_gyp+=" -Dpython=${EPYTHON}"
-
- # Make sure that -Werror doesn't get added to CFLAGS by the build system.
- # Depending on GCC version the warnings are different and we don't want
- # the build to fail because of that.
- myconf_gyp+=" -Dwerror="
-
- # Disable fatal linker warnings, bug 506268.
- myconf_gyp+=" -Ddisable_fatal_linker_warnings=1"
-
- myconf_gyp+=" -Dicu_use_data_file_flag=0"
- myconf_gyp+=" -Dgenerate_character_data=0"
-
- myconf_gyp+=" -Dlibchromiumcontent_component=0"
- myconf_gyp+=" -Dcomponent=static_library"
- myconf_gyp+=" -Dlibrary=static_library"
- myconf_gyp+=" -Icommon.gypi electron.gyp"
-
- EGYP_CHROMIUM_COMMAND="${CHROMIUM_S}/build/gyp_chromium" \
- egyp_chromium ${myconf_gyp} || die
-
- mkdir -p "${compile_target}/lib/" || die
- # Copy libv8 and snapshot files so the node binary can find them.
- cp "${chromium_target}/libv8.so" "${compile_target}/lib/" || die
- cp "${chromium_target}/natives_blob.bin" "${compile_target}" || die
- cp "${chromium_target}/snapshot_blob.bin" "${compile_target}" || die
-
- # Copy generated shim headers.
- mkdir -p "${compile_target}/gen" || die
- cp -r "${chromium_target}/gen/shim_headers" \
- "${compile_target}/gen" || die
-
- # Build the Node binary and pax-mark it.
- eninja -C ${compile_target} nodebin
- pax-mark m ${compile_target}/nodebin
-
- # Finally, build Electron.
- eninja -C ${compile_target} electron
- pax-mark m ${compile_target}/electron
-
- echo "v${PV}" > ${compile_target}/version
-}
-
-src_install() {
- local install_dir="$(_get_install_dir)"
- local install_suffix="$(_get_install_suffix)"
- local LIBDIR="${ED}/usr/$(get_libdir)"
-
- pushd out/R/locales > /dev/null || die
- chromium_remove_language_paks
- popd > /dev/null || die
-
- # Install Electron
- insinto "${install_dir}"
- exeinto "${install_dir}"
- newexe out/R/nodebin node
- doexe out/R/electron
- doexe out/R/chromedriver
- doexe out/R/mksnapshot
- doins out/R/libv8.so
- fperms +x "${install_dir}/libv8.so"
- doins out/R/libnode.so
- fperms +x "${install_dir}/libnode.so"
- doins out/R/natives_blob.bin
- doins out/R/snapshot_blob.bin
- doins out/R/blink_image_resources_200_percent.pak
- doins out/R/content_resources_200_percent.pak
- doins out/R/content_shell.pak
- doins out/R/pdf_viewer_resources.pak
- doins out/R/ui_resources_200_percent.pak
- doins out/R/views_resources_200_percent.pak
- doins -r out/R/resources
- doins -r out/R/locales
- dosym "${install_dir}/electron" "/usr/bin/electron${install_suffix}"
-
- doins out/R/version
-
- # Install Node headers
- HEADERS_ONLY=1 \
- "${S}/vendor/node/tools/install.py" install "${ED}" "/usr" || die
- # set up a symlink structure that npm expects..
- dodir /usr/include/node/deps/{v8,uv}
- dosym . /usr/include/node/src
- for var in deps/{uv,v8}/include; do
- dosym ../.. /usr/include/node/${var}
- done
-
- dodir "/usr/include/electron${install_suffix}"
- mv "${ED}/usr/include/node" \
- "${ED}/usr/include/electron${install_suffix}/node" || die
-}
-
-pkg_postinst() {
- electron-config update
-}
-
-pkg_postrm() {
- electron-config update
-}
diff --git a/dev-util/electron/electron-1.7.16.ebuild b/dev-util/electron/electron-1.7.16.ebuild
deleted file mode 100644
index 3f5ca3af95d..00000000000
--- a/dev-util/electron/electron-1.7.16.ebuild
+++ /dev/null
@@ -1,889 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
- hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
- sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 eapi7-ver gnome2-utils flag-o-matic multilib \
- multiprocessing pax-utils portability python-any-r1 toolchain-funcs \
- virtualx xdg-utils
-
-# Keep this in sync with vendor/libchromiumcontent/VERSION
-CHROMIUM_VERSION="58.0.3029.110"
-# Keep this in sync with vendor/breakpad
-BREAKPAD_COMMIT="c566c50d81f7b1edeaee9f11f5d07bda858d6b64"
-# Keep this in sync with vendor/breakpad/src (and find the corresponding
-# commit in https://github.com/google/breakpad/)
-BREAKPAD_SRC_COMMIT="e35167de7516448fcc2bf687ad580b9d8b6aedc2"
-# Keep this in sync with vendor/node
-NODE_COMMIT="a992f2ff412b85606ec1d4c1eb00ad832fa1e640"
-# Keep this in sync with vendor/native_mate
-NATIVE_MATE_COMMIT="7d9c1a80f025f4c46f7da8ea73246fe0f1968579"
-# Keep this in sync with vendor/pdf_viewer
-PDF_VIEWER_COMMIT="beb36874a6b61d7a18b92bf7dcd1f0661e4c59cf"
-# Keep this in sync with vendor/pdf_viewer/vendor/grit
-GRIT_COMMIT="9536fb6429147d27ef1563088341825db0a893cd"
-# Keep this in sync with vendor/libchromiumcontent
-LIBCHROMIUMCONTENT_COMMIT="4a4acde5522c21fe2f0a21f5ca29f99e90b03adc"
-# Keep this in sync with package.json#devDependencies
-ASAR_VERSION="0.13.0"
-BROWSERIFY_VERSION="14.0.0"
-NINJA_VERSION="1.8.2"
-GENTOO_PATCHES_VERSION="f0fb7725cfe73704dce84ec51bdccc024dc7ceff"
-
-PATCHES_P="gentoo-electron-patches-${GENTOO_PATCHES_VERSION}"
-CHROMIUM_P="chromium-${CHROMIUM_VERSION}"
-BREAKPAD_P="chromium-breakpad-${BREAKPAD_COMMIT}"
-BREAKPAD_SRC_P="breakpad-${BREAKPAD_SRC_COMMIT}"
-NODE_P="node-${NODE_COMMIT}"
-NATIVE_MATE_P="native-mate-${NATIVE_MATE_COMMIT}"
-PDF_VIEWER_P="pdf-viewer-${PDF_VIEWER_COMMIT}"
-GRIT_P="grit-${GRIT_COMMIT}"
-LIBCHROMIUMCONTENT_P="libchromiumcontent-${LIBCHROMIUMCONTENT_COMMIT}"
-ASAR_P="asar-${ASAR_VERSION}"
-BROWSERIFY_P="browserify-${BROWSERIFY_VERSION}"
-
-DESCRIPTION="Cross platform application development framework based on web technologies"
-HOMEPAGE="https://electronjs.org/"
-SRC_URI="
- https://commondatastorage.googleapis.com/chromium-browser-official/${CHROMIUM_P}.tar.xz
- https://github.com/electron/electron/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/electron/chromium-breakpad/archive/${BREAKPAD_COMMIT}.tar.gz -> electron-${BREAKPAD_P}.tar.gz
- https://github.com/google/breakpad/archive/${BREAKPAD_SRC_COMMIT}.tar.gz -> electron-${BREAKPAD_SRC_P}.tar.gz
- https://github.com/electron/node/archive/${NODE_COMMIT}.tar.gz -> electron-${NODE_P}.tar.gz
- https://github.com/zcbenz/native-mate/archive/${NATIVE_MATE_COMMIT}.tar.gz -> electron-${NATIVE_MATE_P}.tar.gz
- https://github.com/electron/pdf-viewer/archive/${PDF_VIEWER_COMMIT}.tar.gz -> electron-${PDF_VIEWER_P}.tar.gz
- https://github.com/elprans/grit/archive/${GRIT_COMMIT}.tar.gz -> electron-${GRIT_P}.tar.gz
- https://github.com/electron/libchromiumcontent/archive/${LIBCHROMIUMCONTENT_COMMIT}.tar.gz -> electron-${LIBCHROMIUMCONTENT_P}.tar.gz
- https://github.com/elprans/asar/releases/download/v${ASAR_VERSION}-gentoo/asar-build.tar.gz -> ${ASAR_P}.tar.gz
- https://github.com/elprans/node-browserify/releases/download/${BROWSERIFY_VERSION}-gentoo/browserify-build.tar.gz -> ${BROWSERIFY_P}.tar.gz
- https://github.com/elprans/gentoo-electron-patches/archive/${GENTOO_PATCHES_VERSION}.tar.gz -> electron-patches-${GENTOO_PATCHES_VERSION}.tar.gz
- https://github.com/ninja-build/ninja/archive/v${NINJA_VERSION}.tar.gz -> ninja-${NINJA_VERSION}.tar.gz
-"
-
-S="${WORKDIR}/${P}"
-CHROMIUM_S="${S}/chromium"
-NODE_S="${S}/vendor/node"
-BREAKPAD_S="${S}/vendor/breakpad"
-BREAKPAD_SRC_S="${BREAKPAD_S}/src"
-NATIVE_MATE_S="${S}/vendor/native_mate"
-PDF_VIEWER_S="${S}/vendor/pdf_viewer"
-GRIT_S="${PDF_VIEWER_S}/vendor/grit"
-LIBCC_S="${S}/vendor/libchromiumcontent"
-
-LICENSE="BSD"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-IUSE="cups custom-cflags gconf gnome-keyring gtk3 kerberos lto neon pic
- +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc"
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
-
-# Native Client binaries are compiled with different set of flags, bug #452066.
-QA_FLAGS_IGNORED=".*\.nexe"
-
-# Native Client binaries may be stripped by the build system, which uses the
-# right tools for it, bug #469144 .
-QA_PRESTRIPPED=".*\.nexe"
-
-COMMON_DEPEND="
- app-arch/bzip2:=
- >=app-eselect/eselect-electron-2.0
- cups? ( >=net-print/cups-1.3.11:= )
- >=dev-libs/elfutils-0.149
- dev-libs/expat:=
- dev-libs/glib:2
- >=dev-libs/icu-58:=
- >=dev-libs/jsoncpp-0.5.0-r1:=
- dev-libs/libxml2:=[icu]
- dev-libs/libxslt:=
- dev-libs/nspr:=
- >=dev-libs/nss-3.14.3:=
- >=dev-libs/re2-0.2016.05.01:=
- gconf? ( >=gnome-base/gconf-2.24.0:= )
- gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
- >=media-libs/alsa-lib-1.0.19:=
- media-libs/fontconfig:=
- media-libs/freetype:=
- >=media-libs/harfbuzz-1.3.1:=[icu(+)]
- media-libs/libexif:=
- media-libs/libjpeg-turbo:=
- media-libs/libpng:=
- >=media-libs/libvpx-1.7.0:=[postproc,svc]
- media-libs/speex:=
- pulseaudio? ( media-sound/pulseaudio:= )
- system-ffmpeg? ( >=media-video/ffmpeg-3:= )
- sys-apps/dbus:=
- sys-apps/pciutils:=
- >=sys-libs/libcap-2.22:=
- virtual/udev
- x11-libs/cairo:=
- x11-libs/gdk-pixbuf:2
- x11-libs/libdrm
- x11-libs/libnotify:=
- x11-libs/libX11:=
- x11-libs/libXcomposite:=
- x11-libs/libXcursor:=
- x11-libs/libXdamage:=
- x11-libs/libXext:=
- x11-libs/libXfixes:=
- >=x11-libs/libXi-1.6.0:=
- x11-libs/libXinerama:=
- x11-libs/libXrandr:=
- x11-libs/libXrender:=
- x11-libs/libXScrnSaver:=
- x11-libs/libXtst:=
- x11-libs/pango:=
- app-arch/snappy:=
- media-libs/flac:=
- >=media-libs/libwebp-0.4.0:=
- sys-libs/zlib:=[minizip]
- kerberos? ( virtual/krb5 )
-"
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND="${COMMON_DEPEND}
- !<dev-util/electron-0.36.12-r4
- x11-misc/xdg-utils
- virtual/opengl
- virtual/ttf-fonts
- !gtk3? ( x11-libs/gtk+:2 )
- gtk3? ( x11-libs/gtk+:3[X] )
- selinux? ( sec-policy/selinux-chromium )
- tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
-"
-# dev-vcs/git - https://bugs.gentoo.org/593476
-DEPEND="${COMMON_DEPEND}
- >=app-arch/gzip-1.7
- !arm? (
- dev-lang/yasm
- )
- dev-lang/perl
- dev-perl/JSON
- >=dev-util/gperf-3.0.3
- dev-util/ninja
- net-libs/nodejs
- sys-apps/hwids[usb(+)]
- >=sys-devel/bison-2.4.3
- sys-devel/flex
- virtual/pkgconfig
- dev-vcs/git
- x11-libs/gtk+:2
- x11-libs/gtk+:3
- $(python_gen_any_dep '
- dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
- >=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]
- dev-python/html5lib[${PYTHON_USEDEP}]
- dev-python/simplejson[${PYTHON_USEDEP}]
- ')
-"
-
-# Keep this in sync with the python_gen_any_dep call.
-python_check_deps() {
- has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" &&
- has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" &&
- has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" &&
- has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]"
-}
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
- EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-pre_build_checks() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- local -x CPP="$(tc-getCXX) -E"
- if tc-is-clang && ! ver_test "$(clang-fullversion)" -ge 3.9.1; then
- # bugs: #601654
- die "At least clang 3.9.1 is required"
- fi
- if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 4.9; then
- # bugs: #535730, #525374, #518668, #600288
- die "At least gcc 4.9 is required"
- fi
- fi
-
- # LTO pass requires more file descriptors
- if use lto; then
- local lto_n_rlimit_min="16384"
- local maxfiles=$(ulimit -n -H)
- if [ "${maxfiles}" -lt "${lto_n_rlimit_min}" ]; then
- eerror ""
- eerror "Building with USE=\"lto\" requires file descriptor" \
- "limit to be no less than ${lto_n_rlimit_min}."
- eerror "The current limit for portage is ${maxfiles}."
- eerror "Please add the following to /etc/security/limits.conf:"
- eerror ""
- eerror " root hard nofile ${lto_n_rlimit_min}"
- eerror " root soft nofile ${lto_n_rlimit_min}"
- eerror ""
- die
- fi
- fi
-
- # Check build requirements, bug #541816 and bug #471810 .
- CHECKREQS_MEMORY="3G"
- use lto && CHECKREQS_MEMORY="7G"
- CHECKREQS_DISK_BUILD="5G"
- eshopts_push -s extglob
- if is-flagq '-g?(gdb)?([1-9])'; then
- CHECKREQS_DISK_BUILD="25G"
- CHECKREQS_MEMORY="16G"
- fi
- eshopts_pop
- check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
- pre_build_checks
-}
-
-pkg_setup() {
- pre_build_checks
-
- # Make sure the build system will use the right python, bug #344367.
- python-any-r1_pkg_setup
-
- chromium_suid_sandbox_check_kernel_config
-}
-
-_unnest_patches() {
- local _s="${1%/}/"
- local path
- local relpath
- local out
-
- (find "${_s}" -mindepth 2 -name '*.patch' -printf "%P\n" || die) \
- | while read -r path; do
- relpath="$(dirname ${path})"
- out="${_s}/__${relpath////_}_$(basename ${path})"
- sed -r -e "s|^([-+]{3}) ([ab])/(.*)$|\1 \2/${relpath}/\3|g" \
- "${_s}/${path}" > "${out}" || die
- done
-}
-
-_get_install_suffix() {
- local c=(${SLOT//\// })
- local slot=${c[0]}
- local suffix
-
- if [[ "${slot}" == "0" ]]; then
- suffix=""
- else
- suffix="-${slot}"
- fi
-
- echo -n "${suffix}"
-}
-
-_get_install_dir() {
- echo -n "/usr/$(get_libdir)/electron$(_get_install_suffix)"
-}
-
-_get_target_arch() {
- local myarch="$(tc-arch)"
- local target_arch
-
- if [[ $myarch = amd64 ]] ; then
- target_arch=x64
- elif [[ $myarch = x86 ]] ; then
- target_arch=ia32
- elif [[ $myarch = arm64 ]] ; then
- target_arch=arm64
- elif [[ $myarch = arm ]] ; then
- target_arch=arm
- else
- die "Failed to determine target arch, got '$myarch'."
- fi
-
- echo -n "${target_arch}"
-}
-
-src_prepare() {
- mv "${WORKDIR}/${CHROMIUM_P}" "${CHROMIUM_S}" || die
- rm -r "${NODE_S}" &&
- mv "${WORKDIR}/${NODE_P}" "${NODE_S}" || die
- rm -r "${BREAKPAD_S}" &&
- mv "${WORKDIR}/${BREAKPAD_P}" "${BREAKPAD_S}" || die
- rm -r "${BREAKPAD_SRC_S}" &&
- mv "${WORKDIR}/${BREAKPAD_SRC_P}/src" "${BREAKPAD_SRC_S}" || die
- rm -r "${NATIVE_MATE_S}" &&
- mv "${WORKDIR}/${NATIVE_MATE_P}" "${NATIVE_MATE_S}" || die
- rm -r "${PDF_VIEWER_S}" &&
- mv "${WORKDIR}/${PDF_VIEWER_P}" "${PDF_VIEWER_S}" || die
- rm -r "${GRIT_S}" &&
- mv "${WORKDIR}/${GRIT_P}" "${GRIT_S}" || die
- rm -r "${LIBCC_S}" &&
- mv "${WORKDIR}/${LIBCHROMIUMCONTENT_P}" "${LIBCC_S}" || die
- rsync -a "${WORKDIR}/${ASAR_P}/node_modules/" \
- "${S}/node_modules/" || die
- rsync -a "${WORKDIR}/${BROWSERIFY_P}/node_modules/" \
- "${S}/node_modules/" || die
-
- # node patches
- cd "${NODE_S}" || die
- # make sure node uses the correct version of v8
- rm -r deps/v8 || die
- ln -s "${CHROMIUM_S}/v8" deps/ || die
-
- # make sure we use python2.* while using gyp
- sed -i -e "s/python/${EPYTHON}/" \
- deps/npm/node_modules/node-gyp/gyp/gyp || die
- sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" \
- deps/npm/node_modules/node-gyp/lib/configure.js || die
-
- python_fix_shebang "${CHROMIUM_S}/chrome/browser"
- python_fix_shebang "${CHROMIUM_S}/build/gyp_chromium"
- python_fix_shebang "${S}/tools/"
-
- # less verbose install output (stating the same as portage, basically)
- sed -i -e "/print/d" tools/install.py || die
-
- # proper libdir, hat tip @ryanpcmcquen
- # https://github.com/iojs/io.js/issues/504
- local LIBDIR=$(get_libdir)
- sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
- sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
- sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
-
- # Fix broken patch
- cd "${LIBCC_S}" || die
- eapply "${FILESDIR}/${PN}-1.7.15-v8-crankshaft-rce-fix.patch"
-
- # Apply libcc Chromium patches.
- cd "${CHROMIUM_S}" || die
- _unnest_patches "${LIBCC_S}/patches"
- eapply "${LIBCC_S}/patches"
-
- # Apply Gentoo patches
- cd "${S}" || die
- _unnest_patches "${WORKDIR}/${PATCHES_P}/${PV}"
- eapply "${WORKDIR}/${PATCHES_P}/${PV}"
-
- # Merge chromiumcontent component into chromium source tree.
- mkdir -p "${CHROMIUM_S}/chromiumcontent" || die
- cp -a "${LIBCC_S}/chromiumcontent" "${CHROMIUM_S}/" || die
- cp -a "${LIBCC_S}/tools/linux/" "${CHROMIUM_S}/tools/" || die
-
- if use gtk3; then
- sed -i -e 's/gtk2/gtk3/g' "${CHROMIUM_S}/chromiumcontent/BUILD.gn" \
- || die
- fi
-
- local keeplibs=(
- base/third_party/dmg_fp
- base/third_party/dynamic_annotations
- base/third_party/icu
- base/third_party/nspr
- base/third_party/superfasthash
- base/third_party/symbolize
- base/third_party/valgrind
- base/third_party/xdg_mime
- base/third_party/xdg_user_dirs
- breakpad/src/third_party/curl
- chrome/third_party/mozilla_security_manager
- courgette/third_party
- net/third_party/mozilla_security_manager
- net/third_party/nss
- third_party/WebKit
- third_party/analytics
- third_party/angle
- third_party/angle/src/common/third_party/numerics
- third_party/angle/src/third_party/compiler
- third_party/angle/src/third_party/libXNVCtrl
- third_party/angle/src/third_party/murmurhash
- third_party/angle/src/third_party/trace_event
- third_party/boringssl
- third_party/brotli
- third_party/cacheinvalidation
- third_party/catapult
- third_party/catapult/third_party/polymer
- third_party/catapult/third_party/py_vulcanize
- third_party/catapult/third_party/py_vulcanize/third_party/rcssmin
- third_party/catapult/third_party/py_vulcanize/third_party/rjsmin
- third_party/catapult/tracing/third_party/d3
- third_party/catapult/tracing/third_party/gl-matrix
- third_party/catapult/tracing/third_party/jszip
- third_party/catapult/tracing/third_party/mannwhitneyu
- third_party/ced
- third_party/cld_2
- third_party/cld_3
- third_party/cros_system_api
- third_party/devscripts
- third_party/dom_distiller_js
- third_party/fips181
- third_party/flatbuffers
- third_party/flot
- third_party/google_input_tools
- third_party/google_input_tools/third_party/closure_library
- third_party/google_input_tools/third_party/closure_library/third_party/closure
- third_party/hunspell
- third_party/iccjpeg
- third_party/inspector_protocol
- third_party/jinja2
- third_party/jstemplate
- third_party/khronos
- third_party/leveldatabase
- third_party/libXNVCtrl
- third_party/libaddressinput
- third_party/libjingle
- third_party/libphonenumber
- third_party/libsecret
- third_party/libsrtp
- third_party/libudev
- third_party/libusb
- third_party/libwebm
- third_party/libxml/chromium
- third_party/libyuv
- third_party/lss
- third_party/lzma_sdk
- third_party/markupsafe
- third_party/mesa
- third_party/modp_b64
- third_party/mt19937ar
- third_party/node
- third_party/node/node_modules/vulcanize/third_party/UglifyJS2
- third_party/openh264
- third_party/openmax_dl
- third_party/opus
- third_party/ots
- third_party/pdfium
- third_party/pdfium/third_party/agg23
- third_party/pdfium/third_party/base
- third_party/pdfium/third_party/bigint
- third_party/pdfium/third_party/freetype
- third_party/pdfium/third_party/lcms2-2.6
- third_party/pdfium/third_party/libjpeg
- third_party/pdfium/third_party/libopenjpeg20
- third_party/pdfium/third_party/libpng16
- third_party/pdfium/third_party/libtiff
- third_party/pdfium/third_party/zlib_v128
- third_party/ply
- third_party/polymer
- third_party/protobuf
- third_party/protobuf/third_party/six
- third_party/qcms
- third_party/sfntly
- third_party/skia
- third_party/smhasher
- third_party/sqlite
- third_party/tcmalloc
- third_party/usrsctp
- third_party/web-animations-js
- third_party/webdriver
- third_party/webrtc
- third_party/widevine
- third_party/woff2
- third_party/x86inc
- third_party/zlib/google
- url/third_party/mozilla
- v8/src/third_party/valgrind
- v8/third_party/inspector_protocol
-
- # gyp -> gn leftovers
- base/third_party/libevent
- third_party/adobe
- third_party/speech-dispatcher
- third_party/usb_ids
- third_party/xdg-utils
- third_party/yasm/run_yasm.py
- )
- if ! use system-ffmpeg; then
- keeplibs+=( third_party/ffmpeg )
- fi
-
- cd "${CHROMIUM_S}" || die
-
- # Remove most bundled libraries. Some are still needed.
- ebegin "Unbundling libraries"
- build/linux/unbundle/remove_bundled_libraries.py \
- "${keeplibs[@]}" --do-remove || die
- eend
-
- cd "${S}" || die
-
- eapply_user
-}
-
-src_configure() {
- local myconf_gn=""
- local myconf_gyp=""
-
- cd "${CHROMIUM_S}" || die
-
- # GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
- myconf_gn+=" is_debug=false"
-
- # Disable nacl, we can't build without pnacl (http://crbug.com/269560).
- myconf_gn+=" enable_nacl=false"
-
- # Use system-provided libraries.
- # TODO: use_system_hunspell (upstream changes needed).
- # TODO: use_system_libsrtp (bug #459932).
- # TODO: use_system_libusb (http://crbug.com/266149).
- # TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
- # TODO: use_system_protobuf (bug #525560).
- # TODO: use_system_ssl (http://crbug.com/58087).
- # TODO: use_system_sqlite (http://crbug.com/22208).
-
- # libevent: https://bugs.gentoo.org/593458
- local gn_system_libraries=(
- flac
- harfbuzz-ng
- icu
- libjpeg
- libpng
- libvpx
- libwebp
- libxml
- libxslt
- re2
- snappy
- yasm
- zlib)
- if use system-ffmpeg; then
- gn_system_libraries+=( ffmpeg )
- fi
- build/linux/unbundle/replace_gn_files.py \
- --system-libraries ${gn_system_libraries[@]} || die
-
- # Optional dependencies.
- myconf_gn+=" use_cups=$(usex cups true false)"
- myconf_gn+=" use_gconf=$(usex gconf true false)"
- myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
- myconf_gn+=" use_gtk3=$(usex gtk3 true false)"
- myconf_gn+=" use_kerberos=$(usex kerberos true false)"
- myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-
- # TODO: link_pulseaudio=true for GN.
-
- myconf_gn+=" fieldtrial_testing_like_official_build=true"
-
- if tc-is-clang; then
- myconf_gn+=" is_clang=true clang_base_path=\"/usr\" clang_use_chrome_plugins=false"
- else
- myconf_gn+=" is_clang=false"
- fi
-
- # Never use bundled gold binary. Disable gold linker flags for now.
- # Do not use bundled clang.
- # Trying to use gold results in linker crash.
- myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false"
-
- ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
- myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
- myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
- # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
- # Note: these are for Gentoo use ONLY. For your own distribution,
- # please get your own set of keys. Feel free to contact chromium@gentoo.org
- # for more info.
- local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
- myconf_gn+=" google_api_key=\"${google_api_key}\""
- myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
- myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
-
- local target_arch=$(_get_target_arch)
- local ffmpeg_target_arch="${target_arch}"
-
- if [[ ${ffmpeg_target_arch} = arm ]]; then
- ffmpeg_target_arch=$(usex neon arm-neon arm)
- fi
-
- # Make sure that -Werror doesn't get added to CFLAGS by the build system.
- # Depending on GCC version the warnings are different and we don't want
- # the build to fail because of that.
- myconf_gn+=" treat_warnings_as_errors=false"
-
- # Disable fatal linker warnings, bug 506268.
- myconf_gn+=" fatal_linker_warnings=false"
-
- # Avoid CFLAGS problems, bug #352457, bug #390147.
- if ! use custom-cflags; then
- replace-flags "-Os" "-O2"
- strip-flags
-
- filter-flags "-Wl,--as-needed"
-
- # Prevent linker from running out of address space, bug #471810 .
- if use x86; then
- filter-flags "-g*"
- fi
-
- # Prevent libvpx build failures. Bug 530248, 544702, 546984.
- if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
- filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
- fi
- fi
-
- # Make sure the build system will use the right tools, bug #340795.
- tc-export AR CC CXX NM
-
- # https://bugs.gentoo.org/588596
- append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
-
- # Define a custom toolchain for GN
- myconf_gn+=" custom_toolchain=\"${FILESDIR}/toolchain:default\""
-
- myconf_gn+=" icu_use_data_file=false"
-
- use lto && myconf_gn+=" allow_posix_link_time_opt=true"
-
- # Tools for building programs to be executed on the build system, bug #410883.
- if tc-is-cross-compiler; then
- export AR_host=$(tc-getBUILD_AR)
- export CC_host=$(tc-getBUILD_CC)
- export CXX_host=$(tc-getBUILD_CXX)
- export NM_host=$(tc-getBUILD_NM)
- fi
-
- # Bug 491582.
- export TMPDIR="${WORKDIR}/temp"
- mkdir -p -m 755 "${TMPDIR}" || die
-
- if ! use system-ffmpeg; then
- local build_ffmpeg_args=""
- if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
- build_ffmpeg_args+=" --disable-asm"
- fi
-
- # Re-configure bundled ffmpeg. See bug #491378 for example reasons.
- einfo "Configuring bundled ffmpeg..."
- pushd third_party/ffmpeg > /dev/null || die
- chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
- --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
- chromium/scripts/copy_config.sh || die
- chromium/scripts/generate_gn.py || die
- popd > /dev/null || die
- fi
-
- third_party/libaddressinput/chromium/tools/update-strings.py || die
-
- touch chrome/test/data/webui/i18n_process_css_test.html || die
-
- einfo "Configuring bundled nodejs..."
- pushd "${S}/vendor/node" > /dev/null || die
- # Make sure gyp_node does not run
- echo '#!/usr/bin/env python' > tools/gyp_node.py || die
- # --shared-libuv cannot be used as electron's node fork
- # patches uv_loop structure.
- ./configure --shared --without-bundled-v8 --shared-openssl \
- --shared-http-parser --shared-zlib --without-npm \
- --with-intl=system-icu --without-dtrace \
- --dest-cpu=${target_arch} --prefix="" || die
- popd > /dev/null || die
-
- # libchromiumcontent configuration
- myconf_gn+=" root_extra_deps = [\"//chromiumcontent:chromiumcontent\"]"
- myconf_gn+=" is_electron_build = true"
- myconf_gn+=" is_component_build = false"
- myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
-
- einfo "Configuring chromiumcontent..."
- tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "${myconf_gn}" || die
- out/Release/gn gen --args="${myconf_gn}" out/Release || die
-
- cd "${S}" || die
-}
-
-eninja() {
- if [[ -z ${NINJAOPTS+set} ]]; then
- local jobs=$(makeopts_jobs)
- local loadavg=$(makeopts_loadavg)
-
- if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
- NINJAOPTS+=" -j ${jobs}"
- fi
- if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
- NINJAOPTS+=" -l ${loadavg}"
- fi
- fi
- set -- ninja -v ${NINJAOPTS} "$@"
- echo "$@"
- "$@" || die
-}
-
-src_compile() {
- local compile_target="${S}/out/R"
- local myconf_gyp=""
- local chromium_target="${CHROMIUM_S}/out/Release"
- local libcc_path="${S}/vendor/libchromiumcontent"
- local libcc_dist_path="${libcc_path}/dist/main"
- local libcc_dist_static_path="${libcc_dist_path}/static_library"
- local libcc_dist_shared_path="${libcc_dist_path}/shared_library"
- local libcc_output="${CHROMIUM_S}/out/Release/obj/chromiumcontent"
- local libcc_output_shared="${libcc_output}-shared"
- local target_arch=$(_get_target_arch)
- local l=""
- local create_dist_args=""
-
- tc-export AR CC CXX NM
-
- mkdir -p "${compile_target}" || die
-
- cd "${CHROMIUM_S}" || die
-
- # Build mksnapshot and pax-mark it.
- eninja -C "${chromium_target}" mksnapshot || die
- pax-mark m "${chromium_target}/mksnapshot"
- cp -a "${chromium_target}/mksnapshot" "${compile_target}/" || die
-
- # Build chromedriver.
- eninja -C "${chromium_target}" chromedriver
- cp -a "${chromium_target}/chromedriver" "${compile_target}/" || die
-
- # Build libchromiumcontent components.
- eninja -C "${chromium_target}" chromiumcontent:chromiumcontent
-
- cd "${S}" || die
-
- # Gather and prepare built components of libchromiumcontent.
- create_dist_args+=" --target_arch=${target_arch} --component=static_library"
- create_dist_args+=" --no_zip"
- create_dist_args+=" --system-icu"
- CHROMIUM_BUILD_DIR="${chromium_target}" \
- PYTHONPATH="${WORKDIR}/ninja-${NINJA_VERSION}/misc" \
- "${EPYTHON}" "${libcc_path}"/script/create-dist ${create_dist_args} || die
-
- # v8 is built as a shared library, so copy it manually
- # for generate_filenames_gypi to find.
- mkdir -p "${libcc_dist_shared_path}" || die
- cp "${chromium_target}/libv8.so" "${libcc_dist_shared_path}" || die
-
- "${EPYTHON}" "${libcc_path}"/tools/generate_filenames_gypi.py \
- "${libcc_dist_path}/filenames.gypi" \
- "${CHROMIUM_S}" \
- "${libcc_dist_shared_path}" \
- "${libcc_dist_static_path}"
-
- # Configure electron.
- myconf_gyp+="
- $(gyp_use cups)
- $(gyp_use gconf use_gconf)
- $(gyp_use gnome-keyring use_gnome_keyring)
- $(gyp_use gnome-keyring linux_link_gnome_keyring)
- $(gyp_use gtk3)
- $(gyp_use lto)"
-
- myconf_gyp+=" -Duse_system_icu=1"
-
- if [[ $(tc-getCC) == *clang* ]]; then
- myconf_gyp+=" -Dclang=1"
- else
- myconf_gyp+=" -Dclang=0"
- fi
-
- # Never use bundled gold binary. Disable gold linker flags for now.
- # Do not use bundled clang.
- myconf_gyp+="
- -Dclang_use_chrome_plugins=0
- -Dhost_clang=0
- -Dlinux_use_bundled_binutils=0
- -Dlinux_use_bundled_gold=0
- -Dlinux_use_gold_flags=0
- -Dsysroot="
-
- myconf_gyp+=" -Dtarget_arch=${target_arch}"
- myconf_gyp+=" -Dpython=${EPYTHON}"
-
- # Make sure that -Werror doesn't get added to CFLAGS by the build system.
- # Depending on GCC version the warnings are different and we don't want
- # the build to fail because of that.
- myconf_gyp+=" -Dwerror="
-
- # Disable fatal linker warnings, bug 506268.
- myconf_gyp+=" -Ddisable_fatal_linker_warnings=1"
-
- myconf_gyp+=" -Dicu_use_data_file_flag=0"
- myconf_gyp+=" -Dgenerate_character_data=0"
-
- myconf_gyp+=" -Dlibchromiumcontent_component=0"
- myconf_gyp+=" -Dcomponent=static_library"
- myconf_gyp+=" -Dlibrary=static_library"
- myconf_gyp+=" -Icommon.gypi electron.gyp"
-
- EGYP_CHROMIUM_COMMAND="${CHROMIUM_S}/build/gyp_chromium" \
- egyp_chromium ${myconf_gyp} || die
-
- mkdir -p "${compile_target}/lib/" || die
- # Copy libv8 and snapshot files so the node binary can find them.
- cp "${chromium_target}/libv8.so" "${compile_target}/lib/" || die
- cp "${chromium_target}/natives_blob.bin" "${compile_target}" || die
- cp "${chromium_target}/snapshot_blob.bin" "${compile_target}" || die
-
- # Copy generated shim headers.
- mkdir -p "${compile_target}/gen" || die
- cp -r "${chromium_target}/gen/shim_headers" \
- "${compile_target}/gen" || die
-
- # Build the Node binary and pax-mark it.
- eninja -C ${compile_target} nodebin
- pax-mark m ${compile_target}/nodebin
-
- # Finally, build Electron.
- eninja -C ${compile_target} electron
- pax-mark m ${compile_target}/electron
-
- echo "v${PV}" > ${compile_target}/version
-}
-
-src_install() {
- local install_dir="$(_get_install_dir)"
- local install_suffix="$(_get_install_suffix)"
- local LIBDIR="${ED}/usr/$(get_libdir)"
-
- pushd out/R/locales > /dev/null || die
- chromium_remove_language_paks
- popd > /dev/null || die
-
- # Install Electron
- insinto "${install_dir}"
- exeinto "${install_dir}"
- newexe out/R/nodebin node
- doexe out/R/electron
- doexe out/R/chromedriver
- doexe out/R/mksnapshot
- doins out/R/libv8.so
- fperms +x "${install_dir}/libv8.so"
- doins out/R/libnode.so
- fperms +x "${install_dir}/libnode.so"
- doins out/R/natives_blob.bin
- doins out/R/snapshot_blob.bin
- doins out/R/blink_image_resources_200_percent.pak
- doins out/R/content_resources_200_percent.pak
- doins out/R/content_shell.pak
- doins out/R/pdf_viewer_resources.pak
- doins out/R/ui_resources_200_percent.pak
- doins out/R/views_resources_200_percent.pak
- doins -r out/R/resources
- doins -r out/R/locales
- dosym "${install_dir}/electron" "/usr/bin/electron${install_suffix}"
-
- doins out/R/version
-
- # Install Node headers
- HEADERS_ONLY=1 \
- "${S}/vendor/node/tools/install.py" install "${ED}" "/usr" || die
- # set up a symlink structure that npm expects..
- dodir /usr/include/node/deps/{v8,uv}
- dosym . /usr/include/node/src
- for var in deps/{uv,v8}/include; do
- dosym ../.. /usr/include/node/${var}
- done
-
- dodir "/usr/include/electron${install_suffix}"
- mv "${ED}/usr/include/node" \
- "${ED}/usr/include/electron${install_suffix}/node" || die
-}
-
-pkg_postinst() {
- electron-config update
-}
-
-pkg_postrm() {
- electron-config update
-}
diff --git a/dev-util/electron/electron-2.0.10.ebuild b/dev-util/electron/electron-2.0.10.ebuild
deleted file mode 100644
index 0742d0910c4..00000000000
--- a/dev-util/electron/electron-2.0.10.ebuild
+++ /dev/null
@@ -1,908 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
- hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
- sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 eapi7-ver gnome2-utils flag-o-matic multilib \
- multiprocessing ninja-utils pax-utils portability python-any-r1 \
- toolchain-funcs virtualx xdg-utils
-
-# Keep this in sync with vendor/libchromiumcontent/VERSION
-CHROMIUM_VERSION="61.0.3163.100"
-# Keep this in sync with vendor/breakpad
-BREAKPAD_COMMIT="82f0452e6b687b3c1e14e08d172b2f3fb79ae91a"
-# Keep this in sync with vendor/breakpad/src (and find the corresponding
-# commit in https://github.com/google/breakpad/)
-BREAKPAD_SRC_COMMIT="67f738b7adb47dc1e3b272fb99062f4192fa6651"
-# Keep this in sync with vendor/node
-NODE_COMMIT="51abeb37cad3f2098c0f0fffdff739f4ac2393e8"
-# Keep this in sync with vendor/native_mate
-NATIVE_MATE_COMMIT="6a3d238b7e1e3742f2bb495336a84021d927a24f"
-# Keep this in sync with vendor/pdf_viewer
-PDF_VIEWER_COMMIT="a5251e497fb52e699b28f627e3cbb6d8cefb62df"
-# Keep this in sync with vendor/pdf_viewer/vendor/grit
-GRIT_COMMIT="9536fb6429147d27ef1563088341825db0a893cd"
-# Keep this in sync with vendor/libchromiumcontent
-LIBCHROMIUMCONTENT_COMMIT="cbd04c0dccc7655cd42f02baee3a622d5170ac08"
-# Keep this in sync with package.json#devDependencies
-ASAR_VERSION="0.13.0"
-BROWSERIFY_VERSION="14.0.0"
-NINJA_VERSION="1.8.2"
-GENTOO_PATCHES_VERSION="f0fb7725cfe73704dce84ec51bdccc024dc7ceff"
-
-PATCHES_P="gentoo-electron-patches-${GENTOO_PATCHES_VERSION}"
-CHROMIUM_P="chromium-${CHROMIUM_VERSION}"
-BREAKPAD_P="chromium-breakpad-${BREAKPAD_COMMIT}"
-BREAKPAD_SRC_P="breakpad-${BREAKPAD_SRC_COMMIT}"
-NODE_P="node-${NODE_COMMIT}"
-NATIVE_MATE_P="native-mate-${NATIVE_MATE_COMMIT}"
-PDF_VIEWER_P="pdf-viewer-${PDF_VIEWER_COMMIT}"
-GRIT_P="grit-${GRIT_COMMIT}"
-LIBCHROMIUMCONTENT_P="libchromiumcontent-${LIBCHROMIUMCONTENT_COMMIT}"
-ASAR_P="asar-${ASAR_VERSION}"
-BROWSERIFY_P="browserify-${BROWSERIFY_VERSION}"
-
-DESCRIPTION="Cross platform application development framework based on web technologies"
-HOMEPAGE="https://electronjs.org/"
-SRC_URI="
- https://commondatastorage.googleapis.com/chromium-browser-official/${CHROMIUM_P}.tar.xz
- https://github.com/electron/electron/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/electron/chromium-breakpad/archive/${BREAKPAD_COMMIT}.tar.gz -> electron-${BREAKPAD_P}.tar.gz
- https://github.com/google/breakpad/archive/${BREAKPAD_SRC_COMMIT}.tar.gz -> electron-${BREAKPAD_SRC_P}.tar.gz
- https://github.com/electron/node/archive/${NODE_COMMIT}.tar.gz -> electron-${NODE_P}.tar.gz
- https://github.com/zcbenz/native-mate/archive/${NATIVE_MATE_COMMIT}.tar.gz -> electron-${NATIVE_MATE_P}.tar.gz
- https://github.com/electron/pdf-viewer/archive/${PDF_VIEWER_COMMIT}.tar.gz -> electron-${PDF_VIEWER_P}.tar.gz
- https://github.com/elprans/grit/archive/${GRIT_COMMIT}.tar.gz -> electron-${GRIT_P}.tar.gz
- https://github.com/electron/libchromiumcontent/archive/${LIBCHROMIUMCONTENT_COMMIT}.tar.gz -> electron-${LIBCHROMIUMCONTENT_P}.tar.gz
- https://github.com/elprans/asar/releases/download/v${ASAR_VERSION}-gentoo/asar-build.tar.gz -> ${ASAR_P}.tar.gz
- https://github.com/elprans/node-browserify/releases/download/${BROWSERIFY_VERSION}-gentoo/browserify-build.tar.gz -> ${BROWSERIFY_P}.tar.gz
- https://github.com/elprans/gentoo-electron-patches/archive/${GENTOO_PATCHES_VERSION}.tar.gz -> electron-patches-${GENTOO_PATCHES_VERSION}.tar.gz
- https://github.com/ninja-build/ninja/archive/v${NINJA_VERSION}.tar.gz -> ninja-${NINJA_VERSION}.tar.gz
-"
-
-S="${WORKDIR}/${P}"
-CHROMIUM_S="${S}/chromium"
-NODE_S="${S}/vendor/node"
-BREAKPAD_S="${S}/vendor/breakpad"
-BREAKPAD_SRC_S="${BREAKPAD_S}/src"
-NATIVE_MATE_S="${S}/vendor/native_mate"
-PDF_VIEWER_S="${S}/vendor/pdf_viewer"
-GRIT_S="${PDF_VIEWER_S}/vendor/grit"
-LIBCC_S="${S}/vendor/libchromiumcontent"
-
-LICENSE="BSD"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-IUSE="cups custom-cflags gconf gnome-keyring kerberos lto neon pic
- +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc"
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
-
-# Native Client binaries are compiled with different set of flags, bug #452066.
-QA_FLAGS_IGNORED=".*\.nexe"
-
-# Native Client binaries may be stripped by the build system, which uses the
-# right tools for it, bug #469144 .
-QA_PRESTRIPPED=".*\.nexe"
-
-COMMON_DEPEND="
- app-arch/bzip2:=
- >=app-eselect/eselect-electron-2.0
- cups? ( >=net-print/cups-1.3.11:= )
- dev-libs/expat:=
- dev-libs/glib:2
- >=dev-libs/icu-58:=
- dev-libs/libxml2:=[icu]
- dev-libs/libxslt:=
- dev-libs/nspr:=
- >=dev-libs/nss-3.14.3:=
- >=dev-libs/re2-0.2016.05.01:=
- gconf? ( >=gnome-base/gconf-2.24.0:= )
- gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
- >=media-libs/alsa-lib-1.0.19:=
- media-libs/fontconfig:=
- media-libs/freetype:=
- >=media-libs/harfbuzz-1.4.2:=[icu(+)]
- media-libs/libexif:=
- media-libs/libjpeg-turbo:=
- media-libs/libpng:=
- >=media-libs/libvpx-1.7.0:=[postproc,svc]
- >=media-libs/openh264-1.6.0:=
- pulseaudio? ( media-sound/pulseaudio:= )
- system-ffmpeg? (
- >=media-video/ffmpeg-3:=
- || (
- media-video/ffmpeg[-samba]
- >=net-fs/samba-4.5.10-r1[-debug(-)]
- )
- !=net-fs/samba-4.5.12-r0
- media-libs/opus:=
- )
- >=net-dns/c-ares-1.13.0:=
- >=net-libs/nghttp2-1.32.0:=
- sys-apps/dbus:=
- sys-apps/pciutils:=
- virtual/udev
- x11-libs/cairo:=
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3[X]
- x11-libs/libdrm
- x11-libs/libnotify:=
- x11-libs/libX11:=
- x11-libs/libXcomposite:=
- x11-libs/libXcursor:=
- x11-libs/libXdamage:=
- x11-libs/libXext:=
- x11-libs/libXfixes:=
- >=x11-libs/libXi-1.6.0:=
- x11-libs/libXrandr:=
- x11-libs/libXrender:=
- x11-libs/libXScrnSaver:=
- x11-libs/libXtst:=
- x11-libs/pango:=
- app-arch/snappy:=
- media-libs/flac:=
- >=media-libs/libwebp-0.4.0:=
- sys-libs/zlib:=[minizip]
- kerberos? ( virtual/krb5 )
-"
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND="${COMMON_DEPEND}
- !<dev-util/electron-0.36.12-r4
- x11-misc/xdg-utils
- virtual/opengl
- virtual/ttf-fonts
- selinux? ( sec-policy/selinux-chromium )
- tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
-"
-# dev-vcs/git - https://bugs.gentoo.org/593476
-DEPEND="${COMMON_DEPEND}
- >=app-arch/gzip-1.7
- !arm? (
- dev-lang/yasm
- )
- dev-lang/perl
- dev-util/gn
- >=dev-util/gperf-3.0.3
- >=dev-util/ninja-1.7.2
- >=net-libs/nodejs-4.6.1
- sys-apps/hwids[usb(+)]
- >=sys-devel/bison-2.4.3
- sys-devel/flex
- virtual/pkgconfig
- dev-vcs/git
- $(python_gen_any_dep '
- dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
- >=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]
- dev-python/html5lib[${PYTHON_USEDEP}]
- dev-python/simplejson[${PYTHON_USEDEP}]
- ')
-"
-
-# Keep this in sync with the python_gen_any_dep call.
-python_check_deps() {
- has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" &&
- has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" &&
- has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" &&
- has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]"
-}
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
- EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-pre_build_checks() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- local -x CPP="$(tc-getCXX) -E"
- if tc-is-clang && ! ver_test "$(clang-fullversion)" -ge 3.9.1; then
- # bugs: #601654
- die "At least clang 3.9.1 is required"
- fi
- if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 4.9; then
- # bugs: #535730, #525374, #518668, #600288
- die "At least gcc 4.9 is required"
- fi
- fi
-
- # LTO pass requires more file descriptors
- if use lto; then
- local lto_n_rlimit_min="16384"
- local maxfiles=$(ulimit -n -H)
- if [ "${maxfiles}" -lt "${lto_n_rlimit_min}" ]; then
- eerror ""
- eerror "Building with USE=\"lto\" requires file descriptor" \
- "limit to be no less than ${lto_n_rlimit_min}."
- eerror "The current limit for portage is ${maxfiles}."
- eerror "Please add the following to /etc/security/limits.conf:"
- eerror ""
- eerror " root hard nofile ${lto_n_rlimit_min}"
- eerror " root soft nofile ${lto_n_rlimit_min}"
- eerror ""
- die
- fi
- fi
-
- # Check build requirements, bug #541816 and bug #471810 .
- CHECKREQS_MEMORY="3G"
- use lto && CHECKREQS_MEMORY="7G"
- CHECKREQS_DISK_BUILD="5G"
- eshopts_push -s extglob
- if is-flagq '-g?(gdb)?([1-9])'; then
- CHECKREQS_DISK_BUILD="25G"
- CHECKREQS_MEMORY="16G"
- fi
- eshopts_pop
- check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
- pre_build_checks
-}
-
-pkg_setup() {
- pre_build_checks
-
- # Make sure the build system will use the right python, bug #344367.
- python-any-r1_pkg_setup
-
- chromium_suid_sandbox_check_kernel_config
-}
-
-_unnest_patches() {
- local _s="${1%/}/"
- local path
- local relpath
- local out
-
- (find "${_s}" -mindepth 2 -name '*.patch' -printf "%P\n" || die) \
- | while read -r path; do
- relpath="$(dirname ${path})"
- out="${_s}/__${relpath////_}_$(basename ${path})"
- sed -r -e "s|^([-+]{3}) ([ab])/(.*)$|\1 \2/${relpath}/\3|g" \
- "${_s}/${path}" > "${out}" || die
- done
-}
-
-_get_install_suffix() {
- local c=(${SLOT//\// })
- local slot=${c[0]}
- local suffix
-
- if [[ "${slot}" == "0" ]]; then
- suffix=""
- else
- suffix="-${slot}"
- fi
-
- echo -n "${suffix}"
-}
-
-_get_install_dir() {
- echo -n "/usr/$(get_libdir)/electron$(_get_install_suffix)"
-}
-
-_get_target_arch() {
- local myarch="$(tc-arch)"
- local target_arch
-
- if [[ $myarch = amd64 ]] ; then
- target_arch=x64
- elif [[ $myarch = x86 ]] ; then
- target_arch=ia32
- elif [[ $myarch = arm64 ]] ; then
- target_arch=arm64
- elif [[ $myarch = arm ]] ; then
- target_arch=arm
- else
- die "Failed to determine target arch, got '$myarch'."
- fi
-
- echo -n "${target_arch}"
-}
-
-src_prepare() {
- mv "${WORKDIR}/${CHROMIUM_P}" "${CHROMIUM_S}" || die
- rm -r "${NODE_S}" &&
- mv "${WORKDIR}/${NODE_P}" "${NODE_S}" || die
- rm -r "${BREAKPAD_S}" &&
- mv "${WORKDIR}/${BREAKPAD_P}" "${BREAKPAD_S}" || die
- rm -r "${BREAKPAD_SRC_S}" &&
- mv "${WORKDIR}/${BREAKPAD_SRC_P}/src" "${BREAKPAD_SRC_S}" || die
- rm -r "${NATIVE_MATE_S}" &&
- mv "${WORKDIR}/${NATIVE_MATE_P}" "${NATIVE_MATE_S}" || die
- rm -r "${PDF_VIEWER_S}" &&
- mv "${WORKDIR}/${PDF_VIEWER_P}" "${PDF_VIEWER_S}" || die
- rm -r "${GRIT_S}" &&
- mv "${WORKDIR}/${GRIT_P}" "${GRIT_S}" || die
- rm -r "${LIBCC_S}" &&
- mv "${WORKDIR}/${LIBCHROMIUMCONTENT_P}" "${LIBCC_S}" || die
- rsync -a "${WORKDIR}/${ASAR_P}/node_modules/" \
- "${S}/node_modules/" || die
- rsync -a "${WORKDIR}/${BROWSERIFY_P}/node_modules/" \
- "${S}/node_modules/" || die
-
- # node patches
- cd "${NODE_S}" || die
- # make sure node uses the correct version of v8
- rm -r deps/v8 || die
- ln -s "${CHROMIUM_S}/v8" deps/ || die
-
- # make sure we use python2.* while using gyp
- sed -i -e "s/python/${EPYTHON}/" \
- deps/npm/node_modules/node-gyp/gyp/gyp || die
- sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" \
- deps/npm/node_modules/node-gyp/lib/configure.js || die
-
- python_fix_shebang "${CHROMIUM_S}/chrome/browser"
- python_fix_shebang "${CHROMIUM_S}/build/gyp_chromium"
- python_fix_shebang "${S}/tools/"
-
- # less verbose install output (stating the same as portage, basically)
- sed -i -e "/print/d" tools/install.py || die
-
- # proper libdir, hat tip @ryanpcmcquen
- # https://github.com/iojs/io.js/issues/504
- local LIBDIR=$(get_libdir)
- sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
- sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
- sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
-
- # Apply Gentoo patches for Electron itself.
- cd "${S}" || die
- _unnest_patches "${WORKDIR}/${PATCHES_P}/${PV}/electron/"
- eapply "${WORKDIR}/${PATCHES_P}/${PV}/electron/"
-
- # Apply Chromium patches from libchromiumcontent.
- cd "${CHROMIUM_S}" || die
- _unnest_patches "${LIBCC_S}/patches"
- eapply "${LIBCC_S}/patches"
-
- # Finally, apply Gentoo patches for Chromium.
- eapply "${WORKDIR}/${PATCHES_P}/${PV}/chromium/"
-
- # Merge chromiumcontent component into chromium source tree.
- mkdir -p "${CHROMIUM_S}/chromiumcontent" || die
- cp -a "${LIBCC_S}/chromiumcontent" "${CHROMIUM_S}/" || die
- cp -a "${LIBCC_S}/tools/linux/" "${CHROMIUM_S}/tools/" || die
-
- local keeplibs=(
- base/third_party/dmg_fp
- base/third_party/dynamic_annotations
- base/third_party/icu
- base/third_party/nspr
- base/third_party/superfasthash
- base/third_party/symbolize
- base/third_party/valgrind
- base/third_party/xdg_mime
- base/third_party/xdg_user_dirs
- breakpad/src/third_party/curl
- chrome/third_party/mozilla_security_manager
- courgette/third_party
- net/third_party/mozilla_security_manager
- net/third_party/nss
- third_party/WebKit
- third_party/analytics
- third_party/angle
- third_party/angle/src/common/third_party/base
- third_party/angle/src/common/third_party/murmurhash
- third_party/angle/src/third_party/compiler
- third_party/angle/src/third_party/libXNVCtrl
- third_party/angle/src/third_party/trace_event
- third_party/boringssl
- third_party/brotli
- third_party/cacheinvalidation
- third_party/catapult
- third_party/catapult/third_party/polymer
- third_party/catapult/third_party/py_vulcanize
- third_party/catapult/third_party/py_vulcanize/third_party/rcssmin
- third_party/catapult/third_party/py_vulcanize/third_party/rjsmin
- third_party/catapult/tracing/third_party/d3
- third_party/catapult/tracing/third_party/gl-matrix
- third_party/catapult/tracing/third_party/jszip
- third_party/catapult/tracing/third_party/mannwhitneyu
- third_party/catapult/tracing/third_party/oboe
- third_party/ced
- third_party/cld_2
- third_party/cld_3
- third_party/cros_system_api
- third_party/devscripts
- third_party/dom_distiller_js
- third_party/fips181
- third_party/flatbuffers
- third_party/flot
- third_party/freetype
- third_party/glslang-angle
- third_party/google_input_tools
- third_party/google_input_tools/third_party/closure_library
- third_party/google_input_tools/third_party/closure_library/third_party/closure
- third_party/googletest
- third_party/hunspell
- third_party/iccjpeg
- third_party/inspector_protocol
- third_party/jinja2
- third_party/jstemplate
- third_party/khronos
- third_party/leveldatabase
- third_party/libXNVCtrl
- third_party/libaddressinput
- third_party/libjingle
- third_party/libphonenumber
- third_party/libsecret
- third_party/libsrtp
- third_party/libudev
- third_party/libwebm
- third_party/libxml/chromium
- third_party/libyuv
- third_party/lss
- third_party/lzma_sdk
- third_party/markupsafe
- third_party/mesa
- third_party/modp_b64
- third_party/mt19937ar
- third_party/node
- third_party/node/node_modules/vulcanize/third_party/UglifyJS2
- third_party/openmax_dl
- third_party/ots
- third_party/pdfium
- third_party/pdfium/third_party/agg23
- third_party/pdfium/third_party/base
- third_party/pdfium/third_party/build
- third_party/pdfium/third_party/bigint
- third_party/pdfium/third_party/freetype
- third_party/pdfium/third_party/lcms2-2.6
- third_party/pdfium/third_party/libopenjpeg20
- third_party/pdfium/third_party/libpng16
- third_party/pdfium/third_party/libtiff
- third_party/ply
- third_party/polymer
- third_party/protobuf
- third_party/protobuf/third_party/six
- third_party/qcms
- third_party/sfntly
- third_party/skia
- third_party/skia/third_party/vulkan
- third_party/smhasher
- third_party/spirv-headers
- third_party/spirv-tools-angle
- third_party/sqlite
- third_party/swiftshader
- third_party/swiftshader/third_party/llvm-subzero
- third_party/swiftshader/third_party/subzero
- third_party/usrsctp
- third_party/vulkan
- third_party/vulkan-validation-layers
- third_party/web-animations-js
- third_party/webdriver
- third_party/webrtc
- third_party/widevine
- third_party/woff2
- third_party/zlib/google
- url/third_party/mozilla
- v8/src/third_party/valgrind
- v8/third_party/inspector_protocol
-
- # gyp -> gn leftovers
- base/third_party/libevent
- third_party/adobe
- third_party/speech-dispatcher
- third_party/usb_ids
- third_party/xdg-utils
- third_party/yasm/run_yasm.py
- )
- if ! use system-ffmpeg; then
- keeplibs+=( third_party/ffmpeg third_party/opus )
- fi
- if use tcmalloc; then
- keeplibs+=( third_party/tcmalloc )
- fi
-
- cd "${CHROMIUM_S}" || die
-
- # Remove most bundled libraries. Some are still needed.
- ebegin "Unbundling libraries"
- build/linux/unbundle/remove_bundled_libraries.py \
- "${keeplibs[@]}" --do-remove || die
- eend
-
- cd "${S}" || die
-
- eapply_user
-}
-
-src_configure() {
- local myconf_gn=""
- local myconf_gyp=""
-
- cd "${CHROMIUM_S}" || die
-
- # GN needs explicit config for Debug/Release as opposed to
- # inferring it from build directory.
- myconf_gn+=" is_debug=false"
-
- # Disable nacl, we can't build without pnacl (http://crbug.com/269560).
- myconf_gn+=" enable_nacl=false"
-
- # Use system-provided libraries.
- # TODO: freetype (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
- # TODO: use_system_hunspell (upstream changes needed).
- # TODO: use_system_libsrtp (bug #459932).
- # TODO: xml (bug #616818).
- # TODO: use_system_protobuf (bug #525560).
- # TODO: use_system_ssl (http://crbug.com/58087).
- # TODO: use_system_sqlite (http://crbug.com/22208).
-
- # libevent: https://bugs.gentoo.org/593458
- local gn_system_libraries=(
- flac
- harfbuzz-ng
- icu
- libdrm
- libjpeg
- libpng
- libvpx
- libwebp
- libxml
- libxslt
- openh264
- re2
- snappy
- yasm
- zlib)
- if use system-ffmpeg; then
- gn_system_libraries+=( libvpx ffmpeg opus )
- fi
- build/linux/unbundle/replace_gn_files.py \
- --system-libraries ${gn_system_libraries[@]} || die
-
- # Optional dependencies.
- myconf_gn+=" use_cups=$(usex cups true false)"
- myconf_gn+=" use_gconf=$(usex gconf true false)"
- myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
- myconf_gn+=" use_kerberos=$(usex kerberos true false)"
- myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-
- # TODO: link_pulseaudio=true for GN.
-
- myconf_gn+=" fieldtrial_testing_like_official_build=true"
-
- if tc-is-clang; then
- myconf_gn+=" is_clang=true clang_base_path=\"/usr\" clang_use_chrome_plugins=false"
- else
- myconf_gn+=" is_clang=false"
- fi
-
- # Never use bundled gold binary. Disable gold linker flags for now.
- # Do not use bundled clang.
- # Trying to use gold results in linker crash.
- myconf_gn+=" use_gold=false use_sysroot=false"
- myconf_gn+=" linux_use_bundled_binutils=false use_custom_libcxx=false"
-
- ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
- myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
- myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
- # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
- # Note: these are for Gentoo use ONLY. For your own distribution,
- # please get your own set of keys. Feel free to contact chromium@gentoo.org
- # for more info.
- local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
- myconf_gn+=" google_api_key=\"${google_api_key}\""
- myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
- myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
-
- local target_arch=$(_get_target_arch)
- local ffmpeg_target_arch="${target_arch}"
-
- if [[ ${ffmpeg_target_arch} = arm ]]; then
- ffmpeg_target_arch=$(usex neon arm-neon arm)
- fi
-
- # Make sure that -Werror doesn't get added to CFLAGS by the build system.
- # Depending on GCC version the warnings are different and we don't want
- # the build to fail because of that.
- myconf_gn+=" treat_warnings_as_errors=false"
-
- # Disable fatal linker warnings, bug 506268.
- myconf_gn+=" fatal_linker_warnings=false"
-
- # Avoid CFLAGS problems, bug #352457, bug #390147.
- if ! use custom-cflags; then
- replace-flags "-Os" "-O2"
- strip-flags
-
- filter-flags "-Wl,--as-needed"
-
- # Prevent linker from running out of address space, bug #471810 .
- if use x86; then
- filter-flags "-g*"
- fi
-
- # Prevent libvpx build failures. Bug 530248, 544702, 546984.
- if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
- filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
- fi
- fi
-
- # Make sure the build system will use the right tools, bug #340795.
- tc-export AR CC CXX NM
-
- # Define a custom toolchain for GN
- myconf_gn+=" custom_toolchain=\"${FILESDIR}/toolchain:default\""
-
- if tc-is-cross-compiler; then
- tc-export BUILD_{AR,CC,CXX,NM}
- myconf_gn+=" host_toolchain=\"${FILESDIR}/toolchain:host\""
- myconf_gn+=" v8_snapshot_toolchain=\"${FILESDIR}/toolchain:host\""
- else
- myconf_gn+=" host_toolchain=\"${FILESDIR}/toolchain:default\""
- fi
-
- # https://bugs.gentoo.org/588596
- append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
-
- myconf_gn+=" icu_use_data_file=false"
-
- use lto && myconf_gn+=" allow_posix_link_time_opt=true"
-
- # Tools for building programs to be executed on the build system, bug #410883.
- if tc-is-cross-compiler; then
- export AR_host=$(tc-getBUILD_AR)
- export CC_host=$(tc-getBUILD_CC)
- export CXX_host=$(tc-getBUILD_CXX)
- export NM_host=$(tc-getBUILD_NM)
- fi
-
- # Bug 491582.
- export TMPDIR="${WORKDIR}/temp"
- mkdir -p -m 755 "${TMPDIR}" || die
-
- if ! use system-ffmpeg; then
- local build_ffmpeg_args=""
- if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
- build_ffmpeg_args+=" --disable-asm"
- fi
-
- # Re-configure bundled ffmpeg. See bug #491378 for example reasons.
- einfo "Configuring bundled ffmpeg..."
- pushd third_party/ffmpeg > /dev/null || die
- chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
- --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
- chromium/scripts/copy_config.sh || die
- chromium/scripts/generate_gn.py || die
- popd > /dev/null || die
- fi
-
- third_party/libaddressinput/chromium/tools/update-strings.py || die
-
- touch chrome/test/data/webui/i18n_process_css_test.html || die
-
- einfo "Configuring bundled nodejs..."
- pushd "${S}/vendor/node" > /dev/null || die
- # --shared-libuv cannot be used as electron's node fork
- # patches uv_loop structure.
- ./configure --shared --without-bundled-v8 \
- --shared-openssl --shared-http-parser --shared-zlib \
- --shared-nghttp2 --shared-cares \
- --without-npm --with-intl=system-icu --without-dtrace \
- --dest-cpu=${target_arch} --prefix="" || die
- popd > /dev/null || die
-
- # libchromiumcontent configuration
- myconf_gn+=" root_extra_deps = [\"//chromiumcontent:chromiumcontent\"]"
- myconf_gn+=" is_electron_build = true"
- myconf_gn+=" is_component_build = false"
- myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
-
- einfo "Configuring chromiumcontent..."
- set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
- echo "$@"
- "$@" || die
-
- cd "${S}" || die
-}
-
-eninja() {
- if [[ -z ${NINJAOPTS+set} ]]; then
- local jobs=$(makeopts_jobs)
- local loadavg=$(makeopts_loadavg)
-
- if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
- NINJAOPTS+=" -j ${jobs}"
- fi
- if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
- NINJAOPTS+=" -l ${loadavg}"
- fi
- fi
- set -- ninja -v ${NINJAOPTS} "$@"
- echo "$@"
- "$@" || die
-}
-
-src_compile() {
- local compile_target="${S}/out/R"
- local myconf_gyp=""
- local chromium_target="${CHROMIUM_S}/out/Release"
- local libcc_path="${S}/vendor/libchromiumcontent"
- local libcc_dist_path="${libcc_path}/dist/main"
- local libcc_dist_static_path="${libcc_dist_path}/static_library"
- local libcc_dist_shared_path="${libcc_dist_path}/shared_library"
- local libcc_output="${CHROMIUM_S}/out/Release/obj/chromiumcontent"
- local libcc_output_shared="${libcc_output}-shared"
- local target_arch=$(_get_target_arch)
- local l=""
- local create_dist_args=""
-
- tc-export AR CC CXX NM
-
- mkdir -p "${compile_target}" || die
-
- cd "${CHROMIUM_S}" || die
-
- # Build mksnapshot and pax-mark it.
- eninja -C "${chromium_target}" mksnapshot || die
- pax-mark m "${chromium_target}/mksnapshot"
- cp -a "${chromium_target}/mksnapshot" "${compile_target}/" || die
-
- # Build chromedriver.
- eninja -C "${chromium_target}" chromedriver
- cp -a "${chromium_target}/chromedriver" "${compile_target}/" || die
-
- # Build libchromiumcontent components.
- eninja -C "${chromium_target}" chromiumcontent:chromiumcontent
- CHROMIUMCONTENT_2ND_PASS=1 \
- eninja -C "${chromium_target}" chromiumcontent:libs
-
- cd "${S}" || die
-
- # Gather and prepare built components of libchromiumcontent.
- create_dist_args+=" --target_arch=${target_arch} --component=static_library"
- create_dist_args+=" --no_zip"
- create_dist_args+=" --system-icu"
- CHROMIUM_BUILD_DIR="${chromium_target}" \
- PYTHONPATH="${WORKDIR}/ninja-${NINJA_VERSION}/misc" \
- "${EPYTHON}" "${libcc_path}"/script/create-dist ${create_dist_args} || die
-
- # v8 is built as a shared library, so copy it manually
- # for generate_filenames_gypi to find.
- mkdir -p "${libcc_dist_shared_path}" || die
- cp "${chromium_target}/libv8.so" "${libcc_dist_shared_path}" || die
-
- "${EPYTHON}" "${libcc_path}"/tools/generate_filenames_gypi.py \
- "${libcc_dist_path}/filenames.gypi" \
- "${CHROMIUM_S}" \
- "${libcc_dist_shared_path}" \
- "${libcc_dist_static_path}"
-
- # Configure electron.
- myconf_gyp+="
- $(gyp_use cups)
- $(gyp_use gconf use_gconf)
- $(gyp_use gnome-keyring use_gnome_keyring)
- $(gyp_use gnome-keyring linux_link_gnome_keyring)
- $(gyp_use lto)"
-
- myconf_gyp+=" -Duse_system_icu=1"
-
- if [[ $(tc-getCC) == *clang* ]]; then
- myconf_gyp+=" -Dclang=1"
- else
- myconf_gyp+=" -Dclang=0"
- fi
-
- # Never use bundled gold binary. Disable gold linker flags for now.
- # Do not use bundled clang.
- myconf_gyp+="
- -Dclang_use_chrome_plugins=0
- -Dhost_clang=0
- -Dlinux_use_bundled_binutils=0
- -Dlinux_use_bundled_gold=0
- -Dlinux_use_gold_flags=0
- -Dsysroot="
-
- myconf_gyp+=" -Dtarget_arch=${target_arch}"
- myconf_gyp+=" -Dpython=${EPYTHON}"
-
- # Make sure that -Werror doesn't get added to CFLAGS by the build system.
- # Depending on GCC version the warnings are different and we don't want
- # the build to fail because of that.
- myconf_gyp+=" -Dwerror="
-
- # Disable fatal linker warnings, bug 506268.
- myconf_gyp+=" -Ddisable_fatal_linker_warnings=1"
-
- myconf_gyp+=" -Dicu_use_data_file_flag=0"
- myconf_gyp+=" -Dgenerate_character_data=0"
-
- myconf_gyp+=" -Dmas_build=0"
- myconf_gyp+=" -Dlibchromiumcontent_component=0"
- myconf_gyp+=" -Dcomponent=static_library"
- myconf_gyp+=" -Dlibrary=static_library"
- myconf_gyp+=" -Icommon.gypi electron.gyp"
-
- EGYP_CHROMIUM_COMMAND="${CHROMIUM_S}/build/gyp_chromium" \
- egyp_chromium ${myconf_gyp} || die
-
- mkdir -p "${compile_target}/lib/" || die
- # Copy libv8 and snapshot files so the node binary can find them.
- cp "${chromium_target}/libv8.so" "${compile_target}/lib/" || die
- cp "${chromium_target}/natives_blob.bin" "${compile_target}" || die
- cp "${chromium_target}/snapshot_blob.bin" "${compile_target}" || die
-
- # Copy generated shim headers.
- mkdir -p "${compile_target}/gen" || die
- cp -r "${chromium_target}/gen/shim_headers" \
- "${compile_target}/gen" || die
-
- # Build the Node binary and pax-mark it.
- eninja -C ${compile_target} nodebin
- pax-mark m ${compile_target}/nodebin
-
- # Finally, build Electron.
- eninja -C ${compile_target} electron
- pax-mark m ${compile_target}/electron
-
- echo "v${PV}" > ${compile_target}/version
-}
-
-src_install() {
- local install_dir="$(_get_install_dir)"
- local install_suffix="$(_get_install_suffix)"
- local LIBDIR="${ED}/usr/$(get_libdir)"
-
- pushd out/R/locales > /dev/null || die
- chromium_remove_language_paks
- popd > /dev/null || die
-
- # Install Electron
- insinto "${install_dir}"
- exeinto "${install_dir}"
- newexe out/R/nodebin node
- doexe out/R/electron
- doexe out/R/chromedriver
- doexe out/R/mksnapshot
- doins out/R/libv8.so
- fperms +x "${install_dir}/libv8.so"
- doins out/R/libnode.so
- fperms +x "${install_dir}/libnode.so"
- doins out/R/natives_blob.bin
- doins out/R/snapshot_blob.bin
- doins out/R/blink_image_resources_200_percent.pak
- doins out/R/content_resources_200_percent.pak
- doins out/R/content_shell.pak
- doins out/R/pdf_viewer_resources.pak
- doins out/R/ui_resources_200_percent.pak
- doins out/R/views_resources_200_percent.pak
- doins -r out/R/resources
- doins -r out/R/locales
- dosym "${install_dir}/electron" "/usr/bin/electron${install_suffix}"
-
- doins out/R/version
-
- # Install Node headers
- HEADERS_ONLY=1 \
- "${S}/vendor/node/tools/install.py" install "${ED}" "/usr" || die
- # set up a symlink structure that npm expects..
- dodir /usr/include/node/deps/{v8,uv}
- dosym . /usr/include/node/src
- for var in deps/{uv,v8}/include; do
- dosym ../.. /usr/include/node/${var}
- done
-
- dodir "/usr/include/electron${install_suffix}"
- mv "${ED}/usr/include/node" \
- "${ED}/usr/include/electron${install_suffix}/node" || die
-}
-
-pkg_postinst() {
- electron-config update
-}
-
-pkg_postrm() {
- electron-config update
-}
diff --git a/dev-util/electron/electron-2.0.17-r1.ebuild b/dev-util/electron/electron-2.0.17-r2.ebuild
index 1671cd90af5..e367ebc4c07 100644
--- a/dev-util/electron/electron-2.0.17-r1.ebuild
+++ b/dev-util/electron/electron-2.0.17-r2.ebuild
@@ -33,7 +33,7 @@ LIBCHROMIUMCONTENT_COMMIT="daf9bdcdfdfd6bad258b5e1e48b2e17d06c1a987"
ASAR_VERSION="0.13.0"
BROWSERIFY_VERSION="14.0.0"
NINJA_VERSION="1.8.2"
-GENTOO_PATCHES_VERSION="b04011d68866c1159eb35b1a5260d519172cc05b"
+GENTOO_PATCHES_VERSION="26715595f4fe3658a73adb0d2fb338f62c79e492"
PATCHES_P="gentoo-electron-patches-${GENTOO_PATCHES_VERSION}"
CHROMIUM_P="chromium-${CHROMIUM_VERSION}"
@@ -79,7 +79,8 @@ LICENSE="BSD"
SLOT="$(ver_cut 1-2)"
KEYWORDS="~amd64"
IUSE="cups custom-cflags gconf gnome-keyring kerberos lto neon pic
- +proprietary-codecs pulseaudio selinux +system-ffmpeg +system-ssl +tcmalloc"
+ +proprietary-codecs pulseaudio selinux +system-ffmpeg +system-libvpx
+ +system-ssl +tcmalloc"
RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
# Native Client binaries are compiled with different set of flags, bug #452066.
@@ -100,7 +101,7 @@ COMMON_DEPEND="
dev-libs/libxslt:=
dev-libs/nspr:=
>=dev-libs/nss-3.14.3:=
- system-ssl? ( <dev-libs/openssl-1.1:0= )
+ system-ssl? ( <dev-libs/openssl-1.1:= )
>=dev-libs/re2-0.2016.05.01:=
gconf? ( >=gnome-base/gconf-2.24.0:= )
gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
@@ -111,7 +112,9 @@ COMMON_DEPEND="
media-libs/libexif:=
media-libs/libjpeg-turbo:=
media-libs/libpng:=
- >=media-libs/libvpx-1.7.0:=[postproc,svc]
+ system-libvpx? (
+ =media-libs/libvpx-1.7*:=[postproc,svc]
+ )
>=media-libs/openh264-1.6.0:=
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? (
@@ -167,7 +170,7 @@ DEPEND="${COMMON_DEPEND}
dev-lang/yasm
)
dev-lang/perl
- dev-util/gn
+ <dev-util/gn-0.1583
>=dev-util/gperf-3.0.3
>=dev-util/ninja-1.7.2
>=net-libs/nodejs-4.6.1
@@ -497,6 +500,10 @@ src_prepare() {
if ! use system-ffmpeg; then
keeplibs+=( third_party/ffmpeg third_party/opus )
fi
+ if ! use system-libvpx; then
+ keeplibs+=( third_party/libvpx )
+ keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
+ fi
if use tcmalloc; then
keeplibs+=( third_party/tcmalloc )
fi
@@ -555,6 +562,9 @@ src_configure() {
if use system-ffmpeg; then
gn_system_libraries+=( libvpx ffmpeg opus )
fi
+ if use system-libvpx; then
+ gn_system_libraries+=( libvpx )
+ fi
build/linux/unbundle/replace_gn_files.py \
--system-libraries ${gn_system_libraries[@]} || die
diff --git a/dev-util/electron/metadata.xml b/dev-util/electron/metadata.xml
index c291dd2197e..fde29b92183 100644
--- a/dev-util/electron/metadata.xml
+++ b/dev-util/electron/metadata.xml
@@ -1,22 +1,15 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>elvis@magic.io</email>
- <name>Elvis Pranskevichus</name>
- </maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
+ <!--maintainer-needed-->
<longdescription>Electron is a cross platform application development framework based on web technologies based on Chromium</longdescription>
<use>
<flag name="gconf">Use gnome-base/gconf</flag>
- <flag name="gtk3">Use GTK+3 instead of GTK+2</flag>
<flag name="lto">Build with link time optimization enabled</flag>
<flag name="pic">Disable optimized assembly code that is not PIC friendly</flag>
<flag name="proprietary-codecs">Enable proprietary codecs like H.264, MP3</flag>
<flag name="system-ffmpeg">Use system ffmpeg instead of the bundled one</flag>
+ <flag name="system-libvpx">Use system libvpx instead of the bundled one</flag>
<flag name="system-ssl">Use system OpenSSL instead of the bundled one</flag>
<flag name="tcmalloc">Use bundled tcmalloc instead of system malloc</flag>
</use>
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 201c0927571..80f5119ad4c 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/ftjam/metadata.xml b/dev-util/ftjam/metadata.xml
index 7a1075ebf9b..9ac1892a9bf 100644
--- a/dev-util/ftjam/metadata.xml
+++ b/dev-util/ftjam/metadata.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <!--maintainer-needed-->
<upstream>
<remote-id type="sourceforge">freetype</remote-id>
</upstream>
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 02142f1ea3c..02ed30f97ea 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -1 +1,2 @@
DIST glib-2.58.3.tar.xz 4863648 BLAKE2B 4269bd6e80869f39d567917438f750561debb1b45d40ecea487d2e76e2468e07dc8d80a23678699f7b8f7778c2ed9d29e866ae5e33770f51ed00709dd5fe97eb SHA512 1e1cb5b607367dcbadb95563d463e81702cf396b28f1173f6d933707f4f3d5595a70225423e918807a05994a24f16fa3ac87d2ec67e4b670244ea99836634cce
+DIST glib-2.60.6.tar.xz 4589516 BLAKE2B 33546aea288dee4aa8c04bda610a65ce75705c0e2b98284e787d42576c61eccbd33788084b092e030fe26c50ff08e398782227d1f2ac39ef9754b91af1ab1aa1 SHA512 2e079d2268e0cd4dd234501c03e7784a69258ea2303e62baa4869ff7a442d121c2ffdc742467e3b0b46ad953b831962e1dd847463d66b2b28745ba0f0bfd28d9
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild
new file mode 100644
index 00000000000..04ecd71de65
--- /dev/null
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="glib"
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_REQ_USE="xml"
+DISTUTILS_SINGLE_IMPL=1
+
+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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-libs/libxslt
+ app-text/docbook-xsl-stylesheets
+"
+
+S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
+
+python_prepare_all() {
+ PATCHES=(
+ "${FILESDIR}/${PN}-2.56.1-sitedir.patch"
+ )
+ distutils-r1_python_prepare_all
+
+ sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
+ sed -e "s:@VERSION@:${PV}:" 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/glade/Manifest b/dev-util/glade/Manifest
index 9a5ce83c170..a17abc4b039 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -1 +1,2 @@
DIST glade-3.20.4.tar.xz 3534860 BLAKE2B f502e863f9acbd6580c043ff82dffb84ea8fdb833c0b6fdb8bbeeb7a7056a79416f1140472d23e0cdb14ed3bd06e17fca93ea663af690451001909aa4abfe478 SHA512 3da7781f74fa80e21336e49b9b36cf73b88ec9cf6f66a5c0e5d48ebc3382d87f5eb981b924704f04dfa4931e5691928a20c7cc73cca5b5f3a32e2348d6b87802
+DIST glade-3.22.1.tar.xz 3592952 BLAKE2B 53f769198a093ff5d4dc98bb4ea98c6e5195933caf24247a99db980312ae3398fca3abbd640d08c02e8fb5f8647ee3e4b18e65073b1500e9017ee0586993a331 SHA512 e1bdc49b89bc5010c0abf6357dbae05c921182655b2ee5a4b161af6adfd596cfbcd495c9851ba956abbf3d6156616a6c0e94640cd72cee11551ca388674ac908
diff --git a/dev-util/glade/glade-3.22.1.ebuild b/dev-util/glade/glade-3.22.1.ebuild
new file mode 100644
index 00000000000..0106822b04d
--- /dev/null
+++ b/dev-util/glade/glade-3.22.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-single-r1 virtualx
+
+DESCRIPTION="A user interface designer for GTK+ and GNOME"
+HOMEPAGE="https://glade.gnome.org/"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+
+IUSE="debug +introspection python webkit"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ dev-libs/atk[introspection?]
+ >=dev-libs/glib-2.53.2:2
+ >=dev-libs/libxml2-2.4.0:2
+ x11-libs/cairo:=
+ x11-libs/gdk-pixbuf:2[introspection?]
+ >=x11-libs/gtk+-3.20.0:3[introspection?]
+ x11-libs/pango[introspection?]
+ introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+ python? (
+ ${PYTHON_DEPS}
+ >=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}] )
+ webkit? ( >=net-libs/webkit-gtk-2.12.0:4 )
+"
+DEPEND="${RDEPEND}
+ app-text/docbook-xml-dtd:4.1.2
+ app-text/yelp-tools
+ dev-libs/libxslt
+ >=dev-util/gtk-doc-am-1.13
+ >=dev-util/intltool-0.41.0
+ dev-util/itstool
+ virtual/pkgconfig
+
+ dev-libs/gobject-introspection-common
+ gnome-base/gnome-common
+"
+# eautoreconf requires:
+# dev-libs/gobject-introspection-common
+# gnome-base/gnome-common
+
+RESTRICT="test" # https://gitlab.gnome.org/GNOME/glade/issues/333
+
+PATCHES=(
+ # To avoid file collison with other slots, rename help module.
+ # Prevent the UI from loading glade:3's gladeui devhelp documentation.
+ "${FILESDIR}"/${PN}-3.14.1-doc-version.patch
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-static \
+ --enable-gladeui \
+ --enable-libtool-lock \
+ $(usex debug --enable-debug ' ') \
+ $(use_enable introspection) \
+ $(use_enable python) \
+ $(use_enable webkit webkit2gtk)
+}
+
+src_test() {
+ virtx emake check
+}
+
+src_install() {
+ # modify name in .devhelp2 file to avoid shadowing with glade:3 docs
+ sed -e 's:name="gladeui":name="gladeui-2":' \
+ -i doc/html/gladeui.devhelp2 || die "sed of gladeui.devhelp2 failed"
+ gnome2_src_install
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+ if ! has_version dev-util/devhelp ; then
+ elog "You may want to install dev-util/devhelp for integration API"
+ elog "documentation support."
+ fi
+}
diff --git a/dev-util/glade/metadata.xml b/dev-util/glade/metadata.xml
index 39980802b1d..64de49b2607 100644
--- a/dev-util/glade/metadata.xml
+++ b/dev-util/glade/metadata.xml
@@ -5,4 +5,7 @@
<email>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>
</maintainer>
+<use>
+ <flag name="webkit">Build catalog support for <pkg>net-libs/webkit-gtk</pkg>:4 widgets.</flag>
+</use>
</pkgmetadata>
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index 02142f1ea3c..02ed30f97ea 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1 +1,2 @@
DIST glib-2.58.3.tar.xz 4863648 BLAKE2B 4269bd6e80869f39d567917438f750561debb1b45d40ecea487d2e76e2468e07dc8d80a23678699f7b8f7778c2ed9d29e866ae5e33770f51ed00709dd5fe97eb SHA512 1e1cb5b607367dcbadb95563d463e81702cf396b28f1173f6d933707f4f3d5595a70225423e918807a05994a24f16fa3ac87d2ec67e4b670244ea99836634cce
+DIST glib-2.60.6.tar.xz 4589516 BLAKE2B 33546aea288dee4aa8c04bda610a65ce75705c0e2b98284e787d42576c61eccbd33788084b092e030fe26c50ff08e398782227d1f2ac39ef9754b91af1ab1aa1 SHA512 2e079d2268e0cd4dd234501c03e7784a69258ea2303e62baa4869ff7a442d121c2ffdc742467e3b0b46ad953b831962e1dd847463d66b2b28745ba0f0bfd28d9
diff --git a/dev-util/glib-utils/glib-utils-2.60.6.ebuild b/dev-util/glib-utils/glib-utils-2.60.6.ebuild
new file mode 100644
index 00000000000..d181aae8301
--- /dev/null
+++ b/dev-util/glib-utils/glib-utils-2.60.6.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+
+RDEPEND="${PYTHON_DEPS}
+ !<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/global/metadata.xml b/dev-util/global/metadata.xml
index b8ecaba5d8e..8dbeee5f328 100644
--- a/dev-util/global/metadata.xml
+++ b/dev-util/global/metadata.xml
@@ -6,11 +6,7 @@
</maintainer>
<maintainer type="person">
<email>arfrever.fta@gmail.com</email>
- </maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
+ </maintainer>
<use>
<flag name="vim">Integrate the GNU GLOBAL source code tag system with Vim</flag>
</use>
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 09d71d2ebb5..0ef47bc7087 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,3 +1,2 @@
-DIST glslang-7.10.2984.tar.gz 2439082 BLAKE2B f736f0e1c7be39531360de97d0bfb64681fee32dfd324d48082ff286b0a0355f313fe71ddcbac380e48213ba5433e4d0a95fa65a7f0f99c3cdef603e9722ad73 SHA512 4b96ee59745f4ba91e8e89a9a926e93f00db11dba9c74c4997efae5c9252c4e04a0a2cad0c6b8fc2dcbf7d690887486ee59db930628f3284545f89d3d7a3293c
DIST glslang-7.11.3114_pre20190415.tar.gz 2841827 BLAKE2B 7d1c46f05d0b5def4d9612f45d3c24b67a4497dc229bbaecdad8d2109ae17e5545a12dac04b42bf8102b8d2b3ca6919168d238da7c496a5713ece83a664101f8 SHA512 d75e5a7ceea305bacf489696c14a17209e9793ebc3efbacda8cc26b23fd7ff6c5d2b1b3348df108be6e9249862454e0584772f09f702d47374923c4cde491192
DIST glslang-7.9.2888.tar.gz 2370459 BLAKE2B 9dc5550dce1fd718a8050cec81ad94195b19cc36cc4321fe5def48051dd66de4f9c651b6c34a7363701b52afba9f8c6cd4c2264f38416bc911fd2dcdf5a88ca4 SHA512 9a067a5006596bf61cd20f09173e2d22db37a10413bba1b1bb6e5ad3ecf46701786977961e2da8bfa32b19ccb2cc0a04d765f65ae01b80148e9b3f52dbfa8737
diff --git a/dev-util/glslang/glslang-7.10.2984.ebuild b/dev-util/glslang/glslang-7.10.2984.ebuild
deleted file mode 100644
index 6d4c55f1d56..00000000000
--- a/dev-util/glslang/glslang-7.10.2984.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib cmake-utils vcs-snapshot
-
-SNAPSHOT_COMMIT="7.10.2984"
-SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 x86"
-
-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"
diff --git a/dev-util/glslang/glslang-7.11.3114_pre20190415-r1.ebuild b/dev-util/glslang/glslang-7.11.3114_pre20190415-r1.ebuild
index 1fedaf94389..5c09f581090 100644
--- a/dev-util/glslang/glslang-7.11.3114_pre20190415-r1.ebuild
+++ b/dev-util/glslang/glslang-7.11.3114_pre20190415-r1.ebuild
@@ -7,7 +7,7 @@ inherit cmake-multilib cmake-utils
SNAPSHOT_COMMIT="0527c9db8148ce37442fa4a9c99a2a23ad50b0b7"
SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
S="${WORKDIR}/glslang-${SNAPSHOT_COMMIT}"
DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
diff --git a/dev-util/glslang/glslang-7.11.3114_pre20190415.ebuild b/dev-util/glslang/glslang-7.11.3114_pre20190415.ebuild
deleted file mode 100644
index 93f0e5a4805..00000000000
--- a/dev-util/glslang/glslang-7.11.3114_pre20190415.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib cmake-utils vcs-snapshot
-
-SNAPSHOT_COMMIT="0527c9db8148ce37442fa4a9c99a2a23ad50b0b7"
-SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-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"
diff --git a/dev-util/gn/Manifest b/dev-util/gn/Manifest
index b825a8a36ce..f681f83b9e4 100644
--- a/dev-util/gn/Manifest
+++ b/dev-util/gn/Manifest
@@ -1,3 +1,3 @@
DIST gn-0.1463.tar.gz 905571 BLAKE2B e048e642704533d478fb751748a97f60283f63868ab1ab6fa5b8e7bc0322745cf21464eaa16194f684869b50f306668d3c7d3b4f72c3985b865d8492d1ff0901 SHA512 f32861a8fa44034b932e6aae4787fd7da6e4c6c19c5b6919de7b0d0f1ba20f415c1c55db95a08958a338b7b9de740ff49a29ab894a9c4e9049a89450d8c88281
DIST gn-0.1544.tar.gz 911124 BLAKE2B b8bac7783c373e8101cf727c254c2ee50af49c3e679a8df2cb337a0637e305f1f9094517e6af6a76a19300f533a41d9433624a7963ba0151a88a636bc7e6b4f8 SHA512 5cb3a25b66d44cd26063453ddf96563d62b24e8a961ca7fa29a48ee7bde4a423bd0dace36c432b46b677e042fcac9a4fb23afa5dc27e994fca54030b972dad29
-DIST gn-0.1583.tar.xz 648856 BLAKE2B 997e469bd1411c5307ebf03fca0c533356b6d652f4782212681de7e57f21c493d9d4ae8856877d259234babf4be4e13e529532ba5075ea0de3b823f66cb1ff1e SHA512 8026f9fe549fb2fe8d83ad1ae93ebfd31851e64bc43765fbebda9963b2719c25b551a5db4cf833ac475a797abb928ccc03c74be8be49a3dd184ea944e5d749e2
+DIST gn-0.1616.tar.xz 660332 BLAKE2B dab581d9f05cbe7ed91758d0ec68c61bd4e9fd0357b9cfa04f5276185ed6e810b37d9e2177cf3daec29e25633af2d32c6f733507a77cee7e37681bb977a59818 SHA512 42f68b40eebc423b785b1ba735548b3e5d2b64abd0dc1bb22940b9336c491308f062f547f81b5366c1dfe1f0e3bb41390ed3e3712637765cac1a50499a5e04d2
diff --git a/dev-util/gn/gn-0.1544.ebuild b/dev-util/gn/gn-0.1544.ebuild
index 92d8f91252f..2ab8a04093f 100644
--- a/dev-util/gn/gn-0.1544.ebuild
+++ b/dev-util/gn/gn-0.1544.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="vim-syntax"
BDEPEND="
diff --git a/dev-util/gn/gn-0.1583.ebuild b/dev-util/gn/gn-0.1616.ebuild
index 60df97bc0fe..172a7364d2a 100644
--- a/dev-util/gn/gn-0.1583.ebuild
+++ b/dev-util/gn/gn-0.1616.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="vim-syntax"
BDEPEND="
diff --git a/dev-util/google-perftools/metadata.xml b/dev-util/google-perftools/metadata.xml
index e6791a60364..d0d5d6f4d6a 100644
--- a/dev-util/google-perftools/metadata.xml
+++ b/dev-util/google-perftools/metadata.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <!--maintainer-needed-->
<use>
<flag name="largepages">
Use (experimental) larger pages for tcmalloc, this increases
diff --git a/dev-util/gource/gource-0.49.ebuild b/dev-util/gource/gource-0.49.ebuild
index 29159bcde85..2674015bbd8 100644
--- a/dev-util/gource/gource-0.49.ebuild
+++ b/dev-util/gource/gource-0.49.ebuild
@@ -23,7 +23,7 @@ COMMON_DEPEND="
dev-libs/libpcre:3
dev-libs/tinyxml
media-libs/freetype:2
- media-libs/mesa
+ media-libs/mesa[X(+)]
virtual/glu:0
"
RDEPEND="${COMMON_DEPEND}
diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest
index daae6d4a31f..d85c569ab7e 100644
--- a/dev-util/gtk-update-icon-cache/Manifest
+++ b/dev-util/gtk-update-icon-cache/Manifest
@@ -1,4 +1,2 @@
-DIST gtk-update-icon-cache-3.24.0.tar.xz 372708 BLAKE2B 2a6bffd4453c2201bbb78e4ba581f6bd6453f650ca32de7e8002cb88f5872c868ef25973587c96b58b28d2b74fbbac192dd608e72cd5bbbc0823486a9c55c46c SHA512 9dada697ace2ea5f3b5ab64c6063c1a9a792f9b9aa23d4c3888e3a487fda9b1c99a5d0793bb0f9e182dc66a1a5c7ff944f8b9f2ca2f4de7ecc24c048d7a55339
DIST gtk-update-icon-cache-3.24.3.tar.xz 372612 BLAKE2B 6087334fdca3aa7f93b1b6c5a7195ede2376ec80d2618809f924f9b612de46a8d3e95f0a90030deb939f27949458f9ec72b11600c2bf8b1ae6089284324f2c9d SHA512 0e47977567314abc64419440cc0f276525286fb65acbfe7fff21d6cf548fbc072865f8a2ed18e3114508a7e8fa696453c26e1ad53e638ee11dab57b4a6cf75a5
-DIST gtk-update-icon-cache-3.24.7.tar.bz2 91098 BLAKE2B a97bf3e168238afd8c20c9adea281c9bb71764b5227e5e3c5f78b175568e5a8ea14ab7d2de6aa9e6d38b766cf5f7f1c5c0f646b6d2dd55c0747e43bad4c0a319 SHA512 2396034539628f74bee6539666d0c5eed85814044aa58b21272beb27f7fe47cbd6b5326e358cd1cbef0e1498fcef20b2aabed1bb831cfa1e528a011ce8312e7b
DIST gtk-update-icon-cache-3.24.8.tar.bz2 91113 BLAKE2B 4a930d001a9718b14089962a6c368c9073afa7163217ec2a5f35ab6bcab593490d20944321a2980baef42e13eee43b26a3dee35c8327c8aaa984e5c36611600f SHA512 20ffc1a3570cc4de045a698e51e5b5bc214a78f9b1f730a1930e07df78d965d883262c6776bdcd68b6b39f309d75678531daa6975c0cfc9ecd9070b26b89b4b1
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.0.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.0.ebuild
deleted file mode 100644
index 8c43e5d5b90..00000000000
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2
-
-DESCRIPTION="GTK update icon cache"
-HOMEPAGE="https://www.gtk.org/ https://github.com/EvaSDK/gtk-update-icon-cache"
-SRC_URI="https://dev.gentoo.org/~leio/distfiles/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# man page was previously installed by gtk+:3 ebuild
-RDEPEND="
- >=dev-libs/glib-2.49.4:2
- >=x11-libs/gdk-pixbuf-2.30:2
- !<x11-libs/gtk+-2.24.28-r1:2
- !<x11-libs/gtk+-3.22.2:3
-"
-DEPEND="${RDEPEND}
- >=sys-devel/gettext-0.19.7
- virtual/pkgconfig
-"
-
-src_configure() {
- # man pages are shipped in tarball
- gnome2_src_configure --disable-man
-}
-
-src_install() {
- gnome2_src_install
- doman docs/${PN}.1
-}
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.7.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.7.ebuild
deleted file mode 100644
index 8187209413d..00000000000
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.7.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit meson
-
-DESCRIPTION="GTK update icon cache"
-HOMEPAGE="https://www.gtk.org/ https://gitlab.gnome.org/Community/gentoo/gtk-update-icon-cache"
-SRC_URI="https://gitlab.gnome.org/Community/gentoo/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# man page was previously installed by gtk+:3 ebuild
-RDEPEND="
- >=dev-libs/glib-2.53.4:2
- >=x11-libs/gdk-pixbuf-2.30:2
- !<x11-libs/gtk+-2.24.28-r1:2
- !<x11-libs/gtk+-3.22.2:3
-"
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.3
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
diff --git a/dev-util/gyp/gyp-20170904022846.ebuild b/dev-util/gyp/gyp-20170904022846.ebuild
index 01a8975bd42..1642a828af1 100644
--- a/dev-util/gyp/gyp-20170904022846.ebuild
+++ b/dev-util/gyp/gyp-20170904022846.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017-2019 Arfrever Frehtes Taifersar Arahesis
+# Copyright 2017-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
diff --git a/dev-util/gyp/gyp-99999999999999.ebuild b/dev-util/gyp/gyp-99999999999999.ebuild
index f427d6156ee..062dcc11375 100644
--- a/dev-util/gyp/gyp-99999999999999.ebuild
+++ b/dev-util/gyp/gyp-99999999999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017-2019 Arfrever Frehtes Taifersar Arahesis
+# Copyright 2017-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
diff --git a/dev-util/howdoi/Manifest b/dev-util/howdoi/Manifest
index bd2a98fba53..92e3998380e 100644
--- a/dev-util/howdoi/Manifest
+++ b/dev-util/howdoi/Manifest
@@ -1,2 +1 @@
-DIST howdoi-1.1.14.tar.gz 8421 BLAKE2B 40689f3ca1ce487fd5278406115b70e51d82ce2ff2f8b1e60c02fad6f92adfcb532c3ce73c4126027a0812e21b599bf5f9d20e8d3c23d6dc4e541a877e1ba52d SHA512 348125e666d42b657ee493a405207238aab12cb4815da52de2bc3d0635a85476e942ed73b6eb75e7ac51e744f01ebe987dd45ecc69b1774f264a6bd9c4a2826e
DIST howdoi-1.2.1.tar.gz 13112 BLAKE2B 33492547fab53085aebff295202e8ad88d41850503155b944f38382137d6ec8fbcd4f6050583b16c01c3701683ccf18c6929c525b5d8f34bf6f2ed9410668f36 SHA512 83af30118087105392ddb95b05d9e7442f5ee5df981faa9143770dedb8927c164a4f30f37ccd219a826340f0f8cd81fc5eb9a3b12e5d3956786294699b6e2f9b
diff --git a/dev-util/howdoi/howdoi-1.1.14.ebuild b/dev-util/howdoi/howdoi-1.1.14.ebuild
deleted file mode 100644
index c24bb930931..00000000000
--- a/dev-util/howdoi/howdoi-1.1.14.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-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/pygments[${PYTHON_USEDEP}]
- >=dev-python/pyquery-1.4.0[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/requests-cache[${PYTHON_USEDEP}]
-"
diff --git a/dev-util/howdoi/howdoi-1.2.1.ebuild b/dev-util/howdoi/howdoi-1.2.1.ebuild
index e97bb424dc8..c9eaed1e638 100644
--- a/dev-util/howdoi/howdoi-1.2.1.ebuild
+++ b/dev-util/howdoi/howdoi-1.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-util/hxtools/metadata.xml b/dev-util/hxtools/metadata.xml
index 097975e3adc..58f638b2ac3 100644
--- a/dev-util/hxtools/metadata.xml
+++ b/dev-util/hxtools/metadata.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <!--maintainer-needed-->
</pkgmetadata>
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.9-opencl-clang_solib_filename.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.9-opencl-clang_solib_filename.patch
new file mode 100644
index 00000000000..aef204e9055
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.9-opencl-clang_solib_filename.patch
@@ -0,0 +1,14 @@
+--- a/IGC/BiFModule/CMakeLists.txt
++++ b/IGC/BiFModule/CMakeLists.txt
+@@ -158,11 +158,7 @@
+
+ if(UNIX)
+ if(NOT ${CCLANG_BUILD_INTREE_LLVM})
+- if(${LLVM_VERSION_MINOR} EQUAL 0 AND ${LLVM_VERSION_PATCH} EQUAL 0)
+ set_property(TARGET opencl-clang-lib PROPERTY "IMPORTED_SONAME" "${COMMON_CLANG_LIB_FULL_NAME}.${LLVM_VERSION_MAJOR}")
+- else()
+- set_property(TARGET opencl-clang-lib PROPERTY "IMPORTED_SONAME" "${COMMON_CLANG_LIB_FULL_NAME}.${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}")
+- endif()
+ endif()
+ if (NOT CCLANG_FROM_SYSTEM)
+ install(FILES $<TARGET_FILE:opencl-clang-lib> DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} COMPONENT igc-opencl)
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.9.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.9.ebuild
index 54d2ad4034c..6ed0f9a6290 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.9.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.9.ebuild
@@ -22,6 +22,7 @@ LLVM_MAX_SLOT=8
PATCHES=(
"${FILESDIR}"/${PN}-1.0.9-no_Werror.patch
+ "${FILESDIR}"/${PN}-1.0.9-opencl-clang_solib_filename.patch
)
S="${WORKDIR}"/${PN}-igc-${PV}
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 8e6128a2d54..507ab47d98e 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -1,4 +1,2 @@
-DIST jenkins-bin-2.164.3.war 77335220 BLAKE2B 0f2a84419268e9831620fd3be1e7648470f2b6568fddf8bdb76494fd53fcb5a81c52f44110809cd6700cbfe34251f5e6c48114de95d388296c2d98ae70cb9923 SHA512 de9303dc89e80ec084862c1f4a8a3638826ae3a514bb9591e46bc0acbe511912daa228d85e25b0b53d051e8ec293ae57e229a5d8ead5b9a80d8d6ce26eb6995f
-DIST jenkins-bin-2.176.1.war 77272319 BLAKE2B 2aa3f263163e4b9f6290fa0322a5d43c6a6ce196abb9f5aea21a7fab9d7f9ec5e3851ccbeca8291891ec5b18f619dabf2f204529c7ec0bc61172e0679fce7f37 SHA512 39caa250c71473da40d86160247fc0ec450df86d2b7453932c49c17c2b8d4307cccc579e9ff690119ad806fc4f67ab4cc65857000f451f31b0eb945b83b1408b
-DIST jenkins-bin-2.177.war 77352458 BLAKE2B 45564839dbfbd0579b7f54215838df8205433f4e7040179629b020141aafb1e51264e7ecb4c5c8aa1cd938674bbfeb05b578027ea5cb74ea0d49c75239e9cd3a SHA512 060431fc2e5022911160c9cfe34353342dffb5a1dbc9b8a21140b90220812224a99fe7d26c1faa58e2830764d7a29836962b058f00ee097381455a0d6ff22085
-DIST jenkins-bin-2.180.war 77259066 BLAKE2B 87e981aaafddd863aebaf63b2f5e851db3aab4916ac2131cc9f4a3ae3fb6cc16ccae77a4b53b7728480e4388a8b766b57bfbba7cc6a017cf89be3b3e634871df SHA512 ab626311695528e2970b3faecde7e5ec07dc12cce88b3861a5d74980349d4d409a476c38f0bdc3c0e9b443e8d2881eb77b7503eec2844e4abd8e5e149367b0d3
+DIST jenkins-bin-2.176.2.war 77379386 BLAKE2B feb66ad7042ab38ecd75c31e11587efe32d06c799e6f7fd46453969faa5edc241f99d844184e8f53dbde3bd05aeda676622baf2440eccd6c721300d877acb3e6 SHA512 8e53637a10942e7cb5907a669b72bd200369c65b47a8c3a050f356887cc65e8e2a0bab7b7a56d78735e5a2da77395268f4fbf4f6d5b219f9052dff72a96c6f05
+DIST jenkins-bin-2.186.war 77649944 BLAKE2B 8247cae6d25c6b24cb7b874c3e9335cfe8b82d54406a3b37a909a2cde7178f38da8312ce89b63d4e6833d7c5a5369350c97ea5a785412b4acd5ebc5e40898be6 SHA512 70140e5bb199ca1b801763ca1440d41a96dfbf3f1df0d0aa04d00e81be42616464626ed808205e7353e476dc4aa7d320c85b141ec07448b0ba2251449d0c0c28
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.176.1.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.176.1.ebuild
deleted file mode 100644
index 323b8895510..00000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.176.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 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.164.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.176.2.ebuild
index 323b8895510..323b8895510 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.164.3.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.176.2.ebuild
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.180.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.180.ebuild
deleted file mode 100644
index 7d232cbccac..00000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.180.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 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 ~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.177.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.186.ebuild
index 7d232cbccac..7d232cbccac 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.177.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.186.ebuild
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index d87e2026b8a..70e6b8a650c 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1 +1,2 @@
-DIST kdev-php-5.3.2.tar.xz 1008036 BLAKE2B 33940afeeb7b8594f0dbf56e444ba05f9665c7e4c9bc1d55c9d6a5b85bd2e03a04db1b8f27d968d627e26cfa573a3da519bb1d0eb592dc784296c9db7ea1fad8 SHA512 d8649bca173eccc1aa6568715e5976beb762ad7a377adbdab8f55aad76176ca5c8d16477ec70fa231b5699105d2a827c2ffda1c4835419c670c561b4444605b4
+DIST kdev-php-5.3.3.tar.xz 1043652 BLAKE2B d181984e0c8c6b77502529dace0cb2b13afa417e98149a7caaf379fc5c27e64f7928c4232489a0e4b21af6500636a71b7217a56e500c367a579585dca6c447a9 SHA512 8a478e6170ed63ccd82822a5281abb63f70d959ae945b730d2d707efd104b0a3475a66ddb637f134d1eed90173342c1ecf42e7b15947b96c141e6228ef96a009
+DIST kdev-php-5.4.1.tar.xz 1042236 BLAKE2B 58c0e2c1d8cf0732bd4114e2c20c35076233ca1d1b6920de43abfd804f03468496596e2b061fcc8b9b8a0e9e7a10630a1f6b2f2271b33b702dc91852dfbccb48 SHA512 a6dc4447be0148956fa805a45a73bfd05311b08f6fb3beda486f2703753a1825de97b81f67ebe6e178acf5ad238f6d6708704c04ede3bdefad19ec36d467ff7a
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.3.2.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.3.3.ebuild
index d339104a6d8..23b9ad37caa 100644
--- a/dev-util/kdevelop-php/kdevelop-php-5.3.2.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-5.3.3.ebuild
@@ -39,9 +39,7 @@ DEPEND="
dev-util/kdevelop-pg-qt:5
dev-util/kdevelop:5
"
-RDEPEND="${DEPEND}
- !dev-util/kdevelop-php-docs
-"
+RDEPEND="${DEPEND}"
# remaining tests fail for some, bug 668530
RESTRICT+=" test"
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.4.1.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.4.1.ebuild
new file mode 100644
index 00000000000..736a5e6971a
--- /dev/null
+++ b/dev-util/kdevelop-php/kdevelop-php-5.4.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_DOC_DIR="docs"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+KMNAME="kdev-php"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="PHP plugin for KDevelop"
+HOMEPAGE="https://www.kdevelop.org/"
+LICENSE="GPL-2 LGPL-2"
+IUSE=""
+
+BDEPEND="
+ test? ( dev-util/kdevelop:5[test] )
+"
+DEPEND="
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep ktexteditor)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep threadweaver)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtwidgets)
+ dev-util/kdevelop-pg-qt:5
+ dev-util/kdevelop:5=
+"
+RDEPEND="${DEPEND}"
+
+# remaining tests fail for some, bug 668530
+RESTRICT+=" test"
+
+src_test() {
+ # tests hang, bug 667922
+ local myctestargs=(
+ -E "(completionbenchmark|duchain_multiplefiles)"
+ )
+ kde5_src_test
+}
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index 040611e880e..21271b53f37 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1 +1,2 @@
-DIST kdev-python-5.3.2.tar.xz 1074980 BLAKE2B de19a603d9c0fbf870b271b16d98b676ad9246edbc62f926c63ec66f51806c52fdec0284b016b291599b80d68faeb7eef80f4b5efc7e8f12f6362948b1df05c2 SHA512 95d8e0e94bfad70fabad75e362f5483db897ba56980251a76af48df863c7277746704c826692a6cec854e60c97f3ea9791b1e162b7ea2f357d469715d0a74672
+DIST kdev-python-5.3.3.tar.xz 1082448 BLAKE2B 000d0e54c5e2b5eb41c6be0f82d7b6ef476bed3175f367db11fdcebf2f7063b322ac0901059a2e17391904f2ac5cffdcb48d3015665d697e89aa6e0be1ae550e SHA512 4d388b20588b4032efd677e9f152be53739a4c5c5bb3fcf37b5289da418c47281b6a545ae5825f9674b90333e69f2949e6e9b4d6704010cbb878d2ce8b3ee384
+DIST kdev-python-5.4.1.tar.xz 1074132 BLAKE2B d2f21849e14ef9828085b4fa9fe8a9af85e71f59263be7295a76932801700730ec3bac147c287ed400515e0552ee79a5f48ae96398820f0000951abf82fc83c8 SHA512 156ad0af9fbd3e5845979abfa68329de4228edabe68e0765ebde2821289d2bb027d46623be2bc805cea6988450d594d94c1b497ce4ee1b8d86a88cd7ff1eebcc
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.3.2.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.3.3.ebuild
index f9a306678f5..f9a306678f5 100644
--- a/dev-util/kdevelop-python/kdevelop-python-5.3.2.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-5.3.3.ebuild
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.4.1.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.4.1.ebuild
new file mode 100644
index 00000000000..4329abd3e93
--- /dev/null
+++ b/dev-util/kdevelop-python/kdevelop-python-5.4.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="forceoptional"
+KMNAME="kdev-python"
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit kde5 python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Python plugin for KDevelop"
+HOMEPAGE="https://www.kdevelop.org/"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep ktexteditor)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep threadweaver)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtwidgets)
+ dev-util/kdevelop:5=
+"
+RDEPEND="${DEPEND}
+ dev-python/pycodestyle[${PYTHON_USEDEP}]
+"
+
+RESTRICT+=" test"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+ kde5_pkg_setup
+}
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 68d95547ec6..47a9e692f02 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1 +1,2 @@
-DIST kdevelop-5.3.2.tar.xz 6851944 BLAKE2B b918cd0cb9b915227a442641a110db27387fd2e946c0411e40206a4a68990a9268a6c47c7f1da8a8f8a5c2690a1577c75fbbbb353d69ddfeed419e2c561aac4a SHA512 f0a8354a596a13dab0c5560d8308097918f5540b02d9a66a63155af00aa024aae9c01b455290ecafe705784a9c25afd24f7d936d1f817af1fb5b52d96e6dc596
+DIST kdevelop-5.3.3.tar.xz 6977420 BLAKE2B 8cccce2b7473551dc4ee9b9b06e8777e7f98869870ed7ee797b0e3a7c27f68d75b7af0f030dc9b0302a44ff246f69ec9125994cd72e6020e2778ac55f6d593fb SHA512 a089763045f02ef3167fab1f663503cc7a6e29cd8a42d3caa8b3a71fc1b2150162504bf4404ea070f73b3786a7389b6ee5af9ff922515445b57a0041b07e7d5d
+DIST kdevelop-5.4.1.tar.xz 7006564 BLAKE2B 98e76daca0f124f0786a0cab5a3575548ad0d2e157c72ccbe2ebee2dc1f2fd98f6d7d803991b4c426e65d16c5feb41f818440443c00b9bcf472d9c42fbdbd2fd SHA512 096d6e1d93b4faff5988d92381bea9c31048cc686cb71c52c66d54249c8cdae50dce03f63b6cd2a6ee1f15898f619ab7307fad58281186fb6d410b2ace2041d0
diff --git a/dev-util/kdevelop/kdevelop-5.3.2.ebuild b/dev-util/kdevelop/kdevelop-5.3.3.ebuild
index 8a841a0d0f4..9f502160d9d 100644
--- a/dev-util/kdevelop/kdevelop-5.3.2.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.3.3.ebuild
@@ -83,13 +83,10 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
$(add_kdeapps_dep kapptemplate)
$(add_kdeapps_dep kio-extras)
+ $(add_qt_dep qdbus)
dev-util/ninja
>=sys-devel/gdb-7.0[python]
reviewboard? ( $(add_kdeapps_dep ktp-accounts-kcm) )
- !dev-util/kdevelop-clang
- !dev-util/kdevelop-cppcheck
- !dev-util/kdevelop-qmake
- !dev-util/kdevelop-qmljs
!dev-util/kdevplatform
"
diff --git a/dev-util/kdevelop/kdevelop-5.4.1.ebuild b/dev-util/kdevelop/kdevelop-5.4.1.ebuild
new file mode 100644
index 00000000000..6fae88586b6
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-5.4.1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+VIRTUALDBUS_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
+HOMEPAGE="https://www.kdevelop.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="5/54" # look at KDEVELOP_SOVERSION inside CMakeLists.txt
+IUSE="+gdbui hex +plasma +qmake reviewboard subversion webkit"
+
+COMMON_DEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktexteditor)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep sonnet)
+ $(add_frameworks_dep threadweaver)
+ $(add_kdeapps_dep libkomparediff2)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative 'widgets')
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qthelp)
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qttest)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ dev-libs/grantlee:5
+ >=sys-devel/clang-3.8.0:=
+ gdbui? ( $(add_plasma_dep libksysguard) )
+ hex? ( app-editors/okteta:5 )
+ plasma? (
+ $(add_frameworks_dep krunner)
+ $(add_frameworks_dep plasma)
+ )
+ qmake? ( dev-util/kdevelop-pg-qt:5 )
+ reviewboard? ( $(add_frameworks_dep purpose) )
+ subversion? (
+ dev-libs/apr:1
+ dev-libs/apr-util:1
+ dev-vcs/subversion
+ )
+ webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
+ !webkit? ( $(add_qt_dep qtwebengine 'widgets') )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/boost
+ $(add_qt_dep qtconcurrent)
+"
+RDEPEND="${COMMON_DEPEND}
+ $(add_kdeapps_dep kapptemplate)
+ $(add_kdeapps_dep kio-extras)
+ $(add_qt_dep qdbus)
+ $(add_qt_dep qtquickcontrols)
+ $(add_qt_dep qtquickcontrols2)
+ dev-util/ninja
+ >=sys-devel/gdb-7.0[python]
+ reviewboard? ( $(add_kdeapps_dep ktp-accounts-kcm) )
+ !dev-util/kdevelop-clang-tidy
+ !dev-util/kdevplatform
+"
+
+RESTRICT+=" test"
+# see bug 366471
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package gdbui KF5SysGuard)
+ -DBUILD_executeplasmoid=$(usex plasma)
+ $(cmake-utils_use_find_package plasma KF5Plasma)
+ $(cmake-utils_use_find_package hex OktetaKastenControllers)
+ $(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
+ $(cmake-utils_use_find_package reviewboard KF5Purpose)
+ $(cmake-utils_use_find_package subversion SubversionLibrary)
+ $(cmake-utils_use_find_package !webkit Qt5WebEngineWidgets)
+ )
+
+ use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
+
+ kde5_src_configure
+}
+
+pkg_postinst() {
+ kde5_pkg_postinst
+
+ if ! has_version "kde-apps/konsole" ; then
+ elog "For konsole view, please install kde-apps/konsole"
+ fi
+
+ if ! has_version "dev-util/cppcheck" ; then
+ elog "For static C/C++ code analysis support, please install dev-util/cppcheck"
+ fi
+
+ if ! has_version "dev-util/heaptrack[qt5]" ; then
+ elog "For heap memory profiling support, please install dev-util/heaptrack"
+ fi
+
+ if ! has_version "dev-util/clazy" ; then
+ elog "For static C++ Qt code analysis support, please install dev-util/clazy"
+ fi
+}
diff --git a/dev-util/kernelshark/Manifest b/dev-util/kernelshark/Manifest
new file mode 100644
index 00000000000..dcdebcda120
--- /dev/null
+++ b/dev-util/kernelshark/Manifest
@@ -0,0 +1 @@
+DIST kernelshark-1.0.tar.gz 4238163 BLAKE2B edae4bcaf646a8c430e64205cd5d137d8df7eb839075b4bb5da459852e1bb887eaa98de51afd1884cfd27833d3513fc26995fba6964220eb8b95a317d3e4e057 SHA512 ff9f0846ba7105813742bb56887870eff8af4f525864ab75d37dcb2dd6c2222fbd500fd08140d605c3f0021d88991c114e0ffeb7da9ada979bdd78defaa1c266
diff --git a/dev-util/kernelshark/files/kernelshark-1.0-build.patch b/dev-util/kernelshark/files/kernelshark-1.0-build.patch
new file mode 100644
index 00000000000..411d4235a21
--- /dev/null
+++ b/dev-util/kernelshark/files/kernelshark-1.0-build.patch
@@ -0,0 +1,33 @@
+diff --git a/CMakeLists.txt b/kernel-shark/CMakeLists.txt
+index 45c6f23..e2394d9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -63,11 +63,11 @@ set(KS_LOGO_LABEL KS_logo_horizontal.svg)
+
+ set(CMAKE_INSTALL_RPATH "${_INSTALL_PREFIX}/lib/${KS_APP_NAME}/")
+
+-if (CMAKE_BUILD_TYPE MATCHES Package)
++if (NOT CMAKE_BUILD_TYPE MATCHES Package)
+
+ set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+
+-else (CMAKE_BUILD_TYPE MATCHES Package)
++else (CMAKE_BUILD_TYPE MATCHES Gentoo)
+
+ set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+
+diff --git a/build/FindTraceCmd.cmake b/kernel-shark/build/FindTraceCmd.cmake
+index 2da4eee..c454ce6 100644
+--- a/build/FindTraceCmd.cmake
++++ b/build/FindTraceCmd.cmake
+@@ -40,8 +40,8 @@ find_library(TRACEEVENT_LIBRARY NAMES traceevent/libtraceevent.a
+ # search was successful "find_path" will do nothing this time.
+ find_program(TRACECMD_EXECUTABLE NAMES trace-cmd)
+ find_path(TRACECMD_INCLUDE_DIR NAMES trace-cmd/trace-cmd.h)
+-find_library(TRACECMD_LIBRARY NAMES trace-cmd/libtracecmd.so)
+-find_library(TRACEEVENT_LIBRARY NAMES traceevent/libtraceevent.so)
++find_library(TRACECMD_LIBRARY NAMES libtracecmd.so)
++find_library(TRACEEVENT_LIBRARY NAMES libtraceevent.so)
+
+ IF (TRACECMD_INCLUDE_DIR AND TRACECMD_LIBRARY AND TRACECMD_EXECUTABLE)
+
diff --git a/dev-util/kernelshark/files/kernelshark-1.0-desktop-version.patch b/dev-util/kernelshark/files/kernelshark-1.0-desktop-version.patch
new file mode 100644
index 00000000000..2b9b444958d
--- /dev/null
+++ b/dev-util/kernelshark/files/kernelshark-1.0-desktop-version.patch
@@ -0,0 +1,11 @@
+diff --git a/kernel-shark/build/ks.desktop.cmake b/kernel-shark/build/ks.desktop.cmake
+index 2b02c0d..34c02ea 100644
+--- a/build/ks.desktop.cmake
++++ b/build/ks.desktop.cmake
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Version=@KS_VERSION_STRING@
++Version=1.1
+ Type=Application
+ Name=Kernel Shark
+ GenericName=Kernel Shark
diff --git a/dev-util/kernelshark/kernelshark-1.0.ebuild b/dev-util/kernelshark/kernelshark-1.0.ebuild
new file mode 100644
index 00000000000..44d6447fb0e
--- /dev/null
+++ b/dev-util/kernelshark/kernelshark-1.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic cmake-utils
+
+DESCRIPTION="Graphical reader for trace-cmd output"
+HOMEPAGE="http://kernelshark.org/"
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+ EGIT_REPO_URI="https://github.com/rostedt/trace-cmd.git"
+ inherit git-r3
+ S="${WORKDIR}/${P}/kernel-shark"
+
+else
+ MY_P="${PN}-v${PV}"
+ SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-${MY_P}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}/trace-cmd-${MY_P}/kernel-shark"
+
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="custom-optimization doc"
+
+DEPEND=">=dev-util/trace-cmd-2.8.3:=
+ dev-libs/json-c:=
+ >=media-libs/freeglut-3.0.0:=
+ x11-libs/libXmu:=
+ x11-libs/libXi:=
+ dev-qt/qtcore:5=
+ dev-qt/qtwidgets:5=
+ dev-qt/qtnetwork:5=
+"
+RDEPEND="${DEPEND}"
+BDEPEND=">=dev-util/cmake-2.8.11
+ doc? (
+ media-gfx/graphviz
+ app-doc/doxygen
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/kernelshark-1.0-build.patch"
+ "${FILESDIR}/kernelshark-1.0-desktop-version.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -D_INSTALL_PREFIX="${EPREFIX}/usr"
+ -DTRACECMD_INCLUDE_DIR="${EPREFIX}/usr/include/trace-cmd"
+ -D_DOXYGEN_DOC="$(usex doc)"
+ )
+ use custom-optimization || replace-flags -O? -O3
+ cmake-utils_src_configure
+}
diff --git a/dev-util/kernelshark/kernelshark-9999.ebuild b/dev-util/kernelshark/kernelshark-9999.ebuild
new file mode 100644
index 00000000000..44d6447fb0e
--- /dev/null
+++ b/dev-util/kernelshark/kernelshark-9999.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic cmake-utils
+
+DESCRIPTION="Graphical reader for trace-cmd output"
+HOMEPAGE="http://kernelshark.org/"
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+ EGIT_REPO_URI="https://github.com/rostedt/trace-cmd.git"
+ inherit git-r3
+ S="${WORKDIR}/${P}/kernel-shark"
+
+else
+ MY_P="${PN}-v${PV}"
+ SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-${MY_P}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}/trace-cmd-${MY_P}/kernel-shark"
+
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="custom-optimization doc"
+
+DEPEND=">=dev-util/trace-cmd-2.8.3:=
+ dev-libs/json-c:=
+ >=media-libs/freeglut-3.0.0:=
+ x11-libs/libXmu:=
+ x11-libs/libXi:=
+ dev-qt/qtcore:5=
+ dev-qt/qtwidgets:5=
+ dev-qt/qtnetwork:5=
+"
+RDEPEND="${DEPEND}"
+BDEPEND=">=dev-util/cmake-2.8.11
+ doc? (
+ media-gfx/graphviz
+ app-doc/doxygen
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/kernelshark-1.0-build.patch"
+ "${FILESDIR}/kernelshark-1.0-desktop-version.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -D_INSTALL_PREFIX="${EPREFIX}/usr"
+ -DTRACECMD_INCLUDE_DIR="${EPREFIX}/usr/include/trace-cmd"
+ -D_DOXYGEN_DOC="$(usex doc)"
+ )
+ use custom-optimization || replace-flags -O? -O3
+ cmake-utils_src_configure
+}
diff --git a/dev-util/kernelshark/metadata.xml b/dev-util/kernelshark/metadata.xml
new file mode 100644
index 00000000000..8de31ac92c9
--- /dev/null
+++ b/dev-util/kernelshark/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">
+ <email>chutzpah@gentoo.org</email>
+ <name>Patrick McLean</name>
+ </maintainer>
+ <use>
+ <flag name="custom-optimization">Build with user-specified compiler optimizations
+ (-Os, -O0, -O1, -O2, -O3) from CFLAGS</flag>
+ </use>
+</pkgmetadata>
diff --git a/dev-util/lcov/lcov-1.11.ebuild b/dev-util/lcov/lcov-1.11.ebuild
index cb9b990b3e6..2914b905e0b 100644
--- a/dev-util/lcov/lcov-1.11.ebuild
+++ b/dev-util/lcov/lcov-1.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ltp/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux ~x64-macos"
IUSE=""
DEPEND=""
diff --git a/dev-util/lcov/lcov-1.9-r1.ebuild b/dev-util/lcov/lcov-1.9-r1.ebuild
index b1a3a8e8906..b8e716831cd 100644
--- a/dev-util/lcov/lcov-1.9-r1.ebuild
+++ b/dev-util/lcov/lcov-1.9-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ltp/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc x86 ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux ~x64-macos"
IUSE=""
DEPEND=""
diff --git a/dev-util/lcov/lcov-9999.ebuild b/dev-util/lcov/lcov-9999.ebuild
index cd55511f099..54b7b4ded91 100644
--- a/dev-util/lcov/lcov-9999.ebuild
+++ b/dev-util/lcov/lcov-9999.ebuild
@@ -22,6 +22,8 @@ IUSE="png"
RDEPEND="
dev-lang/perl
+ dev-perl/JSON
+ dev-perl/PerlIO-gzip
png? ( dev-perl/GD[png] )
"
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 600376d186f..f6369dee292 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,4 +1,6 @@
DIST lldb-7.1.0.src.tar.xz 19384976 BLAKE2B a1d5afea255f06221516e21e80120cb35d870ec447aff774d8c610c889c8f28228c7c8e93eec160fc5424736666fcaac8ed42d9181373d266202c9f8aa4c3061 SHA512 773f79939c540f349f1c85d6b1d89fa312488c4c70f100f05cb6250f62e8d6a05832d57c02750439ede905fa69e1380a73ddde0d3ad2f99a0910acd1011559df
DIST lldb-8.0.0.src.tar.xz 19602332 BLAKE2B 85a51b3ccae8fd0074b0f5b54e35d2eb020770246b13a0ec52a4647d30f23a6620ce410af7e49604947ff60f789ecab0bfeddfc3598642c9096cf3362d88b5bf SHA512 5192d6d6d1759db28569de929ba8db2a80283000f1bf8453d9cf172ac85574c8eacc13f9fe64ecabea0533bfc49c0f58ea8fb29b1f4d88c065d905d553f2e60c
+DIST lldb-8.0.1.src.tar.xz 19586288 BLAKE2B afb20a8303dcbdaf76ef1d78aa3165f87713f1c16121905d7a5f71e770ceafdff40d9d19e0a983d9290da2d4eb3acd0987d50607bea17efdb7dc0127d7f5cf8a SHA512 eb031985ad4d08226ec47a90fe32c1e6d070948971ca5235fd431cf7d5b7ea20f5d5131237bf83a6419773d18c339590bf9672e7b4f884304497e63c1030988f
DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
DIST llvm-8.0.0.src.tar.xz 30503732 BLAKE2B d89bdeb0ec7d885e49cfe5ae025da84f00502d409710c0807a3cdd58dbd47c50cf6a635593569483150f7f2ecb0de0310bd6785cb7625219bf9f6224a0d68e1c SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f
+DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
diff --git a/dev-util/lldb/lldb-8.0.9999.ebuild b/dev-util/lldb/lldb-10.0.0.9999.ebuild
index 42ab87c3fa4..b28959dc3c2 100644
--- a/dev-util/lldb/lldb-8.0.9999.ebuild
+++ b/dev-util/lldb/lldb-10.0.0.9999.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
# (needed due to CMAKE_BUILD_TYPE != Gentoo)
CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
inherit cmake-utils git-r3 llvm multiprocessing python-single-r1 \
toolchain-funcs
@@ -16,7 +16,6 @@ HOMEPAGE="https://llvm.org/"
SRC_URI=""
EGIT_REPO_URI="https://git.llvm.org/git/lldb.git
https://github.com/llvm-mirror/lldb.git"
-EGIT_BRANCH="release_80"
LICENSE="UoI-NCSA"
SLOT="0"
@@ -99,6 +98,7 @@ src_configure() {
}
src_test() {
+ local -x LIT_PRESERVES_TMP=1
cmake-utils_src_make check-lldb-lit
use python && cmake-utils_src_make check-lldb
}
@@ -106,15 +106,5 @@ src_test() {
src_install() {
cmake-utils_src_install
- # oh my...
- if use python; then
- # remove custom readline.so for now
- # TODO: figure out how to deal with it
- # upstream is basically building a custom readline.so with -ledit
- # to avoid symbol collisions between readline and libedit...
- rm "${D}$(python_get_sitedir)/readline.so" || die
-
- # byte-compile the modules
- python_optimize
- fi
+ use python && python_optimize
}
diff --git a/dev-util/lldb/lldb-8.0.1.ebuild b/dev-util/lldb/lldb-8.0.1.ebuild
new file mode 100644
index 00000000000..4b8d996e176
--- /dev/null
+++ b/dev-util/lldb/lldb-8.0.1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils llvm multiprocessing python-single-r1 \
+ toolchain-funcs
+
+MY_P=${P/_/}.src
+LLVM_P=llvm-${PV/_/}.src
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${MY_P}.tar.xz
+ test? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${LLVM_P}.tar.xz )"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="libedit ncurses +python test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ libedit? ( dev-libs/libedit:0= )
+ ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+ python? ( dev-python/six[${PYTHON_USEDEP}]
+ ${PYTHON_DEPS} )
+ ~sys-devel/clang-${PV}[xml]
+ ~sys-devel/llvm-${PV}
+ !<sys-devel/llvm-4.0"
+DEPEND="${RDEPEND}
+ python? ( >=dev-lang/swig-3.0.11 )
+ test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] )
+ ${PYTHON_DEPS}"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+S=${WORKDIR}/${MY_P}
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+ LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+ python-single-r1_pkg_setup
+}
+
+src_unpack() {
+ einfo "Unpacking ${MY_P}.tar.xz ..."
+ tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
+
+ if use test; then
+ einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
+ tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
+ "${LLVM_P}"/{lib/Testing/Support,utils/unittest} || die
+ mv "${LLVM_P}" llvm || die
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DLLDB_DISABLE_CURSES=$(usex !ncurses)
+ -DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
+ -DLLDB_DISABLE_PYTHON=$(usex !python)
+ -DLLDB_USE_SYSTEM_SIX=1
+ -DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+ -DLLDB_INCLUDE_TESTS=$(usex test)
+
+ # TODO: fix upstream to detect this properly
+ -DHAVE_LIBDL=ON
+ -DHAVE_LIBPTHREAD=ON
+
+ # normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+ # and TERMINFO_LIBS... so just force FindCurses.cmake to use
+ # ncurses with complete library set (including autodetection
+ # of -ltinfo)
+ -DCURSES_NEED_NCURSES=ON
+ )
+ use test && mycmakeargs+=(
+ -DLLVM_BUILD_TESTS=$(usex test)
+ # compilers for lit tests
+ -DLLDB_TEST_C_COMPILER="$(type -P clang)"
+ -DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
+
+ -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+ -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+ -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+ )
+
+ cmake-utils_src_configure
+}
+
+src_test() {
+ cmake-utils_src_make check-lldb-lit
+ use python && cmake-utils_src_make check-lldb
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ # oh my...
+ if use python; then
+ # remove custom readline.so for now
+ # TODO: figure out how to deal with it
+ # upstream is basically building a custom readline.so with -ledit
+ # to avoid symbol collisions between readline and libedit...
+ rm "${D}$(python_get_sitedir)/readline.so" || die
+
+ # byte-compile the modules
+ python_optimize
+ fi
+}
diff --git a/dev-util/lldb/lldb-9999.ebuild b/dev-util/lldb/lldb-9.0.0.9999.ebuild
index 3f43283685f..6c729010c45 100644
--- a/dev-util/lldb/lldb-9999.ebuild
+++ b/dev-util/lldb/lldb-9.0.0.9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
# (needed due to CMAKE_BUILD_TYPE != Gentoo)
CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
inherit cmake-utils git-r3 llvm multiprocessing python-single-r1 \
toolchain-funcs
@@ -16,6 +16,7 @@ HOMEPAGE="https://llvm.org/"
SRC_URI=""
EGIT_REPO_URI="https://git.llvm.org/git/lldb.git
https://github.com/llvm-mirror/lldb.git"
+EGIT_BRANCH="release_90"
LICENSE="UoI-NCSA"
SLOT="0"
@@ -44,7 +45,7 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
CMAKE_BUILD_TYPE=RelWithDebInfo
pkg_setup() {
- llvm_pkg_setup
+ LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
python-single-r1_pkg_setup
}
@@ -98,6 +99,7 @@ src_configure() {
}
src_test() {
+ local -x LIT_PRESERVES_TMP=1
cmake-utils_src_make check-lldb-lit
use python && cmake-utils_src_make check-lldb
}
@@ -105,15 +107,5 @@ src_test() {
src_install() {
cmake-utils_src_install
- # oh my...
- if use python; then
- # remove custom readline.so for now
- # TODO: figure out how to deal with it
- # upstream is basically building a custom readline.so with -ledit
- # to avoid symbol collisions between readline and libedit...
- rm "${D}$(python_get_sitedir)/readline.so" || die
-
- # byte-compile the modules
- python_optimize
- fi
+ use python && python_optimize
}
diff --git a/dev-util/lxqt-build-tools/lxqt-build-tools-0.6.0.ebuild b/dev-util/lxqt-build-tools/lxqt-build-tools-0.6.0.ebuild
index 93dd16cdff9..9efd9eafc84 100644
--- a/dev-util/lxqt-build-tools/lxqt-build-tools-0.6.0.ebuild
+++ b/dev-util/lxqt-build-tools/lxqt-build-tools-0.6.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
else
SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 x86"
fi
LICENSE="BSD"
diff --git a/dev-util/makepp/Manifest b/dev-util/makepp/Manifest
index 3ddd5d4dff3..2c8e625c9eb 100644
--- a/dev-util/makepp/Manifest
+++ b/dev-util/makepp/Manifest
@@ -1,2 +1,3 @@
DIST makepp-1.18.tar.gz 236990 BLAKE2B 4f2c894a706fd188eeeae4422ac828cd99cccb2e8f6b7280a2be55363b99f4fff011932f3dfd550062e932f5c90ddc7f41fd56cb5e765c694b7296ac7f7beb1c SHA512 e6d4fe2d8136bbbbec00401761bf5a4bf5ff15357e75080b942188a613b8156c67eac63f46ce89f1e521997ca620f22924dd0b9055dcb66e30801142dab4e0a9
DIST makepp-2.0.99.1.txz 532784 BLAKE2B e69495f0ffece81e7b15b668eea8bf4f9a26a36332bd1644594d697dd2301bea4bb2340fcd2805a33c44824113149fc617db610e6624900ec9d0d77054658d8c SHA512 457d64a2e9d2860dc2f7ad1bd4ef7df9fcd1563878dcd7b63e6f1d3fd6c03cdb89aab68faa018b3ef6b3009733a365fadbb49ad6c8a03ffe6eafcf867b765213
+DIST makepp-2.0.99.2.txz 528968 BLAKE2B e39c5fa515a1579ef5a568385550e8baf9176eac4a1871cdb7971ca8d3f92bfda73e5f27f4cf00c148a2c5c9622dd8253ebba0f555c6d46ce8c3581678bf8e68 SHA512 5aa8d255e545705802fec6ca304b2c672dfb9c59f7a064a5e9c4ef98f52d7dd5628023fe2a2449126ac1f9cc6ba7bac98233e3e4f07dd8a0559fd8aea7fd24a4
diff --git a/dev-util/makepp/makepp-2.0.99.2.ebuild b/dev-util/makepp/makepp-2.0.99.2.ebuild
new file mode 100644
index 00000000000..38db184f93f
--- /dev/null
+++ b/dev-util/makepp/makepp-2.0.99.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_}
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="GNU make replacement"
+HOMEPAGE="http://makepp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/2.1/${MY_P}.txz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND="dev-lang/perl:="
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ # default "all" rule is to run tests :x
+ sed -i '/^all:/s:test::' config.pl || die
+ sed -i 's/^ my $gzip =.*/ my $gzip = "";/' install.pl || die
+ default
+}
+
+src_configure() {
+ # not an autoconf configure script
+ ./configure \
+ --prefix="${EPREFIX}"/usr \
+ --bindir="${EPREFIX}"/usr/bin \
+ --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+ --mandir="${EPREFIX}"/usr/share/man \
+ --datadir="${EPREFIX}"/usr/share/makepp \
+ || die "configure failed"
+}
+
+src_test() {
+ # work around https://bugzilla.samba.org/show_bug.cgi?id=8728
+ export CCACHE_UNIFY=1
+ ROOT= default
+}
diff --git a/dev-util/mdds/mdds-1.3.1.ebuild b/dev-util/mdds/mdds-1.3.1.ebuild
index 1473b988ea9..d2a33d885ee 100644
--- a/dev-util/mdds/mdds-1.3.1.ebuild
+++ b/dev-util/mdds/mdds-1.3.1.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
@@ -17,7 +17,7 @@ SLOT="1/1.2"
IUSE="valgrind"
[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
RDEPEND="dev-libs/boost:="
DEPEND="${RDEPEND}
diff --git a/dev-util/mdds/mdds-1.4.3.ebuild b/dev-util/mdds/mdds-1.4.3.ebuild
index a1136575248..430a753bcf4 100644
--- a/dev-util/mdds/mdds-1.4.3.ebuild
+++ b/dev-util/mdds/mdds-1.4.3.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.bz2"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
fi
inherit autotools toolchain-funcs
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 377ee5872be..0abdbfd7c1c 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,3 +1,4 @@
DIST meson-0.48.2.tar.gz 1311011 BLAKE2B 54cb8ca4164238f1c2b77327c330a7615a8d62c63c0cbedcdbe395bf2a99c454407fbc61af8d61d38a85de5dee18e73b98b534a2c9d19cc8f622e25549b84bbf SHA512 beebc90df420c15255c49a13e2f4917934fec8fb2c5b878a59ee0cd2ae46eb05571e995e12b3110b72be89fd11ab4c534ed72aa6d6fe72719ef060df5e75695f
DIST meson-0.49.2.tar.gz 1340730 BLAKE2B 07931bca42907eb961f5f15da5216448d33539a091de4e7df53f0713471f2b0c581d1e3f9ba7eac2a87b61861e5408a5af1a5cb8c17c9561f81cd377b2ea7fc3 SHA512 4aca4c273e7c23034c1ed76aa48c914aef34ca4be9df9d5810b8dd3dac9f5f67aa577a682490aa3d81c0503b5a5a8ac1e2452b2f2fdd7a5c7db2aa504047b87d
DIST meson-0.50.1.tar.gz 1402160 BLAKE2B 051e9949f3a216c1074ec826c6a232124a3d2615dc03f83f57bfe96427cd44aa95e2ec7c688e87252d0179882f91e0ccf440eda4b47ff2f0d3af7382a530e011 SHA512 0dcc19007b3b1626e198c0a4ddb0f37dfdfe25f447e511a772b302bffc02187a3e56046daea01a0ad5cf611d557bae12d5b858bb7a44f69919b9ac9ad696aafd
+DIST meson-0.51.1.tar.gz 1451234 BLAKE2B 8a925bfa3d622f75eb180226311a6531cde435a5a6573663f44ba67dbefa63f76b8bd17eb23d291594fe66a379ebc8aef5f1e680973a59b0b52c41fe09e4cdcf SHA512 535fb7c73a7e721a25ce4a0b9771bbb2c07fcd8f7b8f43542a093663291761370044f99b9109853b19201189881e64db1ba5a67c724ecff21000b22ca79f182c
diff --git a/dev-util/meson/meson-0.50.1.ebuild b/dev-util/meson/meson-0.50.1.ebuild
index 2dd5277193f..d124d341dd7 100644
--- a/dev-util/meson/meson-0.50.1.ebuild
+++ b/dev-util/meson/meson-0.50.1.ebuild
@@ -9,7 +9,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 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
fi
inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/meson/meson-0.51.1.ebuild b/dev-util/meson/meson-0.51.1.ebuild
new file mode 100644
index 00000000000..33a23e5a870
--- /dev/null
+++ b/dev-util/meson/meson-0.51.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 2016-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+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 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+fi
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="http://mesonbuild.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ test? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ dev-util/ninja
+ dev-vcs/git
+ virtual/pkgconfig
+ )
+"
+
+python_prepare_all() {
+ # ASAN and sandbox both want control over LD_PRELOAD
+ # https://bugs.gentoo.org/673016
+ sed -i -e 's/test_generate_gir_with_address_sanitizer/_&/' run_unittests.py || 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
+ 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/mingw64-runtime/metadata.xml b/dev-util/mingw64-runtime/metadata.xml
index 1b348ca856b..df0beeaf2e9 100644
--- a/dev-util/mingw64-runtime/metadata.xml
+++ b/dev-util/mingw64-runtime/metadata.xml
@@ -8,6 +8,7 @@
<use>
<flag name="idl">Install idl files.</flag>
<flag name="libraries">Build extra libraries: mangle, pseh, winpthreads.</flag>
+ <flag name="secure-api">Expose secure API (*_s function) by default.</flag>
<flag name="tools">Build extra tools: gendef, genidl.</flag>
</use>
<upstream>
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-6.0.0-r2.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-6.0.0-r2.ebuild
new file mode 100644
index 00000000000..9dc20f91b73
--- /dev/null
+++ b/dev-util/mingw64-runtime/mingw64-runtime-6.0.0-r2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+ if [[ ${CATEGORY} == cross-* ]] ; then
+ export CTARGET=${CATEGORY#cross-}
+ fi
+fi
+
+inherit autotools flag-o-matic eutils
+
+DESCRIPTION="Free Win64 runtime and import library definitions"
+HOMEPAGE="http://mingw-w64.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# USE=libraries needs working stage2 compiler: bug #665512
+IUSE="headers-only idl libraries +secure-api tools"
+RESTRICT="strip"
+
+S="${WORKDIR}/mingw-w64-v${PV}"
+
+is_crosscompile() {
+ [[ ${CHOST} != ${CTARGET} ]]
+}
+just_headers() {
+ use headers-only
+}
+alt_prefix() {
+ is_crosscompile && echo /usr/${CTARGET}
+}
+crt_with() {
+ just_headers && echo --without-$1 || echo --with-$1
+}
+crt_use_enable() {
+ just_headers && echo --without-$2 || use_enable "$@"
+}
+crt_use_with() {
+ just_headers && echo --without-$2 || use_with "$@"
+}
+
+pkg_setup() {
+ if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
+ die "Invalid configuration"
+ fi
+}
+
+src_configure() {
+ CHOST=${CTARGET} strip-unsupported-flags
+ # Normally mingw-64 does not use dynamic linker.
+ # But at configure time it uses $LDFLAGS.
+ # When default -Wl,--hash-style=gnu is passed
+ # __CTORS_LIST__ / __DTORS_LIST__ is mis-detected
+ # for target ld and binaries crash at shutdown.
+ filter-ldflags '-Wl,--hash-style=*'
+
+ if ! just_headers; then
+ mkdir "${WORKDIR}/headers"
+ pushd "${WORKDIR}/headers" > /dev/null
+ CHOST=${CTARGET} "${S}/configure" \
+ --prefix="${T}/tmproot" \
+ --with-headers \
+ --without-crt \
+ || die
+ popd > /dev/null
+ append-cppflags "-I${T}/tmproot/include"
+ fi
+
+ # By default configure tries to set --sysroot=${prefix}. We disable
+ # this behaviour with --with-sysroot=no to use gcc's sysroot default.
+ # That way we can cross-build mingw64-runtime with cross-emerge.
+ CHOST=${CTARGET} econf \
+ --with-sysroot=no \
+ --prefix="${EPREFIX}"$(alt_prefix)/usr \
+ --with-headers \
+ --enable-sdk \
+ $(crt_with crt) \
+ $(crt_use_enable idl idl) \
+ $(crt_use_with libraries libraries) \
+ $(crt_use_with tools tools) \
+ $(use_enable secure-api) \
+ $(
+ $(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
+ && echo --disable-lib32 --enable-lib64 \
+ || echo --enable-lib32 --disable-lib64
+ )
+}
+
+src_compile() {
+ if ! just_headers; then
+ emake -C "${WORKDIR}/headers" install
+ fi
+ default
+}
+
+src_install() {
+ default
+
+ if is_crosscompile ; then
+ # gcc is configured to look at specific hard-coded paths for mingw #419601
+ dosym usr /usr/${CTARGET}/mingw
+ dosym usr /usr/${CTARGET}/${CTARGET}
+ dosym usr/include /usr/${CTARGET}/sys-include
+ fi
+
+ rm -rf "${ED}/usr/share"
+}
diff --git a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.7-r1.ebuild b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.7-r1.ebuild
index 501f05fcff9..dfe114ef3c0 100644
--- a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.7-r1.ebuild
+++ b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.7-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 ~m68k-mint"
S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/ninja/ninja-1.9.0.ebuild b/dev-util/ninja/ninja-1.9.0.ebuild
index 0ebf722104f..ba9df78face 100644
--- a/dev-util/ninja/ninja-1.9.0.ebuild
+++ b/dev-util/ninja/ninja-1.9.0.ebuild
@@ -15,7 +15,7 @@ else
MY_P="ninja-${KITWARE_VERSION}"
S="${WORKDIR}/${MY_P}"
SRC_URI="https://github.com/Kitware/ninja/archive/v${KITWARE_VERSION}.tar.gz -> ${MY_P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-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 fa77efecc27..d2fd05a0b42 100644
--- a/dev-util/ninja/ninja-9999.ebuild
+++ b/dev-util/ninja/ninja-9999.ebuild
@@ -15,7 +15,7 @@ else
MY_P="ninja-${KITWARE_VERSION}"
S="${WORKDIR}/${MY_P}"
SRC_URI="https://github.com/Kitware/ninja/archive/v${KITWARE_VERSION}.tar.gz -> ${MY_P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
fi
DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/ninka/ninka-2.0_pre1_p20170402.ebuild b/dev-util/ninka/ninka-2.0_pre1_p20170402.ebuild
index 56bd4273a95..cfab14f28ec 100644
--- a/dev-util/ninka/ninka-2.0_pre1_p20170402.ebuild
+++ b/dev-util/ninka/ninka-2.0_pre1_p20170402.ebuild
@@ -14,6 +14,7 @@ LICENSE="GPL-2+ myspell-en_CA-KevinAtkinson public-domain Princeton Ispell"
SLOT="0"
KEYWORDS="~amd64"
IUSE="sqlite test"
+RESTRICT="!test? ( test )"
RDEPEND="dev-perl/IO-CaptureOutput
dev-perl/Spreadsheet-WriteExcel
diff --git a/dev-util/obs-service-cpanspec/metadata.xml b/dev-util/obs-service-cpanspec/metadata.xml
index 5367c1e31d2..f3ecb94d035 100644
--- a/dev-util/obs-service-cpanspec/metadata.xml
+++ b/dev-util/obs-service-cpanspec/metadata.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+<!--maintainer-needed-->
<longdescription lang="en">
This is a source service for Open Build Service. It's a wrapper around cpanspec script.
</longdescription>
diff --git a/dev-util/obs-service-download_files/metadata.xml b/dev-util/obs-service-download_files/metadata.xml
index 8eed9fddc78..ef034b958d0 100644
--- a/dev-util/obs-service-download_files/metadata.xml
+++ b/dev-util/obs-service-download_files/metadata.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+<!--maintainer-needed-->
<longdescription lang="en">
This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
</longdescription>
diff --git a/dev-util/obs-service-download_src_package/metadata.xml b/dev-util/obs-service-download_src_package/metadata.xml
index 8eed9fddc78..ef034b958d0 100644
--- a/dev-util/obs-service-download_src_package/metadata.xml
+++ b/dev-util/obs-service-download_src_package/metadata.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+<!--maintainer-needed-->
<longdescription lang="en">
This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
</longdescription>
diff --git a/dev-util/obs-service-download_url/metadata.xml b/dev-util/obs-service-download_url/metadata.xml
index 8eed9fddc78..ef034b958d0 100644
--- a/dev-util/obs-service-download_url/metadata.xml
+++ b/dev-util/obs-service-download_url/metadata.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+<!--maintainer-needed-->
<longdescription lang="en">
This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
</longdescription>
diff --git a/dev-util/obs-service-extract_file/metadata.xml b/dev-util/obs-service-extract_file/metadata.xml
index 8eed9fddc78..ef034b958d0 100644
--- a/dev-util/obs-service-extract_file/metadata.xml
+++ b/dev-util/obs-service-extract_file/metadata.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+<!--maintainer-needed-->
<longdescription lang="en">
This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
</longdescription>
diff --git a/dev-util/obs-service-format_spec_file/metadata.xml b/dev-util/obs-service-format_spec_file/metadata.xml
index 64b4157a612..f12e88a964e 100644
--- a/dev-util/obs-service-format_spec_file/metadata.xml
+++ b/dev-util/obs-service-format_spec_file/metadata.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+<!--maintainer-needed-->
<longdescription lang="en">
This is a source service for openSUSE Build Service.
diff --git a/dev-util/obs-service-generator_driver_update_disk/metadata.xml b/dev-util/obs-service-generator_driver_update_disk/metadata.xml
index 8eed9fddc78..ef034b958d0 100644
--- a/dev-util/obs-service-generator_driver_update_disk/metadata.xml
+++ b/dev-util/obs-service-generator_driver_update_disk/metadata.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+<!--maintainer-needed-->
<longdescription lang="en">
This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
</longdescription>
diff --git a/dev-util/obs-service-git_tarballs/metadata.xml b/dev-util/obs-service-git_tarballs/metadata.xml
index 8eed9fddc78..ef034b958d0 100644
--- a/dev-util/obs-service-git_tarballs/metadata.xml
+++ b/dev-util/obs-service-git_tarballs/metadata.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+<!--maintainer-needed-->
<longdescription lang="en">
This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
</longdescription>
diff --git a/dev-util/obs-service-github_tarballs/metadata.xml b/dev-util/obs-service-github_tarballs/metadata.xml
index 8eed9fddc78..ef034b958d0 100644
--- a/dev-util/obs-service-github_tarballs/metadata.xml
+++ b/dev-util/obs-service-github_tarballs/metadata.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+<!--maintainer-needed-->
<longdescription lang="en">
This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
</longdescription>
diff --git a/dev-util/obs-service-meta/metadata.xml b/dev-util/obs-service-meta/metadata.xml
index 05828e15c8a..7e9d23f183f 100644
--- a/dev-util/obs-service-meta/metadata.xml
+++ b/dev-util/obs-service-meta/metadata.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+<!--maintainer-needed-->
<longdescription lang="en">
This is a source service for Open Build Service. This service runs all checks from osc-source_validator. This can be used to guarantee that all checks succeed also on the service side. This plugin can be used via project wide defined services.
</longdescription>
diff --git a/dev-util/obs-service-rearchive/metadata.xml b/dev-util/obs-service-rearchive/metadata.xml
index 5367c1e31d2..f3ecb94d035 100644
--- a/dev-util/obs-service-rearchive/metadata.xml
+++ b/dev-util/obs-service-rearchive/metadata.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+<!--maintainer-needed-->
<longdescription lang="en">
This is a source service for Open Build Service. It's a wrapper around cpanspec script.
</longdescription>
diff --git a/dev-util/obs-service-recompress/metadata.xml b/dev-util/obs-service-recompress/metadata.xml
index 8eed9fddc78..ef034b958d0 100644
--- a/dev-util/obs-service-recompress/metadata.xml
+++ b/dev-util/obs-service-recompress/metadata.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+<!--maintainer-needed-->
<longdescription lang="en">
This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
</longdescription>
diff --git a/dev-util/obs-service-set_version/metadata.xml b/dev-util/obs-service-set_version/metadata.xml
index 8eed9fddc78..ef034b958d0 100644
--- a/dev-util/obs-service-set_version/metadata.xml
+++ b/dev-util/obs-service-set_version/metadata.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+<!--maintainer-needed-->
<longdescription lang="en">
This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
</longdescription>
diff --git a/dev-util/obs-service-source_validator/metadata.xml b/dev-util/obs-service-source_validator/metadata.xml
index 05828e15c8a..7e9d23f183f 100644
--- a/dev-util/obs-service-source_validator/metadata.xml
+++ b/dev-util/obs-service-source_validator/metadata.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+<!--maintainer-needed-->
<longdescription lang="en">
This is a source service for Open Build Service. This service runs all checks from osc-source_validator. This can be used to guarantee that all checks succeed also on the service side. This plugin can be used via project wide defined services.
</longdescription>
diff --git a/dev-util/obs-service-tar_scm/metadata.xml b/dev-util/obs-service-tar_scm/metadata.xml
index 8eed9fddc78..ef034b958d0 100644
--- a/dev-util/obs-service-tar_scm/metadata.xml
+++ b/dev-util/obs-service-tar_scm/metadata.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+<!--maintainer-needed-->
<longdescription lang="en">
This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
</longdescription>
diff --git a/dev-util/obs-service-update_source/metadata.xml b/dev-util/obs-service-update_source/metadata.xml
index 5367c1e31d2..f3ecb94d035 100644
--- a/dev-util/obs-service-update_source/metadata.xml
+++ b/dev-util/obs-service-update_source/metadata.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+<!--maintainer-needed-->
<longdescription lang="en">
This is a source service for Open Build Service. It's a wrapper around cpanspec script.
</longdescription>
diff --git a/dev-util/obs-service-verify_file/metadata.xml b/dev-util/obs-service-verify_file/metadata.xml
index 8eed9fddc78..ef034b958d0 100644
--- a/dev-util/obs-service-verify_file/metadata.xml
+++ b/dev-util/obs-service-verify_file/metadata.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+<!--maintainer-needed-->
<longdescription lang="en">
This is a source service for Open Build Service. This service is parsing all spec files and downloads all Source files which are specified via a http, https or ftp url.
</longdescription>
diff --git a/dev-util/open-vcdiff/metadata.xml b/dev-util/open-vcdiff/metadata.xml
index 4d97c1a4a4e..c4069fb974e 100644
--- a/dev-util/open-vcdiff/metadata.xml
+++ b/dev-util/open-vcdiff/metadata.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <!--maintainer-needed-->
<upstream>
<remote-id type="google-code">open-vcdiff</remote-id>
<remote-id type="github">google/open-vcdiff</remote-id>
diff --git a/dev-util/osc/metadata.xml b/dev-util/osc/metadata.xml
index 24f0a4d2bee..db000c88a1a 100644
--- a/dev-util/osc/metadata.xml
+++ b/dev-util/osc/metadata.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+<!--maintainer-needed-->
<longdescription lang="en">
Subversion-like client for Open Build Service - http://open-build-service.org/ It serves as client for the source code repository part of the build service, and it is used to edit metadata or query about build results.
</longdescription>
diff --git a/dev-util/packer/Manifest b/dev-util/packer/Manifest
index 2d12ce34eb1..90f334627db 100644
--- a/dev-util/packer/Manifest
+++ b/dev-util/packer/Manifest
@@ -1,2 +1,3 @@
DIST packer-1.3.5.tar.gz 9198704 BLAKE2B 210c824aa61fed8ab58ea6eed2a1804d8b144e7e20f0794721b2c282d066969d1193fc36b004bb7d31d8a2b19fa609e673d05457653bf8ad694a142563e839cc SHA512 becd747b43c8a9c0aa93d1d723f2e2383e9f2adc19e82653142ea13080aa393750cd3fdf86fa259af21af6b6417bf023e7e482402dfa56d347720fb740ebe906
DIST packer-1.4.0.tar.gz 9794922 BLAKE2B 2e1d817e0a3f549255ecd8693d6d99b2e45df2e8fb0acc128f03bd1448f28afa865a0849ccf58e9a562ef50b901ea86efd29fe29747c126aa98c05456638719f SHA512 d2dbeb99d1fe44a427d2997eeb4ff6ae66bdf2d7f8f08e2105f8614487a6565b8bc263cf8aab8413520783a4dde18d150aae6c69db171fe1cfab3ee1bd0a0743
+DIST packer-1.4.1.tar.gz 11279518 BLAKE2B 7b1b966af8cac73826fc8f5a1cb39183fd2ae1d3b7da6d7408cbb7c3342a0fd2ba84cf1df89ea9edc41353c0bbb6c874347745a91c3eaa1a742521c79500f21a SHA512 4038990655eecf412be9dae9edd09a300543a3b0b841c982631cb48f4905388f9dbf26a9b0ac3cb77628d1e650600b7d3b89a1694f746dfdef086a621078cde1
diff --git a/dev-util/packer/packer-1.4.1.ebuild b/dev-util/packer/packer-1.4.1.ebuild
new file mode 100644
index 00000000000..b5901c6d82a
--- /dev/null
+++ b/dev-util/packer/packer-1.4.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit golang-vcs-snapshot
+
+DESCRIPTION="A tool to create identical machine images for multiple platforms"
+HOMEPAGE="https://www.packer.io"
+
+EGO_PN="github.com/hashicorp/packer"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+DEPEND=">=dev-lang/go-1.12.0"
+
+DOCS=( src/${EGO_PN}/{README,CHANGELOG}.md )
+
+src_compile() {
+ cd "src/${EGO_PN}" || die
+ GOPATH="${S}" GOCACHE="${T}/go-cache" go build \
+ -v -work -o "${S}/${PN}" ./ || die
+}
+
+src_install() {
+ dobin packer
+
+ einstalldocs
+
+ insinto /usr/share/zsh/site-functions
+ doins src/${EGO_PN}/contrib/zsh-completion/_packer
+}
diff --git a/dev-util/patchelf/patchelf-0.8.ebuild b/dev-util/patchelf/patchelf-0.8.ebuild
index 369a698a039..3a3ffaccefd 100644
--- a/dev-util/patchelf/patchelf-0.8.ebuild
+++ b/dev-util/patchelf/patchelf-0.8.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://nixos.org/patchelf.html"
SRC_URI="http://releases.nixos.org/${PN}/${P}/${P}.tar.bz2"
SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
LICENSE="GPL-3"
IUSE=""
diff --git a/dev-util/perf/perf-4.14.33-r1.ebuild b/dev-util/perf/perf-4.14.33-r1.ebuild
index 6eb3fa30238..62f2873092f 100644
--- a/dev-util/perf/perf-4.14.33-r1.ebuild
+++ b/dev-util/perf/perf-4.14.33-r1.ebuild
@@ -163,8 +163,8 @@ src_install() {
perf_make -f Makefile.perf install DESTDIR="${D}"
if use gtk; then
- mv "${D}"/usr/$(get_libdir)/libperf-gtk.so \
- "${D}"/usr/libexec/perf-core || die
+ mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
+ "${ED}"/usr/libexec/perf-core || die
fi
dodoc CREDITS
diff --git a/dev-util/perf/perf-4.20.3.ebuild b/dev-util/perf/perf-4.20.3.ebuild
index 5439d2b00ec..04e3df46fcb 100644
--- a/dev-util/perf/perf-4.20.3.ebuild
+++ b/dev-util/perf/perf-4.20.3.ebuild
@@ -198,11 +198,11 @@ src_test() {
src_install() {
perf_make -f Makefile.perf install DESTDIR="${D}"
- rm -rv "${D}"/usr/share/doc/perf-tip || die
+ rm -rv "${ED}"/usr/share/doc/perf-tip || die
if use gtk; then
- mv "${D}"/usr/$(get_libdir)/libperf-gtk.so \
- "${D}"/usr/libexec/perf-core || die
+ mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
+ "${ED}"/usr/libexec/perf-core || die
fi
dodoc CREDITS
diff --git a/dev-util/perf/perf-5.1.15.ebuild b/dev-util/perf/perf-5.1.15.ebuild
index 269c7c597ef..791892da875 100644
--- a/dev-util/perf/perf-5.1.15.ebuild
+++ b/dev-util/perf/perf-5.1.15.ebuild
@@ -212,11 +212,11 @@ src_test() {
src_install() {
perf_make -f Makefile.perf install DESTDIR="${D}"
- rm -rv "${D}"/usr/share/doc/perf-tip || die
+ rm -rv "${ED}"/usr/share/doc/perf-tip || die
if use gtk; then
- mv "${D}"/usr/$(get_libdir)/libperf-gtk.so \
- "${D}"/usr/libexec/perf-core || die
+ mv "${ED}"/usr/$(get_libdir)/libperf-gtk.so \
+ "${ED}"/usr/libexec/perf-core || die
fi
dodoc CREDITS
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index 22550d50d55..75dc351a4f3 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -30,7 +30,10 @@ else
>=dev-python/snakeoil-0.8.0[${PYTHON_USEDEP}]
>=sys-apps/pkgcore-0.10.0[${PYTHON_USEDEP}]"
fi
-RDEPEND+=" dev-python/lxml[${PYTHON_USEDEP}]"
+RDEPEND+="
+ dev-python/chardet[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+"
DEPEND="${RDEPEND}
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 8f779ca2d77..6bca9a95a51 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1,2 +1,2 @@
-DIST pkgconf-1.3.7.tar.xz 271840 BLAKE2B f4bb44e92ef2903a5962c85e0d4a939adf035c5e92fbd1d8a50d4022507d1f442e459849b537cc2b648c7a1bb5eac33aabf8a46d8b0df8794514596adee9888d SHA512 6c06afc4fe64c94a833db98d4dc7881192d38cc28eb1fb86345f4ce065489930ac953aa9f6b2df172127244cb1cbab1c85a042aa0f6be4fa18bf9dcd83173960
DIST pkgconf-1.5.4.tar.xz 290380 BLAKE2B 8353901e9fe86f05abc82c5906b24ec902086f5c9a08ffdc9f6d53ecdebcf7c52eb9bbaef019285332182ca8f489cfe872f25bfe110e280031a553331df09bcb SHA512 795a67f8f98b7598c0af8e70c830851561f090a96cb66b75149e5faf633f06c1b098fa3cec76cde35160a9809556536da6a2a95af8ff954c9b28536d15b79f93
+DIST pkgconf-1.6.3.tar.xz 291216 BLAKE2B 04bf58590e2f0b37bac7b24b3d595ad08680e85647548cbd642495398d95706f9f738af5c6f9b9ad8801567caa20ade85d4c4d74179f08313420683cb1b34263 SHA512 437c5a5c9866e2047e62e0592639930b2420d4afd41d98cef51f3475165418a39e916477860025314828a6ee0a4eefc10fdf26bda66f80c291f324d9674fa5c1
diff --git a/dev-util/pkgconf/metadata.xml b/dev-util/pkgconf/metadata.xml
index f6730b8bcc6..8447141053d 100644
--- a/dev-util/pkgconf/metadata.xml
+++ b/dev-util/pkgconf/metadata.xml
@@ -5,6 +5,10 @@
<email>floppym@gentoo.org</email>
<name>Mike Gilbert</name>
</maintainer>
+ <maintainer type="person">
+ <email>polynomial-c@gentoo.org</email>
+ <name>Lars Wendler</name>
+ </maintainer>
<slots>
<subslots>SONAME version of libpkgconf</subslots>
</slots>
diff --git a/dev-util/pkgconf/pkgconf-1.3.7.ebuild b/dev-util/pkgconf/pkgconf-1.6.3.ebuild
index 98f940c603c..5f58337eda7 100644
--- a/dev-util/pkgconf/pkgconf-1.3.7.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.6.3.ebuild
@@ -1,29 +1,30 @@
# Copyright 2012-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
+
+inherit multilib-minimal
if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+ #EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+ EGIT_REPO_URI="https://git.dereferenced.org/${PN}/${PN}.git"
inherit autotools git-r3
else
SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
fi
-inherit ltprune multilib-minimal
-
DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
-HOMEPAGE="https://github.com/pkgconf/pkgconf"
+HOMEPAGE="https://git.dereferenced.org/pkgconf/pkgconf/"
LICENSE="ISC"
-SLOT="0"
+SLOT="0/3"
IUSE="+pkg-config test"
# tests require 'kyua'
RESTRICT="!test? ( test )"
-DEPEND="
+BDEPEND="
test? (
dev-libs/atf
dev-util/kyua
@@ -53,7 +54,13 @@ src_prepare() {
}
multilib_src_configure() {
- ECONF_SOURCE=${S} econf
+ local ECONF_SOURCE="${S}"
+ econf
+}
+
+multilib_src_test() {
+ unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH
+ default
}
multilib_src_install() {
@@ -61,12 +68,16 @@ multilib_src_install() {
if use pkg-config; then
dosym pkgconf /usr/bin/pkg-config
+ dosym pkgconf.1 /usr/share/man/man1/pkg-config.1
else
- rm "${ED%/}"/usr/share/aclocal/pkg.m4 || die
+ rm "${ED}"/usr/share/aclocal/pkg.m4 || die
+ rmdir "${ED}"/usr/share/aclocal || die
+ rm "${ED}"/usr/share/man/man7/pkg.m4.7 || die
+ rmdir "${ED}"/usr/share/man/man7 || die
fi
}
multilib_src_install_all() {
- prune_libtool_files
einstalldocs
+ find "${ED}" -type f -name '*.la' -delete || die
}
diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild
index 780b57975a0..5f58337eda7 100644
--- a/dev-util/pkgconf/pkgconf-9999.ebuild
+++ b/dev-util/pkgconf/pkgconf-9999.ebuild
@@ -1,20 +1,21 @@
# Copyright 2012-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
+
+inherit multilib-minimal
if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+ #EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+ EGIT_REPO_URI="https://git.dereferenced.org/${PN}/${PN}.git"
inherit autotools git-r3
else
SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
fi
-inherit multilib-minimal
-
DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
-HOMEPAGE="https://github.com/pkgconf/pkgconf"
+HOMEPAGE="https://git.dereferenced.org/pkgconf/pkgconf/"
LICENSE="ISC"
SLOT="0/3"
@@ -23,7 +24,7 @@ IUSE="+pkg-config test"
# tests require 'kyua'
RESTRICT="!test? ( test )"
-DEPEND="
+BDEPEND="
test? (
dev-libs/atf
dev-util/kyua
@@ -53,7 +54,8 @@ src_prepare() {
}
multilib_src_configure() {
- ECONF_SOURCE=${S} econf
+ local ECONF_SOURCE="${S}"
+ econf
}
multilib_src_test() {
@@ -68,11 +70,14 @@ multilib_src_install() {
dosym pkgconf /usr/bin/pkg-config
dosym pkgconf.1 /usr/share/man/man1/pkg-config.1
else
- rm "${ED%/}"/usr/share/aclocal/pkg.m4 || die
+ rm "${ED}"/usr/share/aclocal/pkg.m4 || die
+ rmdir "${ED}"/usr/share/aclocal || die
+ rm "${ED}"/usr/share/man/man7/pkg.m4.7 || die
+ rmdir "${ED}"/usr/share/man/man7 || die
fi
}
multilib_src_install_all() {
einstalldocs
- find "${ED}" -name '*.la' -delete || die
+ find "${ED}" -type f -name '*.la' -delete || die
}
diff --git a/dev-util/pkgconfig-openbsd/metadata.xml b/dev-util/pkgconfig-openbsd/metadata.xml
index 1632dc7b3fb..e5d00474fa2 100644
--- a/dev-util/pkgconfig-openbsd/metadata.xml
+++ b/dev-util/pkgconfig-openbsd/metadata.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <!--maintainer-needed-->
<use>
<flag name="pkg-config">Install as a replacement for <pkg>dev-util/pkgconfig</pkg></flag>
</use>
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index ae7f8514d69..988df668c35 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -1,3 +1,2 @@
-DIST pycharm-community-2019.1.1.tar.gz 332489780 BLAKE2B 2cc7dcbab5fa321e423991622b4e7c9e41c184312a4b3c3a8b900b1ea2436d9f6009e26ffca12f3335be8bb520941c6ac6b579f3e6f2fc0f1b148a9a00ab1868 SHA512 28d7a3353bec271f0a57bea3c44fc788a5b3a5215dff737ba293c2ce73509d06b217ee1615901c91e5895d61a58a2b696c50ae760b6b3a88b472f3746f28bcbf
-DIST pycharm-community-2019.1.2.tar.gz 333983594 BLAKE2B f5dfa1986d88c7598cfbd5050c385a1b1b3374286e57fd513a94eb19bc42116b1ceef757d194ef1df66739b25f10663a74e374785b4c5584aec9b8900e67dd0c SHA512 48782960022efe48f37b2bdec0be1f15741f6dde2a2dcec686ecfb07c81996c3d6fc46cf3eda2fa4cc53a67f7ec47909e47ed57b2edbf973482ca37781067415
DIST pycharm-community-2019.1.3.tar.gz 334018235 BLAKE2B 8e4c400685e69aaa53426dee848d5f14a0c40b88232ee8cb8c0c0f2f727c68b9212600dab7717ec77c1cd4b42666bad965fcbc217e3158d357b5a5edd6a94e26 SHA512 42627af39a8530931442c8419ebee4d999faad40a203519fc8564e4b8b14d2476e8426e9976e487c92e4398db8efb15c5e2d28536b1c7b374898f9dc0021acbe
+DIST pycharm-community-2019.2.tar.gz 359295798 BLAKE2B 9a1b19e93d0d2cba6c7dd2c059d511e4d193b6bd9e5f1900c3aadd6ff322891c834947360715c8f41e5112f7a71d3b5b09ed7e23dcf3dd8c6c4de9c4eaf16b5b SHA512 490925de309bcb0ef052593e517f3d701ae1d82b05d4ea38bb7bb5eef86e9df21472e395fadbb21906fa1024358ae599285fba8fdb72b0ddb7f1e8f7f26ac046
diff --git a/dev-util/pycharm-community/pycharm-community-2019.1.1.ebuild b/dev-util/pycharm-community/pycharm-community-2019.1.1.ebuild
deleted file mode 100644
index 92e344b69ea..00000000000
--- a/dev-util/pycharm-community/pycharm-community-2019.1.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 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="http://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"
-
-RDEPEND=">=virtual/jre-1.8
- dev-libs/libdbusmenu
- dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
- opt/${PN}/bin/fsnotifier64
- opt/${PN}/bin/fsnotifier-arm"
-
-MY_PN=${PN/-community/}
-
-src_prepare() {
- default
-
- rm -rf jre || die
-}
-
-src_install() {
- insinto /opt/${PN}
- doins -r *
-
- 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-2019.1.3.ebuild b/dev-util/pycharm-community/pycharm-community-2019.1.3.ebuild
index 3bd1b2cb410..92e344b69ea 100644
--- a/dev-util/pycharm-community/pycharm-community-2019.1.3.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2019.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND=">=virtual/jre-1.8
dev-libs/libdbusmenu
diff --git a/dev-util/pycharm-community/pycharm-community-2019.1.2.ebuild b/dev-util/pycharm-community/pycharm-community-2019.2.ebuild
index 3bd1b2cb410..3bd1b2cb410 100644
--- a/dev-util/pycharm-community/pycharm-community-2019.1.2.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2019.2.ebuild
diff --git a/dev-util/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest
index 3f2a68d0aba..3a4c20954bb 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -1,3 +1,2 @@
-DIST pycharm-professional-2019.1.1.tar.gz 433810320 BLAKE2B baba76f893ca92990241de495f0a00029a135b890aeca067fdb699ffc6f4e7042487ada452f7fb793731b0ec303f0e73baf2c76da8e0821edcf195c210958b74 SHA512 d4419fbef02e3c8a6c3820da56f089a5630ac2c94dc701854f0ea03a5797f7489db6613a8426cf89a4c6c5259b44d589846b04e36051e44641845a32d81b368e
-DIST pycharm-professional-2019.1.2.tar.gz 436256239 BLAKE2B 3253c74b7308dbef8dfd78fbb525af104d11d5ea4c66c48882685dc40011258a6f9d912a9402818f219c7c968cda61e4723544607b71a1a5e7ee0e1bf743ae86 SHA512 ee7bcf292f780ed2fe12c432b546eb470b2f556337e2b9c22905797f5f99899a2b5d80bee032cac45427f5480f8f2b3512e32cd4d1a0b6ae6b355f8dd0674b51
DIST pycharm-professional-2019.1.3.tar.gz 436604810 BLAKE2B 1fcf742b119dd8d9e9eeaa08f803f2742f388c711da446ae00e5718e09c231d926a04146fdcfb9ed18e2a44d43049598ef63c527e8994077987a127fedd630cd SHA512 2a26279944408cf5e6436d28ec15e2e6fcca234535fb69f4e7391a230d4bf39a523e6d2262d8cd5036d4f40b0629cd33866c5b839f82a82ae1d4271c89901cad
+DIST pycharm-professional-2019.2.tar.gz 478100459 BLAKE2B a4bf01fcca96866e40fc43b1d429a5dfccd8572d97bb68a0e2f40367563b17c7e26c8801d637325b3352caefaf19eab8d2269b23b0849b6649624ac1bd155bcf SHA512 7e42bf72ab5ed318475506c2a07e12ebe6ee1f33c47e329da0bdf807e288a57681607be4353f5d1510352689537d2cfc67a3f43f0b752c8c8a76d66e83688b8a
diff --git a/dev-util/pycharm-professional/pycharm-professional-2019.1.1.ebuild b/dev-util/pycharm-professional/pycharm-professional-2019.1.1.ebuild
deleted file mode 100644
index 0f418726afd..00000000000
--- a/dev-util/pycharm-professional/pycharm-professional-2019.1.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 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="http://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"
-
-RDEPEND=">=virtual/jre-1.8
- dev-libs/libdbusmenu
- dev-python/pip"
-
-RESTRICT="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=${PN/-professional/}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
- default
-
- rm -rf jre || die
-}
-
-src_install() {
- insinto /opt/${PN}
- doins -r *
-
- 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-2019.1.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2019.1.3.ebuild
index 9196130c9fd..0f418726afd 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2019.1.3.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2019.1.3.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 x86"
RDEPEND=">=virtual/jre-1.8
dev-libs/libdbusmenu
diff --git a/dev-util/pycharm-professional/pycharm-professional-2019.1.2.ebuild b/dev-util/pycharm-professional/pycharm-professional-2019.2.ebuild
index 9196130c9fd..9196130c9fd 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2019.1.2.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2019.2.ebuild
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 74a78d04d00..fed4a0d87db 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,2 +1,4 @@
DIST radare2-3.5.1.tar.gz 7083677 BLAKE2B 3d84e79d4e20e031b6cfdbabcf80922f977328bf7da8c2871924f9520ff87252d4df18a1239793c70f4b800bb7d5c4aef923e63c93aa15d86ae685ddda205da2 SHA512 24c2a45ed539830dcb8dc1585c27e45515c70989132f500527db0ca6795027eaa82ea54d1cd7fc73ddc49641a73148be963ade1648e92b5336d2e86335e2497a
DIST radare2-3.6.0.tar.gz 7339427 BLAKE2B 60ecd110ac4cafa38dd10f49321e984e98f189398f15196614fb096970cc2f24981ffbbd161fdd55621b65c45a8fb9f843f273bf245ac0ea2b4493981ab0477d SHA512 15c02b744892934bd0b4beeb146d8a0289244405214b62892d7e307cd42f6706aca16c1e02b6b2beb5b6869c5c5920cc291ffec8a690b5338c6973a5e1d7900e
+DIST radare2-3.7.0.tar.gz 7478494 BLAKE2B 547efda30a65783758b132f4b241039b83bb274904a1f69616e60ec83547b22da486e97df06a74cd82f855650dbc3802d31bf3cb00ebd12d956848efd4b6ff5e SHA512 8e4d1b89d0d1e717403ba0bc2ce47e2644d12303ed5391fe4b9efc11b86a0b9c9356fdea1caecabe16d88ded9577fe77c182225adf2fdbd63b2e48f9c9c9f52d
+DIST radare2-3.7.1.tar.gz 7481103 BLAKE2B 4bae07dad298a45704ee45740bc3376902dfa35631efc94874666ead0b9c3dbb407558f4c02283d0909970247bc7730754cad9c6b6859a23ab40f408eff9102e SHA512 972c137e20d73a4cc8001c6d3e3b0c68874ed4a837d2ec20f26bc164a5451dbd46264471adc93332eecadd86d8023579fa69b42fce0291f49979b451118c7673
diff --git a/dev-util/radare2/files/radare2-3.7.0-with-syscapstone-p1.patch b/dev-util/radare2/files/radare2-3.7.0-with-syscapstone-p1.patch
new file mode 100644
index 00000000000..3f87d606bba
--- /dev/null
+++ b/dev-util/radare2/files/radare2-3.7.0-with-syscapstone-p1.patch
@@ -0,0 +1,24 @@
+From 8b37ac49b609cc69b27a6b3b76fa9d8d819bae83 Mon Sep 17 00:00:00 2001
+From: pancake <pancake@nopcode.org>
+Date: Thu, 1 Aug 2019 05:23:56 +0200
+Subject: [PATCH] Add capstone dependency with the mk
+
+---
+ binr/rabin2/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/binr/rabin2/Makefile b/binr/rabin2/Makefile
+index 0ecb48629..33219020b 100644
+--- a/binr/rabin2/Makefile
++++ b/binr/rabin2/Makefile
+@@ -15,6 +15,6 @@ include ../../shlr/grub/deps.mk
+ include ../../shlr/bochs/deps.mk
+ include ../../shlr/qnx/deps.mk
+ include ../../shlr/ar/deps.mk
+-LINK+=../../shlr/capstone/libcapstone.a
++include ../../shlr/capstone.mk
+
+ LDFLAGS+=$(LINK)
+--
+2.22.0
+
diff --git a/dev-util/radare2/files/radare2-3.7.0-with-syscapstone-p2.patch b/dev-util/radare2/files/radare2-3.7.0-with-syscapstone-p2.patch
new file mode 100644
index 00000000000..1ebb74efb36
--- /dev/null
+++ b/dev-util/radare2/files/radare2-3.7.0-with-syscapstone-p2.patch
@@ -0,0 +1,22 @@
+From 38a10d64fb33484f0e50c3d8f40a6c19c0ee37ec Mon Sep 17 00:00:00 2001
+From: Slava <slava@bacher09.org>
+Date: Sun, 4 Aug 2019 04:00:12 +0300
+Subject: [PATCH] Fix build with system capstone (--with-syscapstone) (#14753)
+
+---
+ shlr/capstone.mk | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/shlr/capstone.mk b/shlr/capstone.mk
+index b3cc42d24..f1a2de04d 100644
+--- a/shlr/capstone.mk
++++ b/shlr/capstone.mk
+@@ -1 +1,5 @@
++ifeq ($(USE_CAPSTONE),1)
++LINK+=${CAPSTONE_LDFLAGS}
++else
+ LINK+=$(SHLR)/capstone/libcapstone.a
++endif
+--
+2.22.0
+
diff --git a/dev-util/radare2/radare2-3.7.0.ebuild b/dev-util/radare2/radare2-3.7.0.ebuild
new file mode 100644
index 00000000000..5d70b601195
--- /dev/null
+++ b/dev-util/radare2/radare2-3.7.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 eutils
+
+DESCRIPTION="unix-like reverse engineering framework and commandline tools"
+HOMEPAGE="http://www.radare.org"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/radare/radare2"
+else
+ SRC_URI="https://github.com/radare/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/capstone:0=
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=("${FILESDIR}"/${PN}-3.7.0-with-syscapstone-p{1,2}.patch)
+
+src_configure() {
+ econf \
+ --without-libuv \
+ --with-syscapstone \
+ $(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
+}
diff --git a/dev-util/radare2/radare2-3.7.1.ebuild b/dev-util/radare2/radare2-3.7.1.ebuild
new file mode 100644
index 00000000000..0b3f4cfb432
--- /dev/null
+++ b/dev-util/radare2/radare2-3.7.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 eutils
+
+DESCRIPTION="unix-like reverse engineering framework and commandline tools"
+HOMEPAGE="http://www.radare.org"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/radare/radare2"
+else
+ SRC_URI="https://github.com/radare/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/capstone:0=
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+ econf \
+ --without-libuv \
+ --with-syscapstone \
+ $(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
+}
diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest
index a0ecb1f0961..d5001fe29b7 100644
--- a/dev-util/re2c/Manifest
+++ b/dev-util/re2c/Manifest
@@ -1 +1,3 @@
DIST re2c-1.1.1.tar.gz 5907416 BLAKE2B da2544573de0dbca94db8a8e2112de5549ffbbad91bdba187e95c9d8dd36537e099dbc2871b54d62630d91928cdaf384ab069e5e1624f8ff749c2e2743cff766 SHA512 a6fe73611103588043748340976f0e6d07169a6546cb80627c0ccd2ceac83f362dbbf371530361d893537fd95deb19503b2c73c41ed40efe7787210d6c757397
+DIST re2c-1.2.1.tar.xz 2059304 BLAKE2B b05c41112654cd4c7f15ad70229cde02efc4b04ffc63f964ab69e376964a8a952f2c617859b056998127ca9adfd72f7a16e673dd3134ab8244b14b84e023d510 SHA512 c90f45ae435968e950d2340b540269a042201f1f53d7ea067b6d3d9feec063f66559ba970d404d82bfa7b75b9a074328caaa62304d4d876af7c12740d100ef58
+DIST re2c-1.2.tar.xz 2064236 BLAKE2B ebc721de4fe1588a3043bb05298324b61214e074154ebc2adff19c6e5a3cc6a94314216a20020e88069d89768c31ae5c3f09b18176cd241d7aa10aa7b2daf183 SHA512 d029abc3493a26761eaa911cf73961f5b8ec2e00958c97740e73f568fc72b02b5f56d80e09657a95dcf2e7767f3e5085775bb78f0f5bc472d506682a3a7fc278
diff --git a/dev-util/re2c/re2c-1.2.1.ebuild b/dev-util/re2c/re2c-1.2.1.ebuild
new file mode 100644
index 00000000000..20575ddeb6f
--- /dev/null
+++ b/dev-util/re2c/re2c-1.2.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="tool for generating C-based recognizers from regular expressions"
+HOMEPAGE="http://re2c.org/"
+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 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="debug"
+
+src_configure() {
+ econf \
+ ac_cv_path_BISON="no" \
+ $(use_enable debug)
+}
+
+src_install() {
+ default
+
+ docompress -x /usr/share/doc/${PF}/examples
+ dodoc -r README.md CHANGELOG examples
+}
diff --git a/dev-util/re2c/re2c-1.2.ebuild b/dev-util/re2c/re2c-1.2.ebuild
new file mode 100644
index 00000000000..20575ddeb6f
--- /dev/null
+++ b/dev-util/re2c/re2c-1.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="tool for generating C-based recognizers from regular expressions"
+HOMEPAGE="http://re2c.org/"
+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 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="debug"
+
+src_configure() {
+ econf \
+ ac_cv_path_BISON="no" \
+ $(use_enable debug)
+}
+
+src_install() {
+ default
+
+ docompress -x /usr/share/doc/${PF}/examples
+ dodoc -r README.md CHANGELOG examples
+}
diff --git a/dev-util/redo/Manifest b/dev-util/redo/Manifest
index f71b62ec897..6afc66dfbf3 100644
--- a/dev-util/redo/Manifest
+++ b/dev-util/redo/Manifest
@@ -1,2 +1,3 @@
DIST redo-0.31.tar.gz 105335 BLAKE2B 76171a4e7112c7478fcfe8d6f19ffb27660fa8566be3c2dded0026a993224731cdeb43c5cd7226b5537f69dc9de982e0dc9a95ade49809c93c81474879de8590 SHA512 c049a2eac7385813fe7ee8fb15f7b7de1fe1572071de91c8ebaca868d7b4ceec73d6433f1ba37b129ce7eda577c5823a5483ba69bf457cc3295d7fb9c23f42b2
DIST redo-0.41.tar.gz 140177 BLAKE2B 13a73843064fc9fb4607426c1d4d6358b688ba30671d4b5e60428481489ff59060b2bb0b1473f0926702100d311fcaeb846a5898209e07f0d0867766fb951a93 SHA512 c7826e82776a323243dafe5b8011ac619dc0376c2b36524aa1ad23bac54f9d946f395e12a4ea943ee065847db4817afbc5101a703d59e1f90b812a6ef028427b
+DIST redo-0.42.tar.gz 194344 BLAKE2B ce17ba2bc8b6a074bfc5cae58cc99c1c41b2e8bab93a10f29d1178cb2071bd68ef5528529c320ee55063a4e3bce83705b486bc92992a9c0c18b65e7fec76fde5 SHA512 41b8417136f98d12edf3c62f027f2459ae3fb92f6c5464553d79c3a52344de57220a5c64b565118da0a99c1544eaa153a468ffcdcfbf7193c76c896bcd40e900
diff --git a/dev-util/redo/redo-0.31.ebuild b/dev-util/redo/redo-0.31.ebuild
index cc5f8333e27..50d08c2d1df 100644
--- a/dev-util/redo/redo-0.31.ebuild
+++ b/dev-util/redo/redo-0.31.ebuild
@@ -13,9 +13,15 @@ SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~x86"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
BDEPEND="
dev-python/beautifulsoup[${PYTHON_USEDEP}]
dev-python/markdown[${PYTHON_USEDEP}]
+ ${PYTHON_DEPS}
+"
+RDEPEND="
+ ${BDEPEND}
"
S=${WORKDIR}/${PN}-${P}
diff --git a/dev-util/redo/redo-0.41.ebuild b/dev-util/redo/redo-0.41.ebuild
index 8cafff06ad9..a979123b762 100644
--- a/dev-util/redo/redo-0.41.ebuild
+++ b/dev-util/redo/redo-0.41.ebuild
@@ -13,9 +13,15 @@ SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~x86"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
BDEPEND="
dev-python/beautifulsoup[${PYTHON_USEDEP}]
dev-python/markdown[${PYTHON_USEDEP}]
+ ${PYTHON_DEPS}
+"
+RDEPEND="
+ ${BDEPEND}
"
S=${WORKDIR}/${PN}-${P}
diff --git a/dev-util/redo/redo-0.42.ebuild b/dev-util/redo/redo-0.42.ebuild
new file mode 100644
index 00000000000..a979123b762
--- /dev/null
+++ b/dev-util/redo/redo-0.42.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2018-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+inherit multilib multiprocessing python-single-r1
+
+DESCRIPTION="Smaller, easier, more powerful, and more reliable than make"
+HOMEPAGE="https://github.com/apenwarr/redo"
+SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+BDEPEND="
+ dev-python/beautifulsoup[${PYTHON_USEDEP}]
+ dev-python/markdown[${PYTHON_USEDEP}]
+ ${PYTHON_DEPS}
+"
+RDEPEND="
+ ${BDEPEND}
+"
+S=${WORKDIR}/${PN}-${P}
+
+src_compile() {
+ ./do -j$(makeopts_jobs) build || die
+}
+
+src_test() {
+ ./do -j$(makeopts_jobs) test || die
+}
+
+src_install() {
+ DESTDIR="${D}" \
+ DOCDIR="${D}/usr/share/doc/${PF}" \
+ LIBDIR="${D}/usr/$(get_libdir)/${PN}" \
+ ./do -j$(makeopts_jobs) \
+ install || die
+
+ python_fix_shebang "${D}"
+
+ sed -i \
+ -e 's|/lib/|/'"$(get_libdir)"'/|g' \
+ "${D}"/usr/bin/* || die
+}
diff --git a/dev-util/redo/redo-99999.ebuild b/dev-util/redo/redo-99999.ebuild
index 32b61a02d26..30c70257c01 100644
--- a/dev-util/redo/redo-99999.ebuild
+++ b/dev-util/redo/redo-99999.ebuild
@@ -13,9 +13,15 @@ EGIT_REPO_URI="${HOMEPAGE}"
LICENSE="LGPL-2"
SLOT="0"
KEYWORDS=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
BDEPEND="
dev-python/beautifulsoup[${PYTHON_USEDEP}]
dev-python/markdown[${PYTHON_USEDEP}]
+ ${PYTHON_DEPS}
+"
+RDEPEND="
+ ${BDEPEND}
"
src_compile() {
diff --git a/dev-util/reswrap/metadata.xml b/dev-util/reswrap/metadata.xml
index 097975e3adc..58f638b2ac3 100644
--- a/dev-util/reswrap/metadata.xml
+++ b/dev-util/reswrap/metadata.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <!--maintainer-needed-->
</pkgmetadata>
diff --git a/dev-util/rocm-cmake/Manifest b/dev-util/rocm-cmake/Manifest
new file mode 100644
index 00000000000..28d53fcb6a8
--- /dev/null
+++ b/dev-util/rocm-cmake/Manifest
@@ -0,0 +1,2 @@
+DIST rocm-cmake-0.2.tar.gz 12729 BLAKE2B 6380e077cdc0dcc8c40c487789bd4405a9104e0c55e68df0587c74ea140c329b28ef224bea0d9d529ddaca2c3b874e64be840f96191b8bae7d662de5854756b6 SHA512 b2ebd749fb99ac6dbeac005bb0de5ca57e12ae3590d560c0fd03371f2dd0fc6e7862e0bc96046b98b8248770852c6ee64dd349f22405e77d8a210884246213bd
+DIST rocm-cmake-2.7.0.tar.gz 13352 BLAKE2B 1dd37f9beed98d2120a42505ef7463de672db01c1213262202819ea4ee76678a3126b7ca52e8738717618247a93af680534262ce56b718f7dc4ebb7f62acd358 SHA512 d08d08ea53c7242fccce808189048d195b8edbaa2a8f0a0fac4267a232dddaadab791f0bf2fe0c975f050cdac095531a2cabcab55157b5405f250f74fa0a01cc
diff --git a/dev-util/rocm-cmake/metadata.xml b/dev-util/rocm-cmake/metadata.xml
new file mode 100644
index 00000000000..a82bb12bfd8
--- /dev/null
+++ b/dev-util/rocm-cmake/metadata.xml
@@ -0,0 +1,14 @@
+<?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>
+ <upstream>
+ <remote-id type="github">RadeonOpenCompute/rocm-cmake</remote-id>
+ </upstream>
+ <longdescription lang="en">
+ Radeon Open Compute CMake Modules
+ </longdescription>
+</pkgmetadata>
diff --git a/dev-util/rocm-cmake/rocm-cmake-0.2.ebuild b/dev-util/rocm-cmake/rocm-cmake-0.2.ebuild
new file mode 100644
index 00000000000..eee840d3674
--- /dev/null
+++ b/dev-util/rocm-cmake/rocm-cmake-0.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+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/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+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-utils_src_prepare
+}
diff --git a/dev-util/rocm-cmake/rocm-cmake-2.7.0.ebuild b/dev-util/rocm-cmake/rocm-cmake-2.7.0.ebuild
new file mode 100644
index 00000000000..d6c02fff0fd
--- /dev/null
+++ b/dev-util/rocm-cmake/rocm-cmake-2.7.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+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/roc-${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+ S="${WORKDIR}/rocm-cmake-roc-${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-utils_src_prepare
+}
diff --git a/dev-util/rocm-cmake/rocm-cmake-9999.ebuild b/dev-util/rocm-cmake/rocm-cmake-9999.ebuild
new file mode 100644
index 00000000000..d6c02fff0fd
--- /dev/null
+++ b/dev-util/rocm-cmake/rocm-cmake-9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+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/roc-${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+ S="${WORKDIR}/rocm-cmake-roc-${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-utils_src_prepare
+}
diff --git a/dev-util/rocminfo/Manifest b/dev-util/rocminfo/Manifest
new file mode 100644
index 00000000000..28fcd10b1e6
--- /dev/null
+++ b/dev-util/rocminfo/Manifest
@@ -0,0 +1 @@
+DIST rocminfo-2.6.0.tar.gz 12293 BLAKE2B b08725b45f48e78841da9d6e57bb19a441a423e20f853d16024c620914059abf3cb2e61c12ae6fdfdb85eb3e984d488ae9975ab3fd2fcc529ecb576c6816fc92 SHA512 e2dae7e2e02b674b3ad959a3dffdcd8f550842edfd0eac5866259a6a12de1a5f935afbdcb37845fa189d0937c41186f0eb8be08e7b346ddef959d5dd7b62dca7
diff --git a/dev-util/rocminfo/files/rocminfo-2.6.0-cmake-variables.patch b/dev-util/rocminfo/files/rocminfo-2.6.0-cmake-variables.patch
new file mode 100644
index 00000000000..1678f504327
--- /dev/null
+++ b/dev-util/rocminfo/files/rocminfo-2.6.0-cmake-variables.patch
@@ -0,0 +1,31 @@
+https://github.com/RadeonOpenCompute/rocminfo/pull/17
+
+From c9bfc4b3db029b8502f900cd9bb545a675ca0898 Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Thu, 25 Jul 2019 17:59:51 -0400
+Subject: [PATCH] Use CACHE variables, allow overriding
+ ROCR_LIB_DIR/ROCR_INC_DIR
+
+CACHE variables allow for variables to be documented, and ROCR_LIB_DIR/ROCR_INC_DIR should be overridable as they'll have different values on different Linux distributions.
+---
+ CMakeLists.txt | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b5fa9dd..f8f430f 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -43,9 +43,10 @@ endif()
+ #
+
+ # Required Defines first:
+-
+-set(ROCR_INC_DIR ${ROCM_DIR}/include)
+-set(ROCR_LIB_DIR ${ROCM_DIR}/lib)
++set(ROCRTST_BLD_BITS CACHE "64" STRING "Either 32 or 64")
++set(ROCM_DIR CACHE PATH "Root for RocM install")
++set(ROCR_INC_DIR ${ROCM_DIR}/include CACHE PATH "Path for RocM includes")
++set(ROCR_LIB_DIR ${ROCM_DIR}/lib CACHE PATH "Path for RocM libraries")
+ #
+ # Determine ROCR Header files are present
+ #
diff --git a/dev-util/rocminfo/metadata.xml b/dev-util/rocminfo/metadata.xml
new file mode 100644
index 00000000000..c7439799c48
--- /dev/null
+++ b/dev-util/rocminfo/metadata.xml
@@ -0,0 +1,14 @@
+<?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>
+ <upstream>
+ <remote-id type="github">RadeonOpenCompute/rocminfo</remote-id>
+ </upstream>
+ <longdescription lang="en">
+ ROCm Application for Reporting System Info
+ </longdescription>
+</pkgmetadata>
diff --git a/dev-util/rocminfo/rocminfo-2.6.0.ebuild b/dev-util/rocminfo/rocminfo-2.6.0.ebuild
new file mode 100644
index 00000000000..31ca101fc69
--- /dev/null
+++ b/dev-util/rocminfo/rocminfo-2.6.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/RadeonOpenCompute/rocminfo/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+ S="${WORKDIR}/rocminfo-roc-${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"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-cmake-variables.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DROCM_DIR="${ESYSROOT}/usr"
+ -DROCR_INC_DIR="${ESYSROOT}/usr/include"
+ -DROCR_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
+ )
+ cmake-utils_src_configure
+}
diff --git a/dev-util/rustfmt/Manifest b/dev-util/rustfmt/Manifest
deleted file mode 100644
index 07ffa81aa27..00000000000
--- a/dev-util/rustfmt/Manifest
+++ /dev/null
@@ -1,44 +0,0 @@
-DIST aho-corasick-0.6.3.crate 24963 BLAKE2B 7d22a3501664a4324e43a20874fe4d2afcb1576d66f76bcfd894c0ea03b0daefd85e03e20196370dcb86d8c81067c3bc2202889349389c23b876d4b2bf8f2bbd SHA512 4d0d55d8a6657fe13009d66728b7417926325dd9ca4f7ad7cd5d40e59cf0a55b906cd109d724a0b385ee988526535fc64a467ded171419e452c5a8c90196ae45
-DIST bitflags-0.9.1.crate 12406 BLAKE2B e89527c5411150c09bc16072e0e4e5b2dde4b50fb2ed76984c1b58db225912db580f96c7954cbbf597036e9d743658364977ba24d0d7660312c3b8d38306d879 SHA512 3c106186aa8b5b8d0fba377818618e6428af38f60e4f707873142b44cb6f64d1d7f347840c8bfba084ff569ac8c57d87f2288c4a1d79e282bc02544d69f976c0
-DIST diff-0.1.10.crate 7534 BLAKE2B 4dbb88e8b516de6441a1e1a090f0b58399c53bac8bddc212bcc2acd05613ddb81ebe689270aeca01b8395da02a5bdcf80ea9daa050c85d5835915ed4d901978d SHA512 1ba0f700ecd4f0598ed3d32e5f54f8df9d47b4a440c8a16ac99a45fd8401ef68acb6b743056fc769ba29f5c060745de7fec697aa1dff14f44c8f7c6bec74057b
-DIST dtoa-0.4.1.crate 73264 BLAKE2B 36698b6d78a1abc15fe36a9cfd545cf91c116d249b52b710bc098cd3857bef6ea1491e10c641c3e4fe8b6bb91c66b7623e22090ea182f2af61da6bcde1a8d032 SHA512 eb1be73a72f1b301371484aabfbffaf69692ad6baaeaace810d7bc8097a5084cca8cc37abf561b1371cb08fad04e07b24bb2149620a785387759813189682fda
-DIST env_logger-0.4.3.crate 10891 BLAKE2B acbe308cb75ad68f824dd8cbbef13a9bab3234f121952f16af274180ce87bbde6f6327bd98f0d2a4623fa7a4980b554ffecc9280b709df1323de149399537d6d SHA512 ba2c10608f87804e528a2de28c236e780485413dbc3835b5bd9acf4a9c11d9c66665a310747b5d8a5ef7752186ab8a1ab5fbf6042657a3447380cb0869722246
-DIST extprim-1.2.2.crate 40910 BLAKE2B 92cf01e760fff5f1b8f880779c97a193bd338e9a4a4257d975082db873fa0a891f6bf700c629fcc57bbc4acb707a34c11da4273f640b9a527497325ba1cdaf4b SHA512 e14c5720c799b9822ce27fb000eb040b3aee41634c3a80a4ac275fd36575c777e0103b8572afc1d5c4ca9b08317b7620cace93fedb9363983617e8d8927cfba2
-DIST getopts-0.2.14.crate 16622 BLAKE2B 14dc08b56cc7d11bc58bfe952d2b3958c5b0054499f2a4bb7b7bcd100dbef5ab3c0fba4ac7f50b688512d71fd0a7eb27568c9f26023c451f0034883742ddeb45 SHA512 bb6101403b6d4ed6102dc84c69e95114c0f336924a3f45643a5a92ca82a2ad5ef6b0405e1975b84853831dcb7518b24d094a211a54cc2b46d32ff914e2f977bd
-DIST itoa-0.3.1.crate 73340 BLAKE2B b1cd133bf79f2c1ea7a38c5607a12cba1d8f707e65208e4d8e30448e0486320efb1933d4f19508a710b46803133bf98c33666d3406a2f52897d8544f8eabc611 SHA512 b6ade2740fefa2e437ad82a1b9ad7c284593f3525a6e746aa377e0d52b434f7f46a073df552c5ba9e9c47f1737f349654c38261c08ec762dfd9238a8d9c3d3ee
-DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
-DIST libc-0.2.23.crate 153939 BLAKE2B e89495dc4b9bb791bfe51e31a8047a20b74ffd585ddd81daec411c583d5d66b0c4fb2ecf13b19d2ef49a7023018df395f388681b1cb7f2f0449ffb4babe8a8ca SHA512 34620dc5ea9bb674a74a5b3d14844c098d38980efe4940538f31ab76e29dcfa6b9601a4747da7a8688758052ac416aa8dd693c752a3972a7bd66d9deebff2d72
-DIST log-0.3.8.crate 17756 BLAKE2B 1b06efd4625f9192e56629a5c8fd3072d876643ec5d42022e001d8c14139c56b7a2bbbaadeb5218a9ada6cd86aae26819dc4693eadb13ac1dd4ae93ac50554e8 SHA512 9fc80f2a72855a2b0260d6bfbdd55085791c67cb1896fd20da0a4d624125003cb0a10d9080c2fd7810ca67e41652a94177e1d091bdadeb5ea65c7c4acd666bd7
-DIST memchr-1.0.1.crate 8221 BLAKE2B 2b3553c5da6bd6eef0cd716fa9e6856aac0a03a566d038e7b0d2c469e16b682ea985d293fa4d8f85cf34e120bce51732e9987061db396f0aaedafc900c13fd86 SHA512 70ee14fcba41cf896f563da48c8acc683f8cdf77c54cf9786d6a938bd14eca7bcc22c86d0d70a3cae56b2c2f9eeecad2950be759abf02fc98ef96a643af91be6
-DIST num-traits-0.1.39.crate 22618 BLAKE2B acacffc5ba41e2eeab0cb50f2746dba800fc5ebc4b9bb32000678eae117bf0e26d52b8225f71ac7c646bd7f5d8ab37615aad74086dc6ff4ea25e6e6fa141f024 SHA512 daf317fcd87807b2e295a4f748f1152f5a9b012bdada80204c97d33e3ef18c89432680db6f79ec655e585e0c38428c50ce5fbe7215f626af6f6f83eff47a364e
-DIST quote-0.3.15.crate 12041 BLAKE2B c5796b464539b018351b41b5e2287398681ccb2ca76f46178b4f310e61a8184afe9ea2b8dd7638f27bf5bf37f60458895497e51c82b31326abf6feb4f69404d7 SHA512 2e5dbe725c0f76a81c6624181b43b60b95dceac208e2babaad3fa6d1487794805169e2ffd967659e4bb4e1abebe96505be5a1007c514d10f2a63ef282d699ea7
-DIST rand-0.3.15.crate 55312 BLAKE2B bde7d5bf10e153d793d0ce9711c6626dab545e1b42296c6c4f0f104bd316bccc51fad3d6321c504069360fba96a74d2af756c92db3859675295c33d0be46c660 SHA512 4c812b1f742adf94fe45c806fd66a360a2490e474db6cc1d13acf4101fd63072429f1b50aa84b51cc742c1624a871a588769f4c12faa775f6f275a028fe96633
-DIST regex-0.2.2.crate 193403 BLAKE2B d8b439c1544b7faf15fa073f9e759a1a4bdc905290da12d22526e00d22462e5b4d29fa928a88cd6a60902958b828539d04c65f9d8f2d00b3b75805dff9763afe SHA512 208b671d06b260e4a130718a86ced88ee7f183bd056461bc6d44a15a22260a9ee05a014682bdb8bb7ff674fd33ac4748687c7ebd847578c7fecc8efbbb1993b3
-DIST regex-syntax-0.4.1.crate 121453 BLAKE2B da7f780fdb19e0516cbe94eb3361b8f3b02ed36dcd7e58eb8e3a16601f169652d45dc10657d400796fdb93be560ec6678e34315d9e94a05e9d0b11b476d8ae1a SHA512 0c6996d0b8c16053f6e4e6324053f8b6924313827d9fec59e209852aed11a18902a51bdaa98b95ab706a4b65896a201549cda2972b54ac2e2a2c704b61690a0f
-DIST rustc_version-0.2.1.crate 9840 BLAKE2B 765402ed397f839f1766da11ac80464d2f3cbd150508dcf1336402eaede9c20052dda4f9baed6ad73192c7586a50147b53e6c45a8d534463731653c113cae85f SHA512 edec68b24e95a04c58a08c67b58dd044f28930a87ad04aff0c0c66ffb3f1e89ab07f2fb9fed5e2e8c6ca3b372225da347bc10bbcd13d62b4552ab15abfdce0f7
-DIST rustfmt-0.8.6.crate 110133 BLAKE2B 09d41e337179b534504fd9f9c259f07e90564c84bcb8810cdea1bc7b45fe4e10b85baf0b4f4dcb0c117876240f072c267a10449ec3ff8af0e765233394ec5141 SHA512 d7f8baba7b35a18ea21c6b0549bbfa4b2e2ff6bce681b4395ac5a08643f138a8de492455edb51d9ed1553cca19807a503b113b860f11359a33a339674ed9cb81
-DIST rustfmt-0.9.0.crate 109710 BLAKE2B 7e599de80cfe334ad30482abcca6ea4bb6a54088d8334a5f177013975bd4dd1ded8cb0bb422a0355866abfa7eb171ad3aa4977b11e821c0e8ed8d9d3ce2b7e3b SHA512 6a09091f27dedcb8e838ee4561ebf05dd23b2e368853b8494a3e14574cd47ce04da20a388963c885863f535a50d8e37f9880a6eaba35c5cc7677bde342f47bce
-DIST semver-0.6.0.crate 15598 BLAKE2B b46a0e8b782550a49174e461b447e617f0232d9df3bf2363273d4815452df5a587ba7534c843d7d68969166059704e1e8abd716623cfac5b42957b2eda55e14f SHA512 8b4dcad3c672ff8468a68fc19de2804e079af1a75406d71b996621021b5e05dc53fef972455fa9146c199493b71e2b80fe180e33ba4ccfb4dda10ba962a0a6bf
-DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
-DIST serde-1.0.8.crate 59699 BLAKE2B f60a77b40d921e91b1e55f3c5f0ec7e1f05aca92f81c991a86c0d8c58d70451e291b94fad5237d23435b144bc0568062d8560c25cfd7ad0e984bc61383e366d9 SHA512 743ab9518935ba219faab7f61f3ce30d6e20c20145ed9ebe46df49e570e74063baace630eacaad2f3b7e9e0030b64faa428810701537a6e2a5224802bc55edc1
-DIST serde_derive-1.0.8.crate 24015 BLAKE2B d97f73055a5375d338fd078f2f55ca3db59c5c6212c9cc02817237ae964fba1076bc8e901f0d80285619568519745f9d55731ffacf3e4965aef80a662f61bc7f SHA512 685446ae6077ac8e730358d8676e9648ed0dca3638c16ab3b14ea0e6823f1743af1b41933ed2b8f4f5e497e8954c954c40dbbe8f8e6d66a0b0caf3cbe2612a3a
-DIST serde_derive_internals-0.15.1.crate 16441 BLAKE2B e1b82c9a0b8c08eddaafbaa3ca5c23aa1b11462e3e45912d2ee109a991206df5a65605739bf8365e3a29836c2fb0a551401bb090f5bf1418c5d6ed9d41c91bd6 SHA512 5599b3022f9a1f16566c4d86ae2f173373905ec318499ffe28a061e58494f786d0e6dff6ca962422bf6d773604b66f62b0de8e19cd39057456d50e923180a41c
-DIST serde_json-1.0.2.crate 55422 BLAKE2B 346d929bfebaf04b0afaebc9ac1c54119f2ce9b77e7163b474fe92669051bae12f0e2fff8ce9899219cc37032b4ea9f5dfc2fbdc022440246526ee11dedb71bd SHA512 ff0a3806b138cadace0ffd600ae695047e6e75655699054e8974160619ae5a00e8d306b85dadb0f08672d16934f43870627e5619af29fbf68497638eb133d4a5
-DIST strings-0.1.0.crate 14234 BLAKE2B a84f7136072e1e403cc3b1a18c29265ed04352e338b683d52fa3f2e2f546924ee71a11e87ed806153e58a6f25444402a1a88bb33c093cda1d98f74f131e4072c SHA512 ac7aac7456d74263bfca93443041517938ee59c4b807877e70d4abd2840387e54eac41fa8406a263e317109401d16df662306756c3d869757e2a48643310c214
-DIST syn-0.11.11.crate 63309 BLAKE2B ee33d3f02af356faafd0c03539d1c86ade1f46db8bc30054f76536c1cf537b8fa0d990c78f86b1e5187392b31c5d7364ad5767ae96de5844e252c9c7c41ec962 SHA512 285bdc1f9b53fe791bd35b10a06fc106231c4eca908244f7ba7366a865452ec2dc8bbff275a52725d29c48d2065790ff6eb37c6eb9c1968aeb0af38c028d173e
-DIST synom-0.11.3.crate 17120 BLAKE2B 30c6bdaff48eb2f3c28a348f737ad4b9ebf4b385de75ec2510aa9fef3b426a8a00041d0dd1649d11a9ba39cd4b9363e0e3f7d808cd0b2d588a38edb395be86d5 SHA512 a9c75d667be94c82c7f545e0569bb5858afd1bfca6e045fd52f4ae18ec4fd440e7d374ef45dafc97bda6c749cd4b4e185d8192b833661657323229803ef4a28e
-DIST syntex_errors-0.59.0.crate 29194 BLAKE2B 36c35e5e5ecfe433e756b75ce09e1753496186ec178c6bd44725b4676af201eab1e833cb083fe9092beb3a9bdaf2a244998f8a7bd503e4e48f6985e884f3b465 SHA512 ad6931e3a9d64400deba090e8f269eb81ede1582238fe3889b35404ae38c4f33fd767ba9bd69cea13c87585f40271d41c7df6cdd9ebf7e1401d321323f4fc442
-DIST syntex_pos-0.59.0.crate 19199 BLAKE2B 9181c16d570591e0b05f0e11c0de47636824f8f924ece677ecec08fbb1810d6440e9780d56c625fade6e9ed214370d58ccc18756f6cbb2c6dc3e030159dcb883 SHA512 af1af6b6311d8dfb713850b48e4b4f4b16cde7249822a8b62c255e4b3c70e88fd4a5b1cb0ef9394b7f9f2833ca406b8d5a4646dd1f59868987fe0fa9276264fd
-DIST syntex_syntax-0.59.0.crate 269946 BLAKE2B 5114590f0902ef14d1dc3bddf9f42b4326dcf0ed70c51c9ff3279a0c433dfe0eac5f671eea6e72c0bc2302577c80ef96a7989f3326b81c9e3673b8052faf1808 SHA512 08420148294c2840f92b10cc695d5a2c50a72501c1b191fc863637d62ac673bd68fd6f08826091a932b3cdef228b175f37ac98186b4c797f249b5a7a7804adb9
-DIST term-0.4.5.crate 37496 BLAKE2B 4b0b4deea60e446150ca89f8fcbff5ea38818482a5a995215c21f64d6fd5b4c97f3b2e61fd729e1e2e004b41ac0e4eb37e6e477b983c204d8bbd4990e455d875 SHA512 ffefb5d3611eedea8508611e6c27d9da32070f2e8ba998cbf060791ac36a2d58b310981c742f638967f0a0a7de70ca40b4b6fb093d3fb643b01cbf73f8e624dc
-DIST thread-id-3.1.0.crate 7195 BLAKE2B 8bed46dc27434635f5dfba629e56c2aa1ab0a74733d37b9e90339d70443471e95bbe59672525962143b85df60b6834e1a3cf98b071c07eab371419e09aa28512 SHA512 f24b2608cb476829d43b71aec0e12a12123a8943402755ec44f5eb4974e63ce7ff1d75f5046ddb533a08447c98758c226163e461c52413091d85f6267a19af13
-DIST thread_local-0.3.3.crate 10964 BLAKE2B 1cfdc1a83682243df8bd3fd75b00f174f6e07e7494f47f9b580704cde47c91650d2733fee331f8dc3209e6b1f199b26bd07aae02a3981c9769500ab791bea053 SHA512 19b4d445c2688898d149a05aec7c157f5c8cf48a60fa98b8890bc70ee8f391fc94d454ec218002063bbaaa715326957ab2dfda0537b782a2643e908b64e0f22d
-DIST toml-0.4.1.crate 54017 BLAKE2B 20fd8f0f8501adba0cfc504446d490da8d488efe218f54e8b9bda2e95d70b1a26d660fdfd512bd6344a2858e7a813edb10c26f366041171407db29abd1025654 SHA512 ad603d1011c253eda1366fdc9781a8d5f6c3792cde26cac2552e2aea2ab7e2a926257587362d5c11518e397a96d59a4c38b0418eaeb5c584c83a37850d488480
-DIST unicode-segmentation-1.2.0.crate 67562 BLAKE2B e294566ff0f0bbf8873c73c8f1103bce8d4d0fc8a03f41b299f88aeacecbcb44a3cf2ce95aab9682177a9e3f2e3db9cbd53403830c761724ee3654b9c328f862 SHA512 724fb05d4c02926a535a3380f0a718e5ca0b61c71173efccee6780e878b3e890f11e7941cd970c6c1763ac756f31fe338b0dba2ff31db2aad29670bd6e8b9bab
-DIST unicode-xid-0.0.4.crate 16034 BLAKE2B 7ce4752eab109f457a1f8cdd3a9bebfe637652d7e2c0625b6c6f76dcd2d5f3e8b66c89dc4ca158282044dc1a2b030adb1b28e3a44b5a462c7e206cd25d925e66 SHA512 7a3a60936a18d54001dc477f6da1c9784bec53263f13e5c21ba00228ae4ff09f7bb8445cfb39febde957b8500bd1a4a998cc5cfd18046aacbc68e9993510e091
-DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
-DIST unreachable-0.1.1.crate 1772 BLAKE2B 5d2400959e334d483f1b2a6accbc6641de33df02041d8c7ea23bb66cb0d34c9a911d70926f0849bd3004ff1683c3c212ab7877d6c3b9df535726ea81f7237a20 SHA512 81d7e8740630ef90341bed76f5be55c928c1f28cf46ef23431a7f610445cae884eea532df805784b2fa04034e831255a3102a29fe2c228b8c1c1afe15d01cca0
-DIST utf8-ranges-1.0.0.crate 8599 BLAKE2B eb356d94a937f5f7cd6ed17ba85c03fc1ced30ab9215aad1cda3e600dc6efd8bedef744a2dadc9664dc2cac0ef815f451e88db5b75f70eb1f50670dceeb7e244 SHA512 da498433597582970860db1c66ff1cc2ed8b0e2bf816e6aabdb40424ec03c3f28e6ca5e7592e464442004077735dca4144acd13c8f6a2e799d67504699422643
-DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
-DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
-DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
diff --git a/dev-util/rustfmt/metadata.xml b/dev-util/rustfmt/metadata.xml
deleted file mode 100644
index 838e7b2c842..00000000000
--- a/dev-util/rustfmt/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>rust@gentoo.org</email>
- <name>Rust Project</name>
- </maintainer>
- <upstream>
- <remote-id type="github">rust-lang-nursery/rustfmt</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/dev-util/rustfmt/rustfmt-0.8.6.ebuild b/dev-util/rustfmt/rustfmt-0.8.6.ebuild
deleted file mode 100644
index 34cfca3fcc5..00000000000
--- a/dev-util/rustfmt/rustfmt-0.8.6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Auto-Generated by cargo-ebuild 0.1.5
-
-EAPI=6
-
-CRATES="
-aho-corasick-0.6.3
-bitflags-0.9.1
-diff-0.1.10
-dtoa-0.4.1
-env_logger-0.4.3
-extprim-1.2.2
-getopts-0.2.14
-itoa-0.3.1
-kernel32-sys-0.2.2
-libc-0.2.23
-log-0.3.8
-memchr-1.0.1
-num-traits-0.1.39
-quote-0.3.15
-rand-0.3.15
-regex-0.2.2
-regex-syntax-0.4.1
-rustc_version-0.2.1
-rustfmt-0.8.6
-semver-0.6.0
-semver-parser-0.7.0
-serde-1.0.8
-serde_derive-1.0.8
-serde_derive_internals-0.15.1
-serde_json-1.0.2
-strings-0.1.0
-syn-0.11.11
-synom-0.11.3
-syntex_errors-0.59.0
-syntex_pos-0.59.0
-syntex_syntax-0.59.0
-term-0.4.5
-thread-id-3.1.0
-thread_local-0.3.3
-toml-0.4.1
-unicode-segmentation-1.2.0
-unicode-xid-0.0.4
-unicode-xid-0.1.0
-unreachable-0.1.1
-utf8-ranges-1.0.0
-void-1.0.2
-winapi-0.2.8
-winapi-build-0.1.1
-"
-
-inherit cargo
-
-DESCRIPTION="Tool to find and fix Rust formatting issues"
-HOMEPAGE="https://github.com/rust-lang-nursery/rustfmt"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-
-LICENSE="|| ( MIT Apache-2.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/rust-1.8.0"
-RDEPEND=""
diff --git a/dev-util/rustfmt/rustfmt-0.9.0.ebuild b/dev-util/rustfmt/rustfmt-0.9.0.ebuild
deleted file mode 100644
index 3060ef0ed69..00000000000
--- a/dev-util/rustfmt/rustfmt-0.9.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2017-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Auto-Generated by cargo-ebuild 0.1.5
-
-EAPI="7"
-
-CRATES="
-aho-corasick-0.6.3
-bitflags-0.9.1
-diff-0.1.10
-dtoa-0.4.1
-env_logger-0.4.3
-extprim-1.2.2
-getopts-0.2.14
-itoa-0.3.1
-kernel32-sys-0.2.2
-libc-0.2.23
-log-0.3.8
-memchr-1.0.1
-num-traits-0.1.39
-quote-0.3.15
-rand-0.3.15
-regex-0.2.2
-regex-syntax-0.4.1
-rustc_version-0.2.1
-rustfmt-0.9.0
-semver-0.6.0
-semver-parser-0.7.0
-serde-1.0.8
-serde_derive-1.0.8
-serde_derive_internals-0.15.1
-serde_json-1.0.2
-strings-0.1.0
-syn-0.11.11
-synom-0.11.3
-syntex_errors-0.59.0
-syntex_pos-0.59.0
-syntex_syntax-0.59.0
-term-0.4.5
-thread-id-3.1.0
-thread_local-0.3.3
-toml-0.4.1
-unicode-segmentation-1.2.0
-unicode-xid-0.0.4
-unicode-xid-0.1.0
-unreachable-0.1.1
-utf8-ranges-1.0.0
-void-1.0.2
-winapi-0.2.8
-winapi-build-0.1.1
-"
-
-inherit cargo
-
-DESCRIPTION="Tool to find and fix Rust formatting issues"
-HOMEPAGE="https://github.com/rust-lang-nursery/rustfmt"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-
-LICENSE="|| ( MIT Apache-2.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
diff --git a/dev-util/sasm/Manifest b/dev-util/sasm/Manifest
index c5c88bc01dc..c40448f3c61 100644
--- a/dev-util/sasm/Manifest
+++ b/dev-util/sasm/Manifest
@@ -1 +1,2 @@
DIST sasm-2.2.tar.gz 9117410 BLAKE2B f85d120469f11fd8cdb7ae9dcdc87464d8bc64db4f99cb2787c4f2adb6294288a7fd1dc071b53badb8153e8c8220a77964b102a234ad9ebc3b6a64d505c828dd SHA512 42d4af775d37d47bcf63fb70b9142e387e33cef5589002ff3e3cee926b5fca7e1508d640d1d5a175d48fc9fd041eb1f03304cad5ddc3c22a09ff29198650b513
+DIST sasm-3.10.1.tar.gz 22349749 BLAKE2B e1337d9ab1f62b0ccab31f202f5964ab2b355ab597cf08e65dd69f7a35f72187a36767d1bbbf339e3bf8330dffcd924682e464d0e8cdc13255723b2c5ed75747 SHA512 2a1410c996e3dac1179a2c8a0140b2180ccc9e461e4695a588c6a5db787a13de5ca9124d467561905e1d445d08bd044bd99831203faa6a740614bc6680ae10d1
diff --git a/dev-util/sasm/files/sasm-3.10.1-unbundle-qtsingleapplication.patch b/dev-util/sasm/files/sasm-3.10.1-unbundle-qtsingleapplication.patch
new file mode 100644
index 00000000000..70b7e56682d
--- /dev/null
+++ b/dev-util/sasm/files/sasm-3.10.1-unbundle-qtsingleapplication.patch
@@ -0,0 +1,19 @@
+--- a/SASM.pro 2018-10-08 22:09:33.000000000 +0300
++++ b/SASM.pro 2019-08-17 10:39:31.695020549 +0300
+@@ -18,6 +18,8 @@
+ BINDIR = $$PREFIX/bin
+ DATADIR = $$PREFIX/share
+
++CONFIG += qtsingleapplication
++
+ bsd {
+ binfile.files += sasm
+ binfile.files += BSD/bin/*
+@@ -47,7 +49,6 @@
+ INSTALLS += shortcutfiles
+ INSTALLS += docfiles
+
+-include(singleapplication/qtsingleapplication.pri)
+
+ SOURCES += main.cpp\
+ mainwindow.cpp \
diff --git a/dev-util/sasm/sasm-9999.ebuild b/dev-util/sasm/sasm-3.10.1.ebuild
index 61a911989dd..90ca72d5316 100644
--- a/dev-util/sasm/sasm-9999.ebuild
+++ b/dev-util/sasm/sasm-3.10.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
@@ -15,7 +15,7 @@ else
fi
DESCRIPTION="Simple crossplatform IDE for NASM assembly language"
-HOMEPAGE="https://dman95.github.io/SASM/"
+HOMEPAGE="http://dman95.github.io/SASM/"
LICENSE="GPL-3"
SLOT="0"
@@ -23,10 +23,14 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
+PATCHES=(
+ "${FILESDIR}"/${P}-unbundle-qtsingleapplication.patch
+)
+
DEPEND="
dev-qt/qtcore:5
dev-qt/qtgui:5
- dev-qt/qtnetwork:5
+ dev-qt/qtsingleapplication
dev-qt/qtwidgets:5
"
REPEND="${DEPEND}
@@ -34,6 +38,19 @@ REPEND="${DEPEND}
sys-devel/gdb
"
+# SASM repository contains precompiled binaries ¯\_(ツ)_/¯
+QA_PREBUILT="usr/bin/fasm usr/bin/listing"
+
+src_prepare() {
+ # To recompress it with gentoo tools
+ gunzip Linux/share/doc/sasm/changelog.gz || die
+ sed -e 's@changelog.gz@changelog@g' \
+ -e '/docfiles.path/s@doc/sasm@doc/'${PF}'@g' \
+ -i SASM.pro || die
+
+ default
+}
+
src_configure() {
eqmake5
}
diff --git a/dev-util/scanmem/Manifest b/dev-util/scanmem/Manifest
index ae50e589dbd..df1de638310 100644
--- a/dev-util/scanmem/Manifest
+++ b/dev-util/scanmem/Manifest
@@ -1 +1,2 @@
DIST scanmem-0.16.1.tar.gz 202133 BLAKE2B bb07234aaf1f93dba5f7feb0af0efcdadb7cd7cabfce2d62f19da01ba947cf9f4ba91024db2379e218b91953679a77080a4fa711ceaca659ac7b3f01645e3f93 SHA512 5e0a97e020a8a392aed75e2654cc6bcfad68590b9caab43444e57c3180be45ce1269f5acb02355bee57ff8bb5b9349b4f65e0fe96655206a812ea645796b153b
+DIST scanmem-0.17.tar.gz 220489 BLAKE2B b1ae07f96fd736e9ca6a5d55ad2d6b06b7d0dc4828915e0f2adaa2d58b053d9734ccd7425fb5391289249f838773cf3f9a81dbe76bacd42f41203d27dcffed05 SHA512 6d74f3d1d3492d41cabc342cfd1189815536dcbd57857d8a92e05c5dcaebcb9b1df886aee706c56eaf3344737070ea0fe852eef164ef3fe7907f66c626d8523e
diff --git a/dev-util/scanmem/scanmem-0.17.ebuild b/dev-util/scanmem/scanmem-0.17.ebuild
new file mode 100644
index 00000000000..542361fbb18
--- /dev/null
+++ b/dev-util/scanmem/scanmem-0.17.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+inherit autotools eutils python-single-r1
+
+DESCRIPTION="Locate and modify variables in executing processes"
+HOMEPAGE="https://github.com/scanmem/scanmem"
+SRC_URI="https://github.com/scanmem/scanmem/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gui static-libs"
+
+DEPEND="sys-libs/readline:0="
+RDEPEND="${DEPEND}
+ gui? (
+ ${PYTHON_DEPS}
+ dev-python/pygobject:3
+ sys-auth/polkit
+ )"
+
+REQUIRED_USE="gui? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+ use gui && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ sed -i "/CFLAGS/d" Makefile.am || die
+
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --with-readline
+ $(use_enable gui)
+ $(use_enable static-libs static)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ if use gui ; then
+ docinto gui
+ dodoc gui/{README,TODO}
+ python_fix_shebang "${ED}"
+ fi
+ find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/dev-util/sccache/Manifest b/dev-util/sccache/Manifest
index dc5a9e43e1f..9d524e907c5 100644
--- a/dev-util/sccache/Manifest
+++ b/dev-util/sccache/Manifest
@@ -48,7 +48,9 @@ DIST dtoa-0.4.3.crate 14456 BLAKE2B e310c71454a3ebe77e9b3f479b45b8dc15b988823eee
DIST either-1.5.0.crate 10900 BLAKE2B 5db7e6758a91dbb7ea7c9f49b17d03e98463894e9fb95914e519542367f9f87986358b4ce0f34e261b31c204af532ed962b2ddee2e6fee9ab001e7f372371711 SHA512 9dc046f2c27bf12f57413443586171cb1d7574e5de76e02af892f9027bc66c2cab840180ad85af3833aee61d5fec033c77a15809492e8c2a78b541addbc81df0
DIST encoding_rs-0.8.10.crate 1244099 BLAKE2B 855a2af8075d8ac81e24978b6d03017db408319e8fe485b372af06addfd9930df0841d99f986edc7c16bc9822bdac72bf7af56582a3ca441e66f4cf0266f213c SHA512 b6ad406bb549c0a0e7aeaf11961eb45f640ce0f83baadc54408827db04d69a70e490f8bff54dd01a0457a9fe717ae42b9d5c59d89f8246219fe640f77a4208bc
DIST env_logger-0.5.13.crate 25275 BLAKE2B 02d13c40bafa9e403ba1e3582e296d132061ef020183d39a071f9ab4606a8f45cd211708ab8757d6dd9c04bf4b79b429c0db4bc293a8dbce0506b643d1a6aba5 SHA512 46739cbdcfb34e56b65c7839a5d62ec0f285359dd415bcdcbd2de5ad8e8015aee5a31e92c202c94da5d75235dee4f49ad8585fb852be1f8b2852438922ed4a99
+DIST error-chain-0.11.0.crate 27207 BLAKE2B e50c4e2d6a173e9866311bb81adbde4bddd64d529bfcc919ecade60926112b537cff491a4ba8e84586b3dc63e87e2b3c0695452c165ddf202d6901b2d6247f2c SHA512 a7c06be660a554b4c50deacaf6ef0699cf6e8cf234d9610324c70dac0cffeff1540dfbf10efd41427858551b095c998d670f1287c9459c35217bd78d8887c60b
DIST error-chain-0.12.0.crate 27056 BLAKE2B a6d699ae63838d3b0d40a63977642fc464558fd45a46c2da9c7a57889450f7ce183c43dddfbe325c8cf6db2775c1a41f547bfd3802cda5b46d4a09f6e0a91aa5 SHA512 7e9fd94de9f0f8e61039766953d85b3cc5f87be2b8c37016295031ea3234dbcbccd111f521ddaaf97dab7f8ff8c30828b8949958014ef1e13a02544b6143b9e4
+DIST error-chain-0.12.1.crate 27906 BLAKE2B 66c54c3448b8968a70395861469d7b80aa101210a3c96d2f28b0933fce6d77ec28f4ee18d7666402abc8162f567029fe93f7dc80b93644ef6e488ad4062832bf SHA512 1a8baeac9f4d96214a878b5c80ec2c5753c2232a166515c96ad6a42424bbe32410f2acd3aefa70d9dda7036e1965d83aeb9fd1a393b11464fed751aaebc9bbdc
DIST escargot-0.3.1.crate 12708 BLAKE2B b6beb0243d791576070ed0662e39944c28204aed3345d63be96d2e43851840e6bad084e5d38aad2e775169c25661aded27fa866048b4725e5c2d654e7db55411 SHA512 4d7b28c08aba0cb8d61c0df4ad1fec2c2e940495384160dc16dafaaa0f65a603d9acd4b53ce6c87fd55f255ff28aa78265c17254bea8489c7b6b9b27f9f7c92f
DIST failure-0.1.3.crate 34107 BLAKE2B 6ed7b1f978bc88b5a8c3e6b30854cf0718ec7882c88834f7464bdf2864a784026a90034239c09ae433b4938293be7fe8034bc32b295350db1bf38e76f140a47d SHA512 b77170bb749da6a8af01cb9bbd42c5e75ff72ed74886d8ae1223bf6a7c2089c0bd37420e9e2eb5fa74c58214e49c0d00ff632008d7f6d6c831ede92db8de7e64
DIST failure_derive-0.1.3.crate 4349 BLAKE2B 1e5b282737425c0ce9c6bbfa3ee47748c65ad5914fe253ead5dd684770078bee4748418510080e47e4b6c6b7be60e99cf214b42055bcedf2653c3668c9c6ece0 SHA512 22e75f72a5bb739003a65e6d8d0f8a8b4f02b605829bc1c4e5b1f87a45e5e46b0a6dd4ddce0d3b3bb029fa5d177a2e01de510e29103e24038c795d4354c76eb4
@@ -97,6 +99,7 @@ DIST lock_api-0.1.5.crate 16967 BLAKE2B c44ebe24fa6074394d0719b293d447ab67a9a237
DIST log-0.3.9.crate 16686 BLAKE2B 543a8a2425c88bd3cf00d4cd2b4790ef344f9743b61776d65f1d8aaaa1ee1069933e33aec114a2dcaada5cf698bbd983fb22354aa50bca58b161a36b2f1efc47 SHA512 1d49a0dcff0a17c1238aba6a6cbc485a61986e8c4768805ded912c5014d0fba6ca38c9bd038f3f53900a6309d41fc0216682f137362e63715878195453d2de6f
DIST log-0.4.6.crate 22303 BLAKE2B 3b1ad5e1cc1cf7bb223df569a6024b5749fdc973bb99a2a1f11772774cb384cc98214366e62d846b57c7d150f925cdf0e906f8113039204a82fbf001ae15133a SHA512 3844c771f97531ae7312c6bb0cf74ccaab94925f68bf1172419cc44fa4b5373f3ac6b42fb6d0ba636a970b295ea5d1b5abbe72b4da67a103e8dc4ed48a0cc5cb
DIST lru-disk-cache-0.2.0.crate 10160 BLAKE2B 2a5e9316f72446c7d43893ceadf463e5081f04372565045fdea17cc0fb7ef501e1a3fcb54ae22c75278c49384e4aaac61bc1b312b74a1a8f98d6935c925bec8c SHA512 ec21cf5c66151b14cb0330d4c240a88856016a4235060b2b58f184d2da175900f2a3a16e0bd03f4fb66e164c81e7d55f5603df911022ee528a10b6d6822593c9
+DIST lru-disk-cache-0.3.0.crate 10560 BLAKE2B b027b7b84a553e47cbe46520d0271025bbb9067e9f0f5a0539b01cded949f0b32e3dec390b84211a603efc92e729059801a6d675e01fb798f9be4e7c0592a268 SHA512 d8aac241e43140984500c443ae61f30ce33a1532b6200d63f122a3b2aed9aad8c9a790f6387644947df2accafcd060b5bc75a0fa9c19e14b1f99dd86d870e50d
DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
DIST md5-0.3.8.crate 6177 BLAKE2B ccfe37b9ec1284e5b7a1532d521ac2a96f3a77488166a71b5e57ac5d848db6db9a3b43cda0a5f8d2ec35f353b0576f4c16f50a6fb5041844c668462f0afcd05a SHA512 3cff7965ac287077803a1cae6e808f8157ed182ab282c948fae6f936692b08ce904ecdf53d37b83989aaf57dceaf1e82984c749ca27a2ca83f8eed2945f36398
DIST memcached-rs-0.3.0.crate 19015 BLAKE2B e50bfe0f85ad0706fc90aa46c1f36f6291377e5d4ce0da1e242a050420ac35e53cd5f5dbe21659ea69b0077bfc248ad2b9ae8bff05ae7bbf54d5760f31a0c8c0 SHA512 bdba069d806d7d032eec08c0328f9bf8a388746d1072e7a654b9c4ca2fce34f164ad1ffd1d91239eaf8e34c821b83bfe6a46ec5c81f7768874627a26183b24f5
@@ -171,6 +174,7 @@ DIST reqwest-0.8.8.crate 55825 BLAKE2B b4bbde5f4229f1ebf797d47a4447fb9e882067f0b
DIST reqwest-0.9.5.crate 63819 BLAKE2B f8f2a524cd542b234966712a07d7178ff24d57fe2fe809c9830f08e91f994575f7f6cb3accaf9e12188033ab9becd384b7c1b654862409cb42b65928d6e2d9dc SHA512 c63ee8937bc91427e6a40539cace7d91722660e517ee789e57584be49efe299f0a7e3ff7a8addcd74109fb69d8ec4cc0697508bda577a94eea6b471815a00de8
DIST retry-0.4.0.crate 3875 BLAKE2B 2484122c3aeb1cbeb5b6152a2c3e9d329945530d3c7f01a8d4b9b83bcb7466ced9b0052acd523872192f7ce63c9b4f9d01dc7b86739c1e2ed0e44fab609397bc SHA512 e7581bf4b3d6217246a9fad57a3af5225c3cd0ef7916ab9cc4b4cd78b040ba5e708d04b0315237a7cbc61f644c5435e24006346f43016cedf1affded1b839be2
DIST ring-0.13.2.crate 5422395 BLAKE2B ec0b8f53e63447d7702c359c260cfbfd201ae3c9773c62ccfe64d24675f5ac41a05aa650c7d0e6be64e9e4222b439ec7db133df542161cbb55b5d9a131b37718 SHA512 0b2fa741bb9c3b085c74ca0daab3f89814178934e9bd4bb1522b8f2fd3bbccf70909667cc22d03d8ad113e714ccf04aa695231bb8c890b20ec72a9ad9252ef86
+DIST ring-0.13.5.crate 5419321 BLAKE2B 8f81b3fd2ef84574ec7763d40c1f37d7d8c324c8d00f49d181f152412ca084b0f765abfb09f5c380c6fd2b116eb9706acd96c724030d71f7950368a902ce1de4 SHA512 18c2bfa44fdbdd8006b114dc97b66979dd24bde852d793f67b8107c3a2fc73934a3817d4911d5e1dc9d0bf70053c7467c657fa87577d9608d10a4b7a9e63ba6c
DIST rouille-2.2.0.crate 71003 BLAKE2B d6ab434e666e471f019533ca394bfe66a1c4e23ea3c66dbefc7f5e8c37d9651ad013c0bc25d8f8c0742819b28fae028606a666ba741e0b424062acbe3d549c42 SHA512 b9b105d59f24773f9a29ddd293be671b8544790cacf83e6e53601d186c7f8b14f5f52556fc5424c1d060e54ba1c8dc1ec492f6a9b698404d7a4c41839bb6ca56
DIST rust-crypto-0.2.36.crate 857879 BLAKE2B c486a2e43eb9ac9d2558bb39a249dcd689e86eef51d9a7613a3964baa633cebec824d5a490254dc06eca7a5faa471126de92452d62c522a3dbf494b9940a13e1 SHA512 0fac026d8799ecde523f20e7b34b9486343e48b95e79cd76bb6c8bfaeaebed550e45d59d85d8a3a58595f10c02a4a5e55691da15c203a4336a9bdb5480cd2e90
DIST rustc-demangle-0.1.9.crate 11463 BLAKE2B 3f03fab938d2778f4a74c101da6adec0eed5033bf06e724a5978de16cabf0341790df5da9c68376ba1d85a048575ff644e14297767950ef15d68c337a5d865b8 SHA512 7047907a0246384eb672bb8fd69a201a205b18460bab857e481606d1b9e25c2629c2898118edd72391da1d1f83b6caf4fb2a78eda19edb6dc7025eadebcc13f1
@@ -180,7 +184,9 @@ DIST ryu-0.2.7.crate 41382 BLAKE2B 267fc35f85a118384ff716f5e3d4045678f0addb74f1e
DIST safemem-0.2.0.crate 6450 BLAKE2B 44598e47fa6185ec0890b4ba6d0e7b5f52f8892875741c3819559dfa61491736d4326fa1713916ca41d6daac72829ad31d0905f2e339a069a987d9715f340795 SHA512 71901f472668572e849504a8a830d4dd9a742729b0158d2c6865a5ad86e65cae8b5bb83707240ba03a7a74c610ace87f8b59bde68998d2bd66c19849aec4fc8a
DIST safemem-0.3.0.crate 6947 BLAKE2B 1f3e86944eda42c890a5f5792b7e0a50fe6574b1cbb077b7f08aca7dfd33e26deb0fccb3aa96056de3d637d014658b682aa47b523f0efb1f8145af7bf34ce3a7 SHA512 c7d56204b29e9c0fcf925ccc43a2c910f6cd74d232c500b61996559a783ced3938cefa058128d72759e94edea683bb8922ac5ea631d16e31b58de093d6650b0f
DIST same-file-0.1.3.crate 7078 BLAKE2B 175390d4c7cbe5b98b27b6d23adcef78beda50277f0035eb58d630591023fff92756e928d2089e915e166c5da6a8b1d5b3184e82576eab5145c1681d46b4e953 SHA512 2d3d03ab0dd4add93cd32e7ca43041d541bee41000fd8d98575a58cbd192fe4498234ab80baa3c4791de9f3d4214feae90f628fd655e3510ede61f757be3a82c
+DIST sccache-0.2.10.tar.gz 242187 BLAKE2B cbb6e7673cbecb855c2126f5e5938866097fc57f05e24c74538112b887071e87f63cae864982d7b153f862711b6014e33e1a7145e6d01300123f2031e01d128a SHA512 4f4c051e93d937bae42739d9030dddddde48af59d66c69256172ad660e8d6135c64a77421174b98d304ddff9949d33a04e84e05c255ceccc73cd9cab32663989
DIST sccache-0.2.8.tar.gz 229658 BLAKE2B 95a9f7f3adf72dfc49e344de10e374e80e09d0d0ec91fa913da06f8c068a3e4632aecf30a3349ae02ebaa5d3984d5342258842656133fac77db33e0aaae7f75b SHA512 3469a50339892ca2495f5655a1bd9fcb21a60bd01384c6851789e806902d95d605a941b1a09e0172eef663bddbc7d32fba3afc9ec76bd2a27f32acb1b7b0a35f
+DIST sccache-0.2.9.tar.gz 239624 BLAKE2B a8b91e71512cf37c4d51fcfab8339345c8c4c6ab542422228f0b573220b2b5256d54c8347e36c54cbe39b6c3b5f7ecea3606b52564dc21af0a143bb2cf49f7aa SHA512 289109338913c935752e9bbcd45b7bf4ef48be03b5a7d92c93ac220b98f04338ff562030cf126f80bda8db41e83b1103e6c2bd55caaeef4d7804157f4f685080
DIST schannel-0.1.14.crate 38833 BLAKE2B 8825f6325f65c5aa4031a2260c4c54ad2a65634d2ce349bf6c31fc10a76f539dfe58d4de1e04fe6e48e885fabf5f720f5b4e4625f4a511e96c7cfe9837c901fa SHA512 550623a87f01c3c6181dad44d44397f172aa07c1b262a78d6eb38ca0676d68bcb8f231970c4eac87e93286225e17acae09551b07128c43b576ea77caae18c0b7
DIST scoped-tls-0.1.2.crate 9079 BLAKE2B 35e15480e05c48d5b886bf94f2fc58f79e7b5f6132c8e81ca8f37140f58d21e8a30dab56de35cc395b1878083f9e7b187af7e580bc61f8f38975b2e1193abb57 SHA512 9e1a517994f06dcdafa05f3ebe67958ed5bc751e6180cff6c891f48fbc143f3279aa841e6109be2c403b492162bdd90b23cf74aeb2154a34748c5d495789fd73
DIST scopeguard-0.3.3.crate 9605 BLAKE2B 2379e45123c1c6ef456001cccbcec3298d6d32a5197ee9ac51e0233522cc24e8dff1900f1a70fe4d8a7889348b0c668e8e5c8956ec0add0898c719ae8e2a0a5d SHA512 57ce8e32dbe342040a63ec65fbef3680d66d439f0f704c5d485670041505905cfc602e7e3580748b4b4a55ce892d17a453e6d2f853cf0de4c6a2082f0fe95719
@@ -210,6 +216,7 @@ DIST syn-0.11.11.crate 63309 BLAKE2B ee33d3f02af356faafd0c03539d1c86ade1f46db8bc
DIST syn-0.15.21.crate 146845 BLAKE2B 843c3d7a4853c50be188f7c67a329220cf8e65a467e9a63b3a28ad88fe89063bbde3873f10bbf81357cc5f192756c0c4b43162fe4412471edf914d7e5d0509e8 SHA512 606ffd4bcd74920e7023b2fc83a83087f4a559a9dec0a4a0d5fb6667b9887f98c413191a84b81ddba68e869dfc9fa7d31a3018f90eaed0ad96a039fc46074391
DIST synom-0.11.3.crate 17120 BLAKE2B 30c6bdaff48eb2f3c28a348f737ad4b9ebf4b385de75ec2510aa9fef3b426a8a00041d0dd1649d11a9ba39cd4b9363e0e3f7d808cd0b2d588a38edb395be86d5 SHA512 a9c75d667be94c82c7f545e0569bb5858afd1bfca6e045fd52f4ae18ec4fd440e7d374ef45dafc97bda6c749cd4b4e185d8192b833661657323229803ef4a28e
DIST synstructure-0.10.1.crate 17836 BLAKE2B d80745963f581c02a3b9587d45586e2098632a4c21de22547ae97531bbc4f30a1b02989306999c67584c507a5b07978a48f65ad5e00ff55f39e8e0bb4fdbfa8e SHA512 5830eea0eab15c7ed737bfa14c7bbfc73f28af6964ce3148542066fb9760a80dbba82fd9a55078426346ba757e0aaba9addecadb1d0f75eac4f029a6e4c7cc19
+DIST syslog-4.0.1.crate 7131 BLAKE2B a6555d6eed6a0701cca7d58554f2ee612a5d18975dc1979414ac536128e0e7d4a67dde0ad2e40b5ffec823f7edd55dc45d646097fcd457fa6124de95411b4c55 SHA512 faff2117fbf377343149e30a4b338fdd799fb7e4bf425962c2523423f8322aae75f180e4a4c42f1497239400cc60a49cfcf65c00c48433ac956ff17e52063341
DIST tar-0.4.20.crate 45525 BLAKE2B 43e29895b6c22b919ce1178ec763fedbf6565d88156630507099da7def5b61352aa0b988265c39d235dcf791098ae8c4a05405a1dd22a1cc0f32221c583871ff SHA512 0786f88e54f88ad99131450e55d5840832dac11d7a7f7d9a2e8bb69695ea2e98a568bf263a3ea5af08013c9da2b768a36698391cb52f9c8b84cdee5ae98bc13a
DIST tempdir-0.3.7.crate 11468 BLAKE2B 65850a69a07c5c7e5c25d77bfc9881c994b1fe8466b1712b904d9758b234f8d12db6e1b740d461a48b13667bdeca8178e75c956fd6eaa0c0d5aca5aa1ac7523b SHA512 e5b02f7d260ff594fc2dbbd441eb8adfa36ede937f32c8c812b458167c0e49f5cf493c6ebf83ce8007a0aeb97016169fda7f5d2996fecc72f9409d6f463d9bbe
DIST tempfile-3.0.4.crate 21125 BLAKE2B 27781b6755ef3ea66e31f42e89931e9d5439dc71456da95c399c00b1e5dd5037b17a7f5901fb8cfb33284b2bfc506b6dc5890704722f4154947ee413777f2564 SHA512 54890e6632f7fe81914b013fb63951eb651f7c833c6857db7dc701ca719108131acf97dfd5af4c821d32902618bd9e256ec4dd39edaa42f57f9f459a246b2770
@@ -264,6 +271,7 @@ DIST uuid-0.6.5.crate 26185 BLAKE2B 60e120be31fcfe5f3fffc7a89b394889d20ac2f7adea
DIST uuid-0.7.1.crate 32775 BLAKE2B b5d5d558a3b9091dd9c938a8f493de1ba11bb805829881acde4fc7f97cd565d3a87cd793c36dcf0503a33961ad44cb08e25b9b64d76fc884b760a7120947f5e0 SHA512 6559d538ee7a0ec8ec01f86dfc650a46aea8c7dd7c828c3e6c907c252573ec088261726eade02b89fa626b1058a6a5b3f679f507a506cc75ef838c885194453d
DIST vcpkg-0.2.6.crate 9866 BLAKE2B c9c6e1a52e54d6d4103e0b833d77cdd4b2463123a5a12d7c15922bf782c7d56f0055ed5dc9d2bd236a14fb0ed6612c7b691d8a31a98e34b48f84228e6c10a567 SHA512 55678e3cbb7b1bf80e2589df3fc580bb595576a5f24e515819906082ed081e47a546d6825bb92fae56ed0157407244e1b77af1677f0380f2fdd15cc54853675e
DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
+DIST version-compare-0.0.8.crate 14852 BLAKE2B 45d979e5c6ca2391f0e55260a5fea7734437731115468d3fdca29ead7433e3440b15e0619610903654bca702dfc96558550752b54b1d87dcbb550bd19f3d1b40 SHA512 15a26fdbcce0a41c8a9b89347001d26f9e1b9d682ad24f7a1ec30b0dfd1fb67d4938e5f1d45c43b7558e6682727c73932795f08d86e6fc07afead6ef7c1c9114
DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
DIST vte-0.3.3.crate 2397439 BLAKE2B 213fccf5b1f09b2d23bca57be2abec0a3580ab01864c51dd364676f5c66decc5184ef15f0e484f9a94e892f118863655f4b2ed2a340a47276b3fe7b4db901dec SHA512 5e00e8409ef21edb5aa6fbe482785fd5969dd17a6695f82328c4ae12ea8622712dc3473f33832fdfe0cc2395411431fd47842e86e35022149d5e958c4e5f8fe9
diff --git a/dev-util/sccache/files/scheduler.confd-r1 b/dev-util/sccache/files/scheduler.confd-r1
new file mode 100644
index 00000000000..5cb8299fd37
--- /dev/null
+++ b/dev-util/sccache/files/scheduler.confd-r1
@@ -0,0 +1,12 @@
+# /etc/conf.d/sccache-scheduler: config file for /etc/init.d/sccache-scheduler
+#
+
+# Full path to config file. /etc/sccache/scheduler.conf is default if not set.
+#SCCACHE_SCHEDULER_CONF="/etc/sccache/scheduler.conf"
+
+# logging is off by default, possible values are: error warn info debug trace
+#SCCACHE_SCHEDULER_LOGLEVEL=info
+
+# no limits set by default, see IONICE(1), NICE(1), START-STOP-DAEMON(8)
+#SSD_NICELEVEL=15
+#SSD_IONICELEVEL=3
diff --git a/dev-util/sccache/files/scheduler.initd b/dev-util/sccache/files/scheduler.initd
index fd4d616a6bd..fd4d616a6bd 100755..100644
--- a/dev-util/sccache/files/scheduler.initd
+++ b/dev-util/sccache/files/scheduler.initd
diff --git a/dev-util/sccache/files/scheduler.initd-r1 b/dev-util/sccache/files/scheduler.initd-r1
new file mode 100644
index 00000000000..ae9f60bff8b
--- /dev/null
+++ b/dev-util/sccache/files/scheduler.initd-r1
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+SCCACHE_SCHEDULER_CONF="${SCCACHE_SCHEDULER_CONF:-/etc/sccache/scheduler.conf}"
+
+depend() {
+ need localmount
+ use net
+}
+
+description="Starts sccache build scheduler server"
+
+command="/usr/bin/sccache-dist"
+command_args="--config ${SCCACHE_SCHEDULER_CONF} ${SCCACHE_SCHEDULER_LOGLEVEL:+--syslog ${SCCACHE_SCHEDULER_LOGLEVEL}}"
+procname="${command} scheduler"
+required_files="${SCCACHE_SCHEDULER_CONF}"
diff --git a/dev-util/sccache/files/server.confd-r1 b/dev-util/sccache/files/server.confd-r1
new file mode 100644
index 00000000000..4413f0c9bca
--- /dev/null
+++ b/dev-util/sccache/files/server.confd-r1
@@ -0,0 +1,12 @@
+# /etc/conf.d/sccache-server: config file for /etc/init.d/sccache-server
+#
+
+# Full path to config file. /etc/sccache/server.conf is default if not set.
+#SCCACHE_SERVER_CONF="/etc/sccache/server.conf"
+
+# logging is off by default, possible values are: error warn info debug trace
+#SCCACHE_SERVER_LOGLEVEL=info
+
+# no limits set by default, see IONICE(1), NICE(1), START-STOP-DAEMON(8)
+#SSD_NICELEVEL=15
+#SSD_IONICELEVEL=3
diff --git a/dev-util/sccache/files/server.initd b/dev-util/sccache/files/server.initd
index 0c37ee400b0..0c37ee400b0 100755..100644
--- a/dev-util/sccache/files/server.initd
+++ b/dev-util/sccache/files/server.initd
diff --git a/dev-util/sccache/files/server.initd-r1 b/dev-util/sccache/files/server.initd-r1
new file mode 100644
index 00000000000..19656cc6a05
--- /dev/null
+++ b/dev-util/sccache/files/server.initd-r1
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+SCCACHE_SERVER_CONF="${SCCACHE_SERVER_CONF:-/etc/sccache/server.conf}"
+
+depend() {
+ need localmount
+ use net
+}
+
+description="Starts sccache build server"
+
+command="/usr/bin/sccache-dist"
+command_args="--config ${SCCACHE_SERVER_CONF} ${SCCACHE_SERVER_LOGLEVEL:+--syslog ${SCCACHE_SERVER_LOGLEVEL}}"
+command_background="true"
+pidfile="/run/${RC_SVCNAME}.pid"
+procname="${command} server"
+required_files="${SCCACHE_SERVER_CONF}"
diff --git a/dev-util/sccache/sccache-0.2.10.ebuild b/dev-util/sccache/sccache-0.2.10.ebuild
new file mode 100644
index 00000000000..09322dc521c
--- /dev/null
+++ b/dev-util/sccache/sccache-0.2.10.ebuild
@@ -0,0 +1,358 @@
+# Copyright 2017-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# needs itoa-0.3.4 for tests
+CRATES="
+adler32-1.0.3
+aho-corasick-0.6.9
+ansi_term-0.11.0
+ar-0.6.1
+arc-swap-0.3.6
+arraydeque-0.4.3
+arrayvec-0.4.7
+ascii-0.8.7
+ascii-0.9.1
+assert_cmd-0.9.1
+atty-0.2.11
+backtrace-0.3.9
+backtrace-sys-0.1.24
+base64-0.9.3
+bincode-0.8.0
+bincode-1.0.1
+bitflags-0.9.1
+bitflags-1.0.4
+buf_redux-0.6.3
+bufstream-0.1.4
+build_const-0.2.1
+byteorder-1.2.7
+bytes-0.4.11
+case-0.1.0
+cc-1.0.25
+cfg-if-0.1.6
+chrono-0.4.6
+chunked_transfer-0.3.1
+clap-2.32.0
+cloudabi-0.0.3
+combine-3.6.3
+conhash-0.4.0
+core-foundation-0.2.3
+core-foundation-0.5.1
+core-foundation-sys-0.2.3
+core-foundation-sys-0.5.1
+counted-array-0.1.2
+crc-1.8.1
+crossbeam-deque-0.6.2
+crossbeam-epoch-0.6.1
+crossbeam-utils-0.5.0
+crossbeam-utils-0.6.1
+daemonize-0.3.0
+derive-error-0.0.3
+difference-2.0.0
+directories-1.0.2
+dtoa-0.4.3
+either-1.5.0
+encoding_rs-0.8.10
+env_logger-0.5.13
+error-chain-0.11.0
+error-chain-0.12.1
+escargot-0.3.1
+failure-0.1.3
+failure_derive-0.1.3
+filetime-0.1.15
+filetime-0.2.4
+flate2-1.0.5
+flate2-crc-0.1.1
+float-cmp-0.4.0
+fnv-1.0.6
+foreign-types-0.3.2
+foreign-types-shared-0.1.1
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+futures-0.1.25
+futures-cpupool-0.1.8
+gcc-0.3.55
+getopts-0.2.18
+h2-0.1.13
+http-0.1.14
+httparse-1.3.3
+humantime-1.1.1
+hyper-0.11.27
+hyper-0.12.16
+hyper-tls-0.1.4
+hyper-tls-0.3.1
+hyperx-0.12.0
+idna-0.1.5
+indexmap-1.0.2
+iovec-0.1.2
+itertools-0.7.9
+itoa-0.3.4
+itoa-0.4.3
+jobserver-0.1.11
+jsonwebtoken-5.0.1
+kernel32-sys-0.2.2
+language-tags-0.2.2
+lazycell-1.2.0
+lazy_static-0.2.11
+lazy_static-1.2.0
+libc-0.2.44
+libflate-0.1.18
+libmount-0.1.11
+linked-hash-map-0.2.1
+local-encoding-0.2.0
+lock_api-0.1.5
+log-0.3.9
+log-0.4.6
+matches-0.1.8
+md5-0.3.8
+memcached-rs-0.3.0
+memchr-1.0.2
+memchr-2.1.1
+memoffset-0.2.1
+mime-0.2.6
+mime-0.3.12
+mime_guess-1.8.6
+mime_guess-2.0.0-alpha.6
+miniz_oxide-0.2.0
+miniz_oxide_c_api-0.2.0
+mio-0.6.16
+mio-named-pipes-0.1.6
+mio-uds-0.6.7
+miow-0.2.1
+miow-0.3.3
+msdos_time-0.1.6
+multipart-0.13.6
+native-tls-0.1.5
+native-tls-0.2.2
+net2-0.2.33
+nix-0.11.0
+nodrop-0.1.13
+normalize-line-endings-0.2.2
+number_prefix-0.2.8
+num_cpus-1.8.0
+num-integer-0.1.39
+num-traits-0.1.43
+num-traits-0.2.6
+openssl-0.10.15
+openssl-0.9.24
+openssl-probe-0.1.2
+openssl-sys-0.9.39
+owning_ref-0.4.0
+parking_lot-0.6.4
+parking_lot_core-0.3.1
+percent-encoding-1.0.1
+phf-0.7.23
+phf_codegen-0.7.23
+phf_generator-0.7.23
+phf_shared-0.7.23
+pkg-config-0.3.14
+podio-0.1.6
+predicates-0.9.1
+predicates-core-0.9.0
+predicates-tree-0.9.0
+proc-macro2-0.4.24
+pulldown-cmark-0.0.3
+quick-error-1.2.2
+quote-0.3.15
+quote-0.6.10
+rand-0.3.22
+rand-0.4.3
+rand-0.5.5
+rand-0.6.1
+rand_chacha-0.1.0
+rand_core-0.2.2
+rand_core-0.3.0
+rand_hc-0.1.0
+rand_isaac-0.1.0
+rand_pcg-0.1.1
+rand_xorshift-0.1.0
+redis-0.9.1
+redox_syscall-0.1.42
+redox_termios-0.1.1
+regex-1.0.6
+regex-syntax-0.6.3
+relay-0.1.1
+remove_dir_all-0.5.1
+reqwest-0.8.8
+reqwest-0.9.5
+retry-0.4.0
+ring-0.13.5
+rouille-2.2.0
+rustc-demangle-0.1.9
+rust-crypto-0.2.36
+rustc-serialize-0.3.24
+rustc_version-0.2.3
+ryu-0.2.7
+safemem-0.2.0
+safemem-0.3.0
+same-file-0.1.3
+schannel-0.1.14
+scoped-tls-0.1.2
+scopeguard-0.3.3
+security-framework-0.1.16
+security-framework-0.2.1
+security-framework-sys-0.1.16
+security-framework-sys-0.2.1
+selenium-rs-0.1.1
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.80
+serde_derive-1.0.80
+serde_json-1.0.33
+serde_urlencoded-0.5.4
+sha1-0.6.0
+signal-hook-0.1.6
+siphasher-0.2.3
+skeptic-0.4.0
+slab-0.4.1
+smallvec-0.6.6
+socket2-0.3.8
+stable_deref_trait-1.1.1
+string-0.1.2
+strip-ansi-escapes-0.1.0
+strsim-0.7.0
+syn-0.11.11
+syn-0.15.21
+synom-0.11.3
+synstructure-0.10.1
+syslog-4.0.1
+tar-0.4.20
+tempdir-0.3.7
+tempfile-3.0.4
+term-0.5.1
+termcolor-1.0.4
+termion-1.5.1
+textwrap-0.10.0
+thread_local-0.3.6
+threadpool-1.7.1
+time-0.1.40
+tiny_http-0.6.2
+tokio-0.1.13
+tokio-codec-0.1.1
+tokio-core-0.1.17
+tokio-current-thread-0.1.4
+tokio-executor-0.1.5
+tokio-fs-0.1.4
+tokio-io-0.1.10
+tokio-named-pipes-0.1.0
+tokio-process-0.2.3
+tokio-reactor-0.1.7
+tokio-serde-0.1.0
+tokio-serde-bincode-0.1.1
+tokio-service-0.1.0
+tokio-signal-0.2.7
+tokio-tcp-0.1.2
+tokio-threadpool-0.1.9
+tokio-timer-0.2.8
+tokio-tls-0.1.4
+tokio-udp-0.1.3
+tokio-uds-0.2.4
+toml-0.4.9
+treeline-0.1.0
+try-lock-0.1.0
+try-lock-0.2.2
+twoway-0.1.8
+ucd-util-0.1.3
+unicase-1.4.2
+unicase-2.2.0
+unicode-bidi-0.3.4
+unicode-normalization-0.1.7
+unicode-width-0.1.5
+unicode-xid-0.0.4
+unicode-xid-0.1.0
+unix_socket-0.5.0
+unreachable-1.0.0
+untrusted-0.6.2
+url-1.7.2
+utf8parse-0.1.1
+utf8-ranges-1.0.2
+uuid-0.6.5
+uuid-0.7.1
+vcpkg-0.2.6
+vec_map-0.8.1
+version_check-0.1.5
+version-compare-0.0.8
+void-1.0.2
+vte-0.3.3
+walkdir-1.0.7
+want-0.0.4
+want-0.0.6
+which-2.0.0
+winapi-0.2.8
+winapi-0.3.6
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.1
+winapi-x86_64-pc-windows-gnu-0.4.0
+wincolor-1.0.1
+ws2_32-sys-0.2.1
+xattr-0.2.2
+zip-0.4.2
+"
+
+inherit cargo eutils
+
+DESCRIPTION="ccache/distcc like tool with support for rust and cloud storage"
+HOMEPAGE="https://github.com/mozilla/sccache/"
+SRC_URI="https://github.com/mozilla/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+ $(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="azure dist-client dist-server gcs memcached redis s3"
+
+DEPEND="
+ dist-server? ( dev-libs/openssl:0= )
+ gcs? ( dev-libs/openssl:0= )
+"
+
+RDEPEND="${DEPEND}
+ dist-server? ( sys-apps/bubblewrap )
+"
+
+QA_FLAGS_IGNORED="usr/bin/sccache*"
+
+src_configure() {
+ myfeatures=(
+ $(usev azure)
+ $(usev dist-client)
+ $(usev dist-server)
+ $(usev gcs)
+ $(usev memcached)
+ $(usev redis)
+ $(usev s3)
+ )
+}
+
+src_compile(){
+ cargo_src_compile ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
+}
+
+src_install() {
+ cargo_src_install --path=. ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
+
+ keepdir /etc/sccache
+
+ einstalldocs
+ dodoc -r docs/.
+
+ if use dist-server; then
+ newinitd "${FILESDIR}"/server.initd-r1 sccache-server
+ newconfd "${FILESDIR}"/server.confd-r1 sccache-server
+
+ newinitd "${FILESDIR}"/scheduler.initd-r1 sccache-scheduler
+ newconfd "${FILESDIR}"/scheduler.confd-r1 sccache-scheduler
+ fi
+}
+
+src_test() {
+ cargo_src_test ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
+}
+
+pkg_postinst() {
+ ewarn "${PN} is experimental, please use with care"
+ use memcached && optfeature "memcached backend support" net-misc/memcached
+ use redis && optfeature "redis backend support" dev-db/redis
+}
diff --git a/dev-util/sccache/sccache-0.2.9.ebuild b/dev-util/sccache/sccache-0.2.9.ebuild
new file mode 100644
index 00000000000..d1941557a46
--- /dev/null
+++ b/dev-util/sccache/sccache-0.2.9.ebuild
@@ -0,0 +1,358 @@
+# Copyright 2017-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# needs itoa-0.3.4 for tests
+CRATES="
+adler32-1.0.3
+aho-corasick-0.6.9
+ansi_term-0.11.0
+ar-0.6.1
+arc-swap-0.3.6
+arraydeque-0.4.3
+arrayvec-0.4.7
+ascii-0.8.7
+ascii-0.9.1
+assert_cmd-0.9.1
+atty-0.2.11
+backtrace-0.3.9
+backtrace-sys-0.1.24
+base64-0.9.3
+bincode-0.8.0
+bincode-1.0.1
+bitflags-0.9.1
+bitflags-1.0.4
+buf_redux-0.6.3
+bufstream-0.1.4
+build_const-0.2.1
+byteorder-1.2.7
+bytes-0.4.11
+case-0.1.0
+cc-1.0.25
+cfg-if-0.1.6
+chrono-0.4.6
+chunked_transfer-0.3.1
+clap-2.32.0
+cloudabi-0.0.3
+combine-3.6.3
+conhash-0.4.0
+core-foundation-0.2.3
+core-foundation-0.5.1
+core-foundation-sys-0.2.3
+core-foundation-sys-0.5.1
+counted-array-0.1.2
+crc-1.8.1
+crossbeam-deque-0.6.2
+crossbeam-epoch-0.6.1
+crossbeam-utils-0.5.0
+crossbeam-utils-0.6.1
+daemonize-0.3.0
+derive-error-0.0.3
+difference-2.0.0
+directories-1.0.2
+dtoa-0.4.3
+either-1.5.0
+encoding_rs-0.8.10
+env_logger-0.5.13
+error-chain-0.11.0
+error-chain-0.12.1
+escargot-0.3.1
+failure-0.1.3
+failure_derive-0.1.3
+filetime-0.1.15
+filetime-0.2.4
+flate2-1.0.5
+flate2-crc-0.1.1
+float-cmp-0.4.0
+fnv-1.0.6
+foreign-types-0.3.2
+foreign-types-shared-0.1.1
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+futures-0.1.25
+futures-cpupool-0.1.8
+gcc-0.3.55
+getopts-0.2.18
+h2-0.1.13
+http-0.1.14
+httparse-1.3.3
+humantime-1.1.1
+hyper-0.11.27
+hyper-0.12.16
+hyper-tls-0.1.4
+hyper-tls-0.3.1
+hyperx-0.12.0
+idna-0.1.5
+indexmap-1.0.2
+iovec-0.1.2
+itertools-0.7.9
+itoa-0.3.4
+itoa-0.4.3
+jobserver-0.1.11
+jsonwebtoken-5.0.1
+kernel32-sys-0.2.2
+language-tags-0.2.2
+lazy_static-0.2.11
+lazy_static-1.2.0
+lazycell-1.2.0
+libc-0.2.44
+libflate-0.1.18
+libmount-0.1.11
+linked-hash-map-0.2.1
+local-encoding-0.2.0
+lock_api-0.1.5
+log-0.3.9
+log-0.4.6
+lru-disk-cache-0.3.0
+matches-0.1.8
+md5-0.3.8
+memcached-rs-0.3.0
+memchr-1.0.2
+memchr-2.1.1
+memoffset-0.2.1
+mime-0.2.6
+mime-0.3.12
+mime_guess-1.8.6
+mime_guess-2.0.0-alpha.6
+miniz_oxide-0.2.0
+miniz_oxide_c_api-0.2.0
+mio-0.6.16
+mio-named-pipes-0.1.6
+mio-uds-0.6.7
+miow-0.2.1
+miow-0.3.3
+msdos_time-0.1.6
+multipart-0.13.6
+native-tls-0.1.5
+native-tls-0.2.2
+net2-0.2.33
+nix-0.11.0
+nodrop-0.1.13
+normalize-line-endings-0.2.2
+num-integer-0.1.39
+num-traits-0.1.43
+num-traits-0.2.6
+num_cpus-1.8.0
+number_prefix-0.2.8
+openssl-0.10.15
+openssl-0.9.24
+openssl-probe-0.1.2
+openssl-sys-0.9.39
+owning_ref-0.4.0
+parking_lot-0.6.4
+parking_lot_core-0.3.1
+percent-encoding-1.0.1
+phf-0.7.23
+phf_codegen-0.7.23
+phf_generator-0.7.23
+phf_shared-0.7.23
+pkg-config-0.3.14
+podio-0.1.6
+predicates-0.9.1
+predicates-core-0.9.0
+predicates-tree-0.9.0
+proc-macro2-0.4.24
+pulldown-cmark-0.0.3
+quick-error-1.2.2
+quote-0.3.15
+quote-0.6.10
+rand-0.3.22
+rand-0.4.3
+rand-0.5.5
+rand-0.6.1
+rand_chacha-0.1.0
+rand_core-0.2.2
+rand_core-0.3.0
+rand_hc-0.1.0
+rand_isaac-0.1.0
+rand_pcg-0.1.1
+rand_xorshift-0.1.0
+redis-0.9.1
+redox_syscall-0.1.42
+redox_termios-0.1.1
+regex-1.0.6
+regex-syntax-0.6.3
+relay-0.1.1
+remove_dir_all-0.5.1
+reqwest-0.8.8
+reqwest-0.9.5
+retry-0.4.0
+ring-0.13.5
+rouille-2.2.0
+rust-crypto-0.2.36
+rustc-demangle-0.1.9
+rustc-serialize-0.3.24
+rustc_version-0.2.3
+ryu-0.2.7
+safemem-0.2.0
+safemem-0.3.0
+same-file-0.1.3
+schannel-0.1.14
+scoped-tls-0.1.2
+scopeguard-0.3.3
+security-framework-0.1.16
+security-framework-0.2.1
+security-framework-sys-0.1.16
+security-framework-sys-0.2.1
+selenium-rs-0.1.1
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.80
+serde_derive-1.0.80
+serde_json-1.0.33
+serde_urlencoded-0.5.4
+sha1-0.6.0
+signal-hook-0.1.6
+siphasher-0.2.3
+skeptic-0.4.0
+slab-0.4.1
+smallvec-0.6.6
+socket2-0.3.8
+stable_deref_trait-1.1.1
+string-0.1.2
+strip-ansi-escapes-0.1.0
+strsim-0.7.0
+syn-0.11.11
+syn-0.15.21
+synom-0.11.3
+synstructure-0.10.1
+syslog-4.0.1
+tar-0.4.20
+tempdir-0.3.7
+tempfile-3.0.4
+term-0.5.1
+termcolor-1.0.4
+termion-1.5.1
+textwrap-0.10.0
+thread_local-0.3.6
+threadpool-1.7.1
+time-0.1.40
+tiny_http-0.6.2
+tokio-0.1.13
+tokio-codec-0.1.1
+tokio-core-0.1.17
+tokio-current-thread-0.1.4
+tokio-executor-0.1.5
+tokio-fs-0.1.4
+tokio-io-0.1.10
+tokio-named-pipes-0.1.0
+tokio-process-0.2.3
+tokio-reactor-0.1.7
+tokio-serde-0.1.0
+tokio-serde-bincode-0.1.1
+tokio-service-0.1.0
+tokio-signal-0.2.7
+tokio-tcp-0.1.2
+tokio-threadpool-0.1.9
+tokio-timer-0.2.8
+tokio-tls-0.1.4
+tokio-udp-0.1.3
+tokio-uds-0.2.4
+toml-0.4.9
+treeline-0.1.0
+try-lock-0.1.0
+try-lock-0.2.2
+twoway-0.1.8
+ucd-util-0.1.3
+unicase-1.4.2
+unicase-2.2.0
+unicode-bidi-0.3.4
+unicode-normalization-0.1.7
+unicode-width-0.1.5
+unicode-xid-0.0.4
+unicode-xid-0.1.0
+unix_socket-0.5.0
+unreachable-1.0.0
+untrusted-0.6.2
+url-1.7.2
+utf8-ranges-1.0.2
+utf8parse-0.1.1
+uuid-0.6.5
+uuid-0.7.1
+vcpkg-0.2.6
+vec_map-0.8.1
+version_check-0.1.5
+void-1.0.2
+vte-0.3.3
+walkdir-1.0.7
+want-0.0.4
+want-0.0.6
+which-2.0.0
+winapi-0.2.8
+winapi-0.3.6
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.1
+winapi-x86_64-pc-windows-gnu-0.4.0
+wincolor-1.0.1
+ws2_32-sys-0.2.1
+xattr-0.2.2
+zip-0.4.2
+"
+
+inherit cargo eutils
+
+DESCRIPTION="ccache/distcc like tool with support for rust and cloud storage"
+HOMEPAGE="https://github.com/mozilla/sccache/"
+SRC_URI="https://github.com/mozilla/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+ $(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="azure dist-client dist-server gcs memcached redis s3"
+
+DEPEND="
+ dist-server? ( dev-libs/openssl:0= )
+ gcs? ( dev-libs/openssl:0= )
+"
+
+RDEPEND="${DEPEND}
+ dist-server? ( sys-apps/bubblewrap )
+"
+
+QA_FLAGS_IGNORED="usr/bin/sccache*"
+
+src_configure() {
+ myfeatures=(
+ $(usev azure)
+ $(usev dist-client)
+ $(usev dist-server)
+ $(usev gcs)
+ $(usev memcached)
+ $(usev redis)
+ $(usev s3)
+ )
+}
+
+src_compile(){
+ cargo_src_compile ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
+}
+
+src_install() {
+ cargo_src_install --path=. ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
+
+ keepdir /etc/sccache
+
+ einstalldocs
+ dodoc -r docs/.
+
+ if use dist-server; then
+ newinitd "${FILESDIR}"/server.initd-r1 sccache-server
+ newconfd "${FILESDIR}"/server.confd-r1 sccache-server
+
+ newinitd "${FILESDIR}"/scheduler.initd-r1 sccache-scheduler
+ newconfd "${FILESDIR}"/scheduler.confd-r1 sccache-scheduler
+ fi
+}
+
+src_test() {
+ cargo_src_test ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
+}
+
+pkg_postinst() {
+ ewarn "${PN} is experimental, please use with care"
+ use memcached && optfeature "memcached backend support" net-misc/memcached
+ use redis && optfeature "redis backend support" dev-db/redis
+}
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 9bd7b77cc81..258deab5139 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -9,3 +9,11 @@ DIST scons-3.0.5-user.html 1130793 BLAKE2B 24bf6d5d566fe3c06879b797a77df5eda7382
DIST scons-3.0.5-user.pdf 2562305 BLAKE2B 48c206386f163a2779b27ede1b77783067a695e7f59255473343ddd3a19c4d39ceb7c7e5ccf819f76eda9282f5fb8d36bd0250a4a18f5e9d1a65fd3148276173 SHA512 443855ecddd1bc56f06b150da5d7b276a4dfe5ff8c5376b3c35b73f8281a89583308ddd138e120e33f67afa2cdd1b9a1366a533306ba4dfa460f439e4a2f33b4
DIST scons-3.0.5.gh.tar.gz 5510846 BLAKE2B 64489a9335a9aa0e2b58a78c6bba613de41d7035f03e8b5b1c1db8aae92e54808f1bd5ad4e97b8481db0f5276c184040663ec31d7307c30a6b092c860c0bb1c0 SHA512 afd4e3d5a76c009f7a3f55934c2d479c611df5713fdaf60aaa9860fc685f95a314bbe54df92fcbca3570dc9a5b244dcf08bf63ce0cef837c3767a37628abae02
DIST scons-3.0.5.tar.gz 655236 BLAKE2B 1ccd35e393b3307e0be830c2a5491712cba59fe476dfd9c461567288eb76a42e10ca1552ce7603facb66caf5c0b82583c563bd2342b9d7c68c8cabbd0317467b SHA512 0477038b014674049f12899b64584d44a85283d521b2422561e42020a5ae296a5af005684087c3ff410ed3fcbdcc5ff61998bc429eb29513f2a864138ffc4945
+DIST scons-3.1.0-user.html 1133694 BLAKE2B b7a208668db2303e873f5e7f09b9ad92d5197801a63ff392b086e0dbf1baa9c19d8208a6d9718aa7869e320d85cf3fcd5f24c5fe41dfded9f4a8d21d4bbb9b63 SHA512 731308886a660770aeb7b17020e99cbeb736a0bad8e138ff2363ea5297866445325daa4802ee051e0c01720aa73856163fb9da2fe5fb11077b9a2197e0c24323
+DIST scons-3.1.0-user.pdf 2564059 BLAKE2B 989469fd21e8989acf8e7ca2cf2c72dc584a3e708743e357fc2bd55173dbf64d9e2795706bc585975e8d86c754e1e44947feedf5156fb2b66c9f5402a9a015c6 SHA512 a92c4590a06ef2f4872e06db6d20bad333c5983b43d258574847d36976522888d6424781f43142b44abf4f8abc6f501b9894c476a9d1497b260d42efd48d8e8b
+DIST scons-3.1.0.gh.tar.gz 5528270 BLAKE2B d56d02f7d4550af8df42b5c5f8fda02a92ad6aedabb44e69bd46cb4ecf0f0de6b86a8f1ea65e9c4e5e57430f47c9ec7f354d366e60569b4c414bb15d4e52cc84 SHA512 3894d17bca02b9aa5426c70d894b8ecfcf3db2b20254b848209c31d8413a8cd1c2a7b2a87ef9bcfe5555980beb2815f62cdbe185098a64ae8b3506c41c867463
+DIST scons-3.1.0.tar.gz 661528 BLAKE2B deb3b8b4d22ec705674be3e2f84bb35b4726d5f7c082a341d2319d471a3302fc89bfdadc7545f0f4cc0c321c67301b364bdb5723a1d10374eee636b486197092 SHA512 b2d61e364bcff29027a7ba70e2a74186ab136b00f147ff358701aaf68f47134e18e24c2a9cb1ff9ec0fb4fb73ffa21e04043157f2b5cd975aca7fc91c69385ee
+DIST scons-3.1.1-user.html 1134061 BLAKE2B de025ff73ecacec591c63b22bb3f934962a34fa16bec47a58972b97ba28f9a88254b419b4d2edeb2d920e70cf3e0c739df5357956c8586e5377afcd4125ba0a8 SHA512 bd00bcdcd01b192a42110ec65cdb906963af08f5bbc9d5e61624b5b5b1a667b115b099ce2ef71444a8998171a5544f4caecf3acec9715876d4e9e5baa581e60d
+DIST scons-3.1.1-user.pdf 2564248 BLAKE2B 702e57a9646779ff1aa077aa7ae7a815d004cda08166f948ef3b893a786c7ccf13e9d1f8621640573802acd0b6a7acaaf68ebea984d5922112a30c4457740bc4 SHA512 0c0f8e93e3bddd9dc0ec661f629f2995ec9375908b3b7bf2b67c9518571cb31754d13fca46fc1182019976e5c0a417832447692ff61f5ee4613b7f56c7891594
+DIST scons-3.1.1.gh.tar.gz 5528538 BLAKE2B cbb13a0ec9c5ade9b965592f012af5a3ab5253a3c30a049da499631ff58fc1201666209316d9fbcc8f0a715b194327f3cebe5a50fde01635fdb0304b8fbbb2f6 SHA512 3347a7ec5c6c7b596c0d51bb4a9654b971734736febe3834df0f40e7839e1f0578dafeae838d5ddd9f3319ac3d17b6790666fa1602c30480eba25122355179a5
+DIST scons-3.1.1.tar.gz 663878 BLAKE2B 095d5f45885ac12937066be247194e70d33e8f5dc0955e7d693c4b0d3a4b61e776bc1d64cd00ebc89d1e85a7992747b8f448255a76c1b6c2d9df8fa173967711 SHA512 2e80b45571679d8acc0554273538f56163488df5aa9007c7c9c3a6deb2698909ab05da8df91502ea287c0cc0ff0a98f226454f67fcfb7a943570f673f4bd8f54
diff --git a/dev-util/scons/scons-3.0.5.ebuild b/dev-util/scons/scons-3.0.5.ebuild
index a4ed5386817..fcf6539d3a5 100644
--- a/dev-util/scons/scons-3.0.5.ebuild
+++ b/dev-util/scons/scons-3.0.5.ebuild
@@ -18,7 +18,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 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
# unresolved & unpredictable test failures
RESTRICT="test"
diff --git a/dev-util/scons/scons-3.1.0.ebuild b/dev-util/scons/scons-3.1.0.ebuild
new file mode 100644
index 00000000000..4da9718eabc
--- /dev/null
+++ b/dev-util/scons/scons-3.1.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Extensible Python-based build utility"
+HOMEPAGE="http://www.scons.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+ doc? (
+ http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
+ http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
+ )
+ test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ test? (
+ dev-libs/libxml2[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ )
+"
+
+S=${WORKDIR}/${P}/src
+
+PATCHES=(
+ # support env passthrough for Gentoo ebuilds
+ "${FILESDIR}"/scons-3.0.1-env-passthrough.patch
+ # respect CC, CXX, C*FLAGS, LDFLAGS by default
+ "${FILESDIR}"/scons-3.0.3-respect-cc-etc-r1.patch
+)
+
+src_unpack() {
+ # use the git directory structure, but put pregenerated release
+ # inside src/ subdirectory to make our life easier
+ if use test; then
+ unpack "${P}.gh.tar.gz"
+ else
+ mkdir -p "${P}"/src || die
+ fi
+
+ tar -C "${P}"/src --strip-components=1 -xzf "${DISTDIR}/${P}.tar.gz" || die
+}
+
+src_prepare() {
+ # apply patches relatively to top directory
+ cd "${WORKDIR}/${P}" || die
+ distutils-r1_src_prepare
+
+ # remove half-broken, useless custom commands
+ # and fix manpage install location
+ sed -i -e '/cmdclass/,/},$/d' \
+ -e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
+}
+
+python_test() {
+ # set variable from escons() of scons-util.eclass to make env-passthrough patch work within test env
+ local -x GENTOO_SCONS_ENV_PASSTHROUGH=1
+ # unset some env variables to pass appropriate tests
+ unset AR AS ASFLAGS CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
+ cd "${WORKDIR}/${P}" || die
+ "${EPYTHON}" runtest.py -a --passed \
+ -j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
+ --builddir "${BUILD_DIR}/lib"
+
+ # runtest.py script returns "0" if all tests are passed
+ # and returns "2" if there are any tests with "no result"
+ # (i.e. in case if some tools are not installed or it's Windows specific tests)
+ [[ ${?} == [02] ]] || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ local DOCS=( {CHANGES,README,RELEASE}.txt )
+ distutils-r1_python_install_all
+ rm "${ED}/usr/bin/scons.bat" || die
+
+ use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
+}
diff --git a/dev-util/scons/scons-3.1.1.ebuild b/dev-util/scons/scons-3.1.1.ebuild
new file mode 100644
index 00000000000..4da9718eabc
--- /dev/null
+++ b/dev-util/scons/scons-3.1.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Extensible Python-based build utility"
+HOMEPAGE="http://www.scons.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+ doc? (
+ http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
+ http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
+ )
+ test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ test? (
+ dev-libs/libxml2[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ )
+"
+
+S=${WORKDIR}/${P}/src
+
+PATCHES=(
+ # support env passthrough for Gentoo ebuilds
+ "${FILESDIR}"/scons-3.0.1-env-passthrough.patch
+ # respect CC, CXX, C*FLAGS, LDFLAGS by default
+ "${FILESDIR}"/scons-3.0.3-respect-cc-etc-r1.patch
+)
+
+src_unpack() {
+ # use the git directory structure, but put pregenerated release
+ # inside src/ subdirectory to make our life easier
+ if use test; then
+ unpack "${P}.gh.tar.gz"
+ else
+ mkdir -p "${P}"/src || die
+ fi
+
+ tar -C "${P}"/src --strip-components=1 -xzf "${DISTDIR}/${P}.tar.gz" || die
+}
+
+src_prepare() {
+ # apply patches relatively to top directory
+ cd "${WORKDIR}/${P}" || die
+ distutils-r1_src_prepare
+
+ # remove half-broken, useless custom commands
+ # and fix manpage install location
+ sed -i -e '/cmdclass/,/},$/d' \
+ -e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
+}
+
+python_test() {
+ # set variable from escons() of scons-util.eclass to make env-passthrough patch work within test env
+ local -x GENTOO_SCONS_ENV_PASSTHROUGH=1
+ # unset some env variables to pass appropriate tests
+ unset AR AS ASFLAGS CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
+ cd "${WORKDIR}/${P}" || die
+ "${EPYTHON}" runtest.py -a --passed \
+ -j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
+ --builddir "${BUILD_DIR}/lib"
+
+ # runtest.py script returns "0" if all tests are passed
+ # and returns "2" if there are any tests with "no result"
+ # (i.e. in case if some tools are not installed or it's Windows specific tests)
+ [[ ${?} == [02] ]] || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ local DOCS=( {CHANGES,README,RELEASE}.txt )
+ distutils-r1_python_install_all
+ rm "${ED}/usr/bin/scons.bat" || die
+
+ use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
+}
diff --git a/dev-util/shellcheck-bin/Manifest b/dev-util/shellcheck-bin/Manifest
index ee64728e012..db4e1e0aae5 100644
--- a/dev-util/shellcheck-bin/Manifest
+++ b/dev-util/shellcheck-bin/Manifest
@@ -1,2 +1,4 @@
DIST shellcheck-v0.6.0.linux.armv6hf.tar.xz 2488420 BLAKE2B 5b5265845c596d82938d7bc7009d0e5736cf380b9686fc3f900130f859122bb4fb6e2ad9eba7ac2a06d32a0065cf97bed473af085712b9c1da5c57d46df5daa1 SHA512 ac60323430e7febfeaaf5f8b6e3c5500e173871757e46643f1a944eea67f6918bbc49869a63fb7089329a2090307d8364dbeabb390a5e42c094147f530589f81
DIST shellcheck-v0.6.0.linux.x86_64.tar.xz 1484496 BLAKE2B 2f0d40b53a59dea15ae6bd972387071aea4e1d0f44bc1b7f74180d8744befd539a2e7e7aa4d5b78b65c82f8b94dc224b0730a9351a4fb1db1988c024fd85feac SHA512 6335d8888848a6fd351867c4f9732446b33c6b5e46343aebdbf1efa14ae99804d1e5af5b186b6ceba161d23b221b53d2a12e3a695231f8ac8f9ef46e2db9182b
+DIST shellcheck-v0.7.0.linux.armv6hf.tar.xz 2502980 BLAKE2B 5e8281a9a8bd7105bb852f917cb2fb252b7d5abdda26da8fc8a5d9aca2a3543fcaf88707ae3aae277578a4fcf973d66e1d457c1769ca4838e3131a1928b56437 SHA512 3cb41d339b0da7790b8451b9fb8c6e6d52444ab0f3115871049dbe04968ce88868b305d2be267af627991949f346ee1a8eb95dce4cb0e46c81a24b01d4f18f74
+DIST shellcheck-v0.7.0.linux.x86_64.tar.xz 1545588 BLAKE2B 30f4cfacdf9024a4f4c8233842f40a6027069e81cf5529f2441b22856773abcd716ee92d2303ad3cda5eaeecac3161e5980c0eedeb4ffa077d5c15c7f356512e SHA512 84e06bee3c8b8c25f46906350fb32708f4b661636c04e55bd19cdd1071265112d84906055372149678d37f09a1667019488c62a0561b81fe6a6b45ad4fae4ac0
diff --git a/dev-util/shellcheck-bin/shellcheck-bin-0.7.0.ebuild b/dev-util/shellcheck-bin/shellcheck-bin-0.7.0.ebuild
new file mode 100644
index 00000000000..8b6f2c39aa7
--- /dev/null
+++ b/dev-util/shellcheck-bin/shellcheck-bin-0.7.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=${PN/-bin/}
+
+DESCRIPTION="Shell script analysis tool (binary package)"
+HOMEPAGE="https://www.shellcheck.net/"
+SRC_URI="
+ amd64? ( https://storage.googleapis.com/${MY_PN}/${MY_PN}-v${PV}.linux.x86_64.tar.xz )
+ arm? ( https://storage.googleapis.com/${MY_PN}/${MY_PN}-v${PV}.linux.armv6hf.tar.xz )
+"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+
+DEPEND="!dev-util/shellcheck"
+RDEPEND="${DEPEND}"
+
+QA_PREBUILT="/usr/bin/shellcheck"
+S="${WORKDIR}/${MY_PN}-v${PV}"
+
+src_install() {
+ dobin shellcheck
+ einstalldocs
+}
diff --git a/dev-util/shellcheck/Manifest b/dev-util/shellcheck/Manifest
index 9d8cdd12d8a..e4f28790c88 100644
--- a/dev-util/shellcheck/Manifest
+++ b/dev-util/shellcheck/Manifest
@@ -2,3 +2,4 @@ DIST ShellCheck-0.4.6.tar.gz 116618 BLAKE2B 67cf8e882e95eaedfbb46e01656889e200b3
DIST ShellCheck-0.4.7.tar.gz 126593 BLAKE2B cbb925c4760a3744381dbee293d5e28ce429a9c4244eb1fa5af71ad8ba2cbdd86a721bbc2b9202c7aecf4ad70025bacb13e696c4731cbfaba22511d773013d6b SHA512 bb9c79911701b3857d29fd63588115888f4d2b1d224066bb944ca00d29d973195ad1f4b1df8e2746fd0666f7438f46abc384f7f915c152f46fcd332163736792
DIST ShellCheck-0.5.0.tar.gz 133265 BLAKE2B 703e3d994e6302d7bc6124ae064cbc5893c5119918a9a9b6cbda2c0415600b95545146061230b2e6ab07b6b2383a86b9bd3f153643c30c3f765a3424a1cd4bc0 SHA512 3b4b097f507c8910f5da1a739138511b9c30c156667c0887447043a7d0c3c371768953d7039803356f28e863266d3a34b5b1689889f3e524a3768e4d3223ce7c
DIST ShellCheck-0.6.0.tar.gz 140211 BLAKE2B 5a103bd74e76905b64a882542d1f2bf5cac6b2ec94e9b0f55fdd052f5fd1fe17f9efc02ef9182e7e5965765b428b974bf94fa50d701396fef77bcbfe6185402e SHA512 51c2cc9cfd2f8a145095873f9b19d4fdd67a21eedab4ac2dbe5f43789fd0937a44bdc8480b2d0cceb5bc3802a8243dd3b701a07f1f6b5460291272ee453c7c5f
+DIST ShellCheck-0.7.0.tar.gz 163027 BLAKE2B 2d6348f21cb9598c0133cc1548f43727d56155883db83c38483b581b3565c67d5bf9d5333b6c39569dac1f07b19b21db1d62d83e675bb4aa9735725879aaf6e2 SHA512 88a0cb2a2879f597b832979fd934ee63e0f1ca256e5f9e7c51667744d09848817fdbe3988898f49226fc52ec27d92c314a9075995c3110ee10b24468cb60c657
diff --git a/dev-util/shellcheck/shellcheck-0.7.0.ebuild b/dev-util/shellcheck/shellcheck-0.7.0.ebuild
new file mode 100644
index 00000000000..cafe13dbaa6
--- /dev/null
+++ b/dev-util/shellcheck/shellcheck-0.7.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+MY_PN="ShellCheck"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Shell script analysis tool"
+HOMEPAGE="https://www.shellcheck.net/"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+ >=dev-haskell/diff-0.2.0:=[profile?]
+ >=dev-haskell/mtl-2.2.1:=[profile?]
+ >=dev-haskell/parsec-3.0:=[profile?]
+ >=dev-haskell/quickcheck-2.7.4:2=[template_haskell,profile?]
+ dev-haskell/regex-tdfa:=[profile?]
+ >=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.24.0.0 <dev-haskell/cabal-2.5
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ cabal_src_install
+ doman "${PN}.1"
+}
diff --git a/dev-util/shunit2/metadata.xml b/dev-util/shunit2/metadata.xml
index 45da850feec..71b73457931 100644
--- a/dev-util/shunit2/metadata.xml
+++ b/dev-util/shunit2/metadata.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <!--maintainer-needed-->
<longdescription>
shUnit2 is a xUnit unit test framework for Bourne based shell scripts, and
it is designed to work in a similar manner to JUnit, PyUnit, etc. If you
diff --git a/dev-util/smem/metadata.xml b/dev-util/smem/metadata.xml
index 097975e3adc..58f638b2ac3 100644
--- a/dev-util/smem/metadata.xml
+++ b/dev-util/smem/metadata.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <!--maintainer-needed-->
</pkgmetadata>
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index d0fe1f0a491..3c91ba344be 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,4 +1 @@
-DIST spirv-headers-1.3.1_pre20180710.tar.gz 281382 BLAKE2B 9e38c7779af97cae27c595f816d1e1cc99eb29e086dd4b6cb76cb4696f73f1e05f92f022b77639f5a80f517df75996fdbd10d7bb11cc6eccad8144a7b8b776d5 SHA512 5f0c174ea07dccefdd10242f5122e10b11f8975d2fb36f77975497050b10841fcb4a7f19d90c9ef5853a81dabc8d93b91621d07175a1cf3ab8ba7f6c16fe51fe
-DIST spirv-headers-1.3.4_pre20180917.tar.gz 283733 BLAKE2B 6bf0f5c00ae827f8a4b560dcbbe4c42d810cebefe0beecd3e7a022dc1f04bc2ed77f03ec2c0d0e6bf141ab1e4f058362f307c672cf92d83a8d1ceac2a200e659 SHA512 1fab471d07c9e85e75a3de08dccdd4ff7296ffd2cb265cb6cf7038e654c9d2afd8a2ee923eacfd2c47e02c5b139ab49271e489ce1b94f719b063be8910274598
DIST spirv-headers-1.3.4_pre20190302.tar.gz 333676 BLAKE2B 7ac46ed9d369164d187564e12438001ebc77c912385b4ef8a5de4ff26942f27ce88486f980b69111e804c6aad5a7f4724913833f0dfd6246bf070dc5023df7df SHA512 d1e6ce59764ad03228cc12fedb1e16fca8c3ab5827882e1f3dec9c3d735125dddbd06fa4955ac3358bec2de8211164511e2d16205f175484e070b2bd87262c51
-DIST spirv-headers-1.3.tar.gz 279415 BLAKE2B 77e36c02d072daa3aff7eceda53a5d6cd060564f494986a9a99c52d833330605e67c6f8ba2968d656b955f188da2c0bea18b11c834d11ed334f5c33eb14b4e9c SHA512 c612c4fcffefc3a277a9713712150c7e6b696eb676737b4968809784ef32c004820d9abd22389082203fc0853a87f920754b7c9b6b43d85131e750d09e267036
diff --git a/dev-util/spirv-headers/files/spirv-headers-Get-rid-of-custom-target.patch b/dev-util/spirv-headers/files/spirv-headers-Get-rid-of-custom-target.patch
deleted file mode 100644
index b1581f5417b..00000000000
--- a/dev-util/spirv-headers/files/spirv-headers-Get-rid-of-custom-target.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c44560949ec78dd13fe1394bf2957e4fd5adec79 Mon Sep 17 00:00:00 2001
-From: Brian Evans <grknight@gentoo.org>
-Date: Wed, 14 Mar 2018 20:00:22 -0400
-Subject: [PATCH] Get rid of custom target
-
----
- CMakeLists.txt | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a5bff17..bbc3ddc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -45,7 +45,5 @@ project(SPIRV-Headers)
- # 3. cmake --build . install-headers
-
- file(GLOB_RECURSE FILES include/spirv/*)
--add_custom_target(install-headers
-- COMMAND cmake -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/include/spirv ${CMAKE_INSTALL_PREFIX}/include/spirv)
--
-+INSTALL(DIRECTORY include/spirv/ DESTINATION include/spirv)
- add_subdirectory(example)
---
-2.16.2
-
diff --git a/dev-util/spirv-headers/spirv-headers-1.3.1_pre20180710.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.1_pre20180710.ebuild
deleted file mode 100644
index c3de1e2ba58..00000000000
--- a/dev-util/spirv-headers/spirv-headers-1.3.1_pre20180710.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Machine-readable files for the SPIR-V Registry"
-HOMEPAGE="https://www.khronos.org/registry/spir-v/"
-EGIT_COMMIT="ff684ffc6a35d2a58f0f63108877d0064ea33feb"
-SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-headers/spirv-headers-1.3.4_pre20180917.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.4_pre20180917.ebuild
deleted file mode 100644
index 72a6122d8ce..00000000000
--- a/dev-util/spirv-headers/spirv-headers-1.3.4_pre20180917.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Machine-readable files for the SPIR-V Registry"
-HOMEPAGE="https://www.khronos.org/registry/spir-v/"
-EGIT_COMMIT="dcf23bdabacc3c54b83b1f9367e7a8adb27f8d87"
-SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-headers/spirv-headers-1.3.4_pre20190302.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.4_pre20190302.ebuild
index a0e0084c3ca..7e11adbefdf 100644
--- a/dev-util/spirv-headers/spirv-headers-1.3.4_pre20190302.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-1.3.4_pre20190302.ebuild
@@ -12,6 +12,6 @@ SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.ta
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-headers/spirv-headers-1.3.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.ebuild
deleted file mode 100644
index 4edaed9c09a..00000000000
--- a/dev-util/spirv-headers/spirv-headers-1.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Machine-readable files for the SPIR-V Registry"
-HOMEPAGE="https://www.khronos.org/registry/spir-v/"
-EGIT_COMMIT="02ffc719aa9f9c1dce5ce05743fb1afe6cbf17ea"
-SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-PATCHES=( "${FILESDIR}"/${PN}-Get-rid-of-custom-target.patch )
-
-S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-tools/spirv-tools-2019.1-r2.ebuild b/dev-util/spirv-tools/spirv-tools-2019.1-r2.ebuild
index 9ccfc9167d6..d7c14d9817c 100644
--- a/dev-util/spirv-tools/spirv-tools-2019.1-r2.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2019.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/KhronosGroup/SPIRV-Tools/archive/v${PV}.tar.gz -> ${
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
# 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"
diff --git a/dev-util/stubgen/metadata.xml b/dev-util/stubgen/metadata.xml
index 097975e3adc..58f638b2ac3 100644
--- a/dev-util/stubgen/metadata.xml
+++ b/dev-util/stubgen/metadata.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <!--maintainer-needed-->
</pkgmetadata>
diff --git a/dev-util/suse-build/metadata.xml b/dev-util/suse-build/metadata.xml
index 91f6a21b19a..6ba15a8f933 100644
--- a/dev-util/suse-build/metadata.xml
+++ b/dev-util/suse-build/metadata.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <!--maintainer-needed-->
<use>
<flag name="symlink">Provide compatibility symlinks with original openSUSE package (might clash with other packages)</flag>
</use>
diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest
index 8cff04f0f08..641e78cc9f0 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -1 +1,2 @@
DIST sysdig-0.26.1.tar.gz 892441 BLAKE2B 38302458c54a10719fadaf5e5bb6d29931a262550eaf44350543e99cd33e6a90889d81f49096d2f57fcc903bc9245a1f782b438a48613f9fc9f90273c46f0f39 SHA512 817573dd2945e20094c548a481205d7ae700e8242a12c75bcab41c52330fb6f508214d71f3d3ba4ecc86576e555c8c2a0c155921d61d29a5861bbf982600f6fb
+DIST sysdig-0.26.2.tar.gz 907496 BLAKE2B ce489d7c1a54aa2930599aa7141b1a3d4815c0395b4a444dea565334a1b39a36d339eb2bc9d0c2b3924e8c54f9c3adec6b31278017cfee955fe9ed9d3c29977f SHA512 1a2476060f43559ec89663377361d1fcaace7fe3aa3b472629dca78557e6d5868d8f5cfce3411c46804b501d6a56dcb074f6becf3d8e756b7f7fd943087cd3ae
diff --git a/dev-util/sysdig/sysdig-0.26.2.ebuild b/dev-util/sysdig/sysdig-0.26.2.ebuild
new file mode 100644
index 00000000000..2d4c0de2f51
--- /dev/null
+++ b/dev-util/sysdig/sysdig-0.26.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MODULES_OPTIONAL_USE=modules
+inherit linux-mod bash-completion-r1 cmake-utils
+
+DESCRIPTION="A system exploration and troubleshooting tool"
+HOMEPAGE="https://www.sysdig.org/"
+SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0
+ modules? ( || ( MIT GPL-2 ) )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl +modules"
+
+RDEPEND="
+ app-misc/jq:0=
+ dev-cpp/tbb:0=
+ dev-lang/luajit:2=
+ >=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}
+ app-arch/xz-utils
+ virtual/os-headers"
+
+# needed for the kernel module
+CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
+
+pkg_pretend() {
+ linux-mod_pkg_setup
+}
+
+pkg_setup() {
+ linux-mod_pkg_setup
+}
+
+src_prepare() {
+ sed -i -e 's:-ggdb::' CMakeLists.txt || die
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ # we will use linux-mod for that
+ -DBUILD_DRIVER=OFF
+ # libscap examples are not installed or really useful
+ -DBUILD_LIBSCAP_EXAMPLES=OFF
+
+ # unbundle the deps
+ -DUSE_BUNDLED_DEPS=OFF
+ )
+
+ cmake-utils_src_configure
+
+ # setup linux-mod ugliness
+ MODULE_NAMES="sysdig-probe(extra:${BUILD_DIR}/driver/src:)"
+ BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
+ BUILD_TARGETS="all"
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ linux-mod_src_compile
+}
+
+src_install() {
+ cmake-utils_src_install
+ linux-mod_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/sysprof/Manifest b/dev-util/sysprof/Manifest
index 570316497d7..bfb234f676b 100644
--- a/dev-util/sysprof/Manifest
+++ b/dev-util/sysprof/Manifest
@@ -1 +1,2 @@
DIST sysprof-3.30.2.tar.xz 393420 BLAKE2B 5e86a78c231d2d2c601198e066c463d8bec95ab1ae6d0f6678e6e80305b8a6d53c604ce54d9fc2a473e4679695cef709f0e1a9514f1091719f33a58b92c896eb SHA512 70c49f7c20742aad82c8d9b1e303d06ca5fd2d27a6868872d28affea22278d381bf3eb0d181cbd1bfa490bda2878c52748ac29273e9e608452e9bf4f29fd9e2a
+DIST sysprof-3.32.0.tar.xz 296052 BLAKE2B f409c64d40bd3451037e601683f270ff93ea2a60a2c104d22edc6bad5ff3f5c974f80137776b6329dae932852fa0871f2b7b9960a282147ddef5402ad840d9ef SHA512 7b9d84ac241d376a5e545082b1224e7db96af26ae0ee297d5f0b2d45abc4676e23009dbd560085e5d4879378a8dd79eefb4449df3961fbfd09238bd2056061d0
diff --git a/dev-util/sysprof/sysprof-3.32.0.ebuild b/dev-util/sysprof/sysprof-3.32.0.ebuild
new file mode 100644
index 00000000000..16e41d08213
--- /dev/null
+++ b/dev-util/sysprof/sysprof-3.32.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson systemd xdg
+
+DESCRIPTION="System-wide Linux Profiler"
+HOMEPAGE="http://sysprof.com/"
+
+LICENSE="GPL-3+ GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="elogind gtk systemd"
+REQUIRED_USE="?? ( elogind systemd )"
+
+RDEPEND="
+ >=dev-libs/glib-2.44:2
+ sys-auth/polkit
+ gtk? ( >=x11-libs/gtk+-3.22.0:3 )
+ elogind? ( >=sys-auth/elogind-239.3 )
+ systemd? ( >=sys-apps/systemd-222:0= )
+"
+DEPEND="${RDEPEND}"
+# libxml2 required for glib-compile-resources; appstream-glib for appdata.xml developer_name tag translation
+BDEPEND="
+ dev-libs/appstream-glib
+ dev-libs/libxml2:2
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ >=sys-kernel/linux-headers-2.6.32
+ virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/3.30.2-elogind.patch )
+
+src_configure() {
+ # -Dwith_sysprofd=host currently unavailable from ebuild
+ local emesonargs=(
+ $(meson_use gtk enable_gtk)
+ -Dwith_sysprofd=$(usex systemd bundled $(usex elogind bundled none))
+ -Dsystemdunitdir=$(systemd_get_systemunitdir)
+ # -Ddebugdir
+ )
+ meson_src_configure
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+
+ elog "On many systems, especially amd64, it is typical that with a modern"
+ elog "toolchain -fomit-frame-pointer for gcc is the default, because"
+ elog "debugging is still possible thanks to gcc4/gdb location list feature."
+ elog "However sysprof is not able to construct call trees if frame pointers"
+ elog "are not present. Therefore -fno-omit-frame-pointer CFLAGS is suggested"
+ elog "for the libraries and applications involved in the profiling. That"
+ elog "means a CPU register is used for the frame pointer instead of other"
+ elog "purposes, which means a very minimal performance loss when there is"
+ elog "register pressure."
+ if ! use systemd && ! use elogind; then
+ elog ""
+ elog "Without systemd or elogind, sysprof may not function when launched as a"
+ elog "regular user, thus suboptimal running from root account may be necessary."
+ if use gtk; then
+ elog "Under wayland, that limits the recording usage to sysprof-cli utility."
+ fi
+ fi
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/dev-util/trace-cmd/Manifest b/dev-util/trace-cmd/Manifest
index 8aabb8d3f87..4c4cec3dacc 100644
--- a/dev-util/trace-cmd/Manifest
+++ b/dev-util/trace-cmd/Manifest
@@ -1,2 +1 @@
-DIST trace-cmd-v2.7.tar.gz 1865571 BLAKE2B e0df57c78c6505c856381f17cfdecdaa7a4441eee4cfc57af4fff79a0157ca7aa7c76a81428ddf8d9d00d6bb0a5391b99d4bb5f92fadc7e4062a0181facb2cc9 SHA512 e507eb6609f1fd3dddec541e9f69c466f4f3f66c28f0a7f4292615e3984cebaaf42725f3d82b8c625e5c60977d1f9b5e96cce7664b951eb5f99b955cc440efe4
-DIST trace-cmd-v2.8.tar.gz 1996407 BLAKE2B 6a9a0b221418d448f5af5508bf8acf0baca08e0cdd8c1a835a06d26f5f729608d6988f7ed83ccdc9e117ade19893fa32c2400a61c2d396804cd042bc25cd498a SHA512 0675c057e78878a0f56ee69edfe7ab4b771fd5346920fcd3ad4af777180fae311cc369dc3faa6cd49d30664401497d20e45a0cf1914805139116e3be8587e0a7
+DIST trace-cmd-v2.8.3.tar.gz 1996617 BLAKE2B 0ab77649af90a0a9368ff118dc94e6fd003b18ceb2065ae3a4559a1d2cfa93be44d87bfb97e2e2f06898508699ff5ce18face4edefd7e40b3b9cca405a626cff SHA512 51166c4276abda209a099cc6fe9081ad6d403cbfd9d4a53bc5bb068392327e88fe647e9324a527e68730d73d1a5f7f74126718547f94c652bb12e51c7518a58b
diff --git a/dev-util/trace-cmd/files/trace-cmd-2.7-makefile.patch b/dev-util/trace-cmd/files/trace-cmd-2.7-makefile.patch
deleted file mode 100644
index a9d7584dc62..00000000000
--- a/dev-util/trace-cmd/files/trace-cmd-2.7-makefile.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/Makefile b/Makefile
-index a5d2c38..a99e5a4 100644
---- a/Makefile
-+++ b/Makefile
-@@ -63,7 +63,7 @@ python_dir = $(HOME)/.trace-cmd/python
- var_dir = $(HOME)/.trace-cmd/
- else
- plugin_dir = $(libdir)/trace-cmd/plugins
--python_dir = $(libdir)/trace-cmd/python
-+python_dir ?= $(libdir)/trace-cmd/python
- PLUGIN_DIR = -DPLUGIN_DIR="$(plugin_dir)"
- PYTHON_DIR = -DPYTHON_DIR="$(python_dir)"
- PLUGIN_DIR_SQ = '$(subst ','\'',$(PLUGIN_DIR))'
-@@ -119,8 +119,13 @@ endif # NO_PYTHON
- test-build = $(if $(shell sh -c 'echo "$(1)" | \
- $(CC) -o /dev/null -c -x c - > /dev/null 2>&1 && echo y'), $2)
-
-+ifndef NO_UDIS86
- # have udis86 disassembler library?
--udis86-flags := $(call test-build,\#include <udis86.h>,-DHAVE_UDIS86 -ludis86)
-+udis86-flags := -DHAVE_UDIS86
-+udis86-ldflags := -ludis86
-+else
-+udis86-flags := -UHAVE_UDIS86
-+endif # NO_UDIS86
-
- define BLK_TC_FLUSH_SOURCE
- #include <linux/blktrace_api.h>
-@@ -276,6 +281,7 @@ endif
- # Append required CFLAGS
- override CFLAGS += $(CONFIG_FLAGS) $(INCLUDES) $(PLUGIN_DIR_SQ) $(VAR_DIR)
- override CFLAGS += $(udis86-flags) $(blk-flags)
-+override LDFLAGS += $(udis86-ldflags)
-
- ifeq ($(VERBOSE),1)
- Q =
diff --git a/dev-util/trace-cmd/files/trace-cmd-2.7-soname.patch b/dev-util/trace-cmd/files/trace-cmd-2.7-soname.patch
deleted file mode 100644
index 937f0617a4a..00000000000
--- a/dev-util/trace-cmd/files/trace-cmd-2.7-soname.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile b/Makefile
-index a5d2c38..588809e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -308,7 +308,7 @@ do_app_build = \
-
- do_compile_shared_library = \
- ($(print_shared_lib_compile) \
-- $(CC) --shared $^ -o $@)
-+ $(CC) --shared $^ -Wl,-soname,$@ -o $@)
-
- do_compile_plugin_obj = \
- ($(print_plugin_obj_compile) \
diff --git a/dev-util/trace-cmd/files/trace-cmd-2.8-python3-warnings.patch b/dev-util/trace-cmd/files/trace-cmd-2.8-python3-warnings.patch
deleted file mode 100644
index d66ee35accf..00000000000
--- a/dev-util/trace-cmd/files/trace-cmd-2.8-python3-warnings.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-diff --git a/plugins/plugin_python.c b/plugins/plugin_python.c
-index e725ad8..196b825 100644
---- a/plugins/plugin_python.c
-+++ b/plugins/plugin_python.c
-@@ -81,7 +81,7 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent)
- } else
- Py_DECREF(res);
-
-- str = PyString_FromString("pevent");
-+ str = PyUnicode_FromString("pevent");
- if (!str)
- return -ENOMEM;
-
-diff --git a/python/ctracecmd.i b/python/ctracecmd.i
-index 65a3d51..031e462 100644
---- a/python/ctracecmd.i
-+++ b/python/ctracecmd.i
-@@ -16,6 +16,7 @@
- %{
- #include "trace-cmd.h"
- #include "event-utils.h"
-+#include <Python.h>
- %}
-
-
-@@ -108,7 +109,7 @@ static PyObject *py_field_get_stack(struct tep_handle *pevent,
- ((int)addr == -1))
- break;
- func = tep_find_function(event->tep, addr);
-- if (PyList_Append(list, PyString_FromString(func))) {
-+ if (PyList_Append(list, PyUnicode_FromString(func))) {
- Py_DECREF(list);
- return NULL;
- }
-@@ -137,10 +138,10 @@ static PyObject *py_field_get_data(struct tep_format_field *f, struct tep_record
- offset = val & 0xffff;
- len = val >> 16;
-
-- return PyBuffer_FromMemory((char *)r->data + offset, len);
-+ return PyMemoryView_FromMemory((char *)r->data + offset, len, PyBUF_READ);
- }
-
-- return PyBuffer_FromMemory((char *)r->data + f->offset, f->size);
-+ return PyMemoryView_FromMemory((char *)r->data + f->offset, f->size, PyBUF_READ);
- }
-
- static PyObject *py_field_get_str(struct tep_format_field *f, struct tep_record *r)
-@@ -162,10 +163,10 @@ static PyObject *py_field_get_str(struct tep_format_field *f, struct tep_record
- */
- offset = val & 0xffff;
-
-- return PyString_FromString((char *)r->data + offset);
-+ return PyUnicode_FromString((char *)r->data + offset);
- }
-
-- return PyString_FromStringAndSize((char *)r->data + f->offset,
-+ return PyUnicode_FromStringAndSize((char *)r->data + f->offset,
- strnlen((char *)r->data + f->offset, f->size));
- }
-
-@@ -177,7 +178,7 @@ static PyObject *py_format_get_keys(struct tep_event *ef)
- list = PyList_New(0);
-
- for (f = ef->format.fields; f; f = f->next) {
-- if (PyList_Append(list, PyString_FromString(f->name))) {
-+ if (PyList_Append(list, PyUnicode_FromString(f->name))) {
- Py_DECREF(list);
- return NULL;
- }
-@@ -210,14 +211,14 @@ static int python_callback(struct trace_seq *s,
- result = PyEval_CallObject(context, arglist);
- Py_XDECREF(arglist);
- if (result && result != Py_None) {
-- if (!PyInt_Check(result)) {
-+ if (!PyLong_Check(result)) {
- PyErr_SetString(PyExc_TypeError,
- "callback must return int");
- PyErr_Print();
- Py_XDECREF(result);
- return 0;
- }
-- r = PyInt_AS_LONG(result);
-+ r = PyLong_AsLong(result);
- } else if (result == Py_None)
- r = 0;
- else
-diff --git a/python/ctracecmdgui.i b/python/ctracecmdgui.i
-index 1dcdab0..8ca38f7 100644
---- a/python/ctracecmdgui.i
-+++ b/python/ctracecmdgui.i
-@@ -7,6 +7,7 @@
- #include <pygobject.h>
- #include <pyglib.h>
- #include <Python.h>
-+#include <memoryobject.h>
-
- extern GtkTreeModel *trace_view_store_as_gtk_tree_model(struct trace_view_store *store);
-
-@@ -37,10 +38,10 @@ pytype_from_gtype(GType gtype)
-
- /* help swig cope with g* types */
- %typemap(in) gint {
-- $1 = PyInt_AsLong($input);
-+ $1 = PyLong_AsLong($input);
- }
- %typemap(out) gint {
-- $result = PyInt_FromLong($1);
-+ $result = PyLong_FromLong($1);
- }
- %typemap(in) guint {
- $1 = PyLong_AsUnsignedLong($input);
diff --git a/dev-util/trace-cmd/files/trace-cmd-2.8.3-python3-warnings.patch b/dev-util/trace-cmd/files/trace-cmd-2.8.3-python3-warnings.patch
new file mode 100644
index 00000000000..72dd3de64f9
--- /dev/null
+++ b/dev-util/trace-cmd/files/trace-cmd-2.8.3-python3-warnings.patch
@@ -0,0 +1,50 @@
+diff --git a/plugins/plugin_python.c b/plugins/plugin_python.c
+index e725ad8..196b825 100644
+--- a/plugins/plugin_python.c
++++ b/plugins/plugin_python.c
+@@ -81,7 +81,7 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent)
+ } else
+ Py_DECREF(res);
+
+- str = PyString_FromString("pevent");
++ str = PyUnicode_FromString("pevent");
+ if (!str)
+ return -ENOMEM;
+
+diff --git a/python/ctracecmd.i b/python/ctracecmd.i
+index 2601d39..01cd0d5 100644
+--- a/python/ctracecmd.i
++++ b/python/ctracecmd.i
+@@ -16,6 +16,7 @@
+ %{
+ #include "trace-cmd.h"
+ #include "event-utils.h"
++#include <Python.h>
+ %}
+
+
+diff --git a/python/ctracecmdgui.i b/python/ctracecmdgui.i
+index 1dcdab0..8ca38f7 100644
+--- a/python/ctracecmdgui.i
++++ b/python/ctracecmdgui.i
+@@ -7,6 +7,7 @@
+ #include <pygobject.h>
+ #include <pyglib.h>
+ #include <Python.h>
++#include <memoryobject.h>
+
+ extern GtkTreeModel *trace_view_store_as_gtk_tree_model(struct trace_view_store *store);
+
+@@ -37,10 +38,10 @@ pytype_from_gtype(GType gtype)
+
+ /* help swig cope with g* types */
+ %typemap(in) gint {
+- $1 = PyInt_AsLong($input);
++ $1 = PyLong_AsLong($input);
+ }
+ %typemap(out) gint {
+- $result = PyInt_FromLong($1);
++ $result = PyLong_FromLong($1);
+ }
+ %typemap(in) guint {
+ $1 = PyLong_AsUnsignedLong($input);
diff --git a/dev-util/trace-cmd/files/trace-cmd-2.8-soname.patch b/dev-util/trace-cmd/files/trace-cmd-2.8.3-soname.patch
index 523f2d44467..10aaf076161 100644
--- a/dev-util/trace-cmd/files/trace-cmd-2.8-soname.patch
+++ b/dev-util/trace-cmd/files/trace-cmd-2.8.3-soname.patch
@@ -1,13 +1,13 @@
diff --git a/scripts/utils.mk b/scripts/utils.mk
-index 260023a..9eb127d 100644
+index 9eb127d..98d7b3c 100644
--- a/scripts/utils.mk
+++ b/scripts/utils.mk
@@ -54,7 +54,7 @@ do_build_static_lib = \
do_compile_shared_library = \
($(print_shared_lib_compile) \
-- $(CC) --shared $^ -o $@)
-+ $(CC) --shared $^ -Wl,-soname,$@ -o $@)
+- $(CC) --shared $^ -Wl,-soname,$@ -o $@)
++ $(CC) --shared $^ -Wl,-soname,$(@F) -o $@)
do_compile_plugin_obj = \
($(print_plugin_obj_compile) \
diff --git a/dev-util/trace-cmd/trace-cmd-2.7-r2.ebuild b/dev-util/trace-cmd/trace-cmd-2.7-r2.ebuild
deleted file mode 100644
index 27b25b7f121..00000000000
--- a/dev-util/trace-cmd/trace-cmd-2.7-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python2_7)
-
-inherit linux-info python-single-r1 toolchain-funcs
-
-DESCRIPTION="User-space front-end for Ftrace"
-HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git"
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/${PN}.git"
- inherit git-r3
-else
- SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/${PN}.git/snapshot/${PN}-v${PV}.tar.gz"
- KEYWORDS="~amd64 ~x86"
- S="${WORKDIR}/${PN}-v${PV}"
-fi
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-IUSE="+audit doc python udis86"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="audit? ( sys-process/audit )
- python? ( ${PYTHON_DEPS} )
- udis86? ( dev-libs/udis86 )"
-DEPEND="${RDEPEND}
- sys-kernel/linux-headers
- python? (
- virtual/pkgconfig
- dev-lang/swig
- )
-
- doc? ( app-text/asciidoc )"
-
-CONFIG_CHECK="
- ~TRACING
- ~FTRACE
- ~BLK_DEV_IO_TRACE"
-
-PATCHES=(
- "${FILESDIR}"/trace-cmd-2.7-makefile.patch
- "${FILESDIR}"/trace-cmd-2.7-soname.patch
-)
-
-pkg_setup() {
- linux-info_pkg_setup
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- EMAKE_FLAGS=(
- "prefix=/usr"
- "libdir=/usr/$(get_libdir)"
- "CC=$(tc-getCC)"
- "AR=$(tc-getAR)"
- $(usex audit '' '' '' 'NO_AUDIT=1')
- $(usex udis86 '' '' '' 'NO_UDIS86=1')
- )
-
- if use python; then
- EMAKE_FLAGS+=(
- "PYTHON_VERS=${EPYTHON//python/python-}"
- "python_dir=$(python_get_sitedir)/${PN}"
- )
- else
- EMAKE_FLAGS+=("NO_PYTHON=1")
- fi
-}
-
-src_compile() {
- emake "${EMAKE_FLAGS[@]}" all_cmd libs
- use doc && emake doc
-
-}
-
-src_install() {
- emake "${EMAKE_FLAGS[@]}" DESTDIR="${D}" V=1 install install_libs
- use doc && emake DESTDIR="${D}" install_doc
-
-}
diff --git a/dev-util/trace-cmd/trace-cmd-2.8.ebuild b/dev-util/trace-cmd/trace-cmd-2.8.3.ebuild
index 33ae834f1ac..81b74d42905 100644
--- a/dev-util/trace-cmd/trace-cmd-2.8.ebuild
+++ b/dev-util/trace-cmd/trace-cmd-2.8.3.ebuild
@@ -20,7 +20,7 @@ else
fi
LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
+SLOT="0/${PV}"
IUSE="+audit doc python udis86"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -42,9 +42,8 @@ CONFIG_CHECK="
~BLK_DEV_IO_TRACE"
PATCHES=(
- "${FILESDIR}/trace-cmd-2.7-makefile.patch"
"${FILESDIR}/trace-cmd-2.8-python-pkgconfig-name.patch"
- "${FILESDIR}/trace-cmd-2.8-soname.patch"
+ "${FILESDIR}/trace-cmd-2.8.3-soname.patch"
)
pkg_setup() {
@@ -53,8 +52,9 @@ pkg_setup() {
src_configure() {
EMAKE_FLAGS=(
- "prefix=/usr"
- "libdir=/usr/$(get_libdir)"
+ BUILD_OUTPUT="${WORKDIR}/${P}_build"
+ "prefix=${EPREFIX}/usr"
+ "libdir=${EPREFIX}/usr/$(get_libdir)"
"CC=$(tc-getCC)"
"AR=$(tc-getAR)"
$(usex audit '' '' '' 'NO_AUDIT=1')
@@ -65,7 +65,7 @@ src_configure() {
src_compile() {
emake "${EMAKE_FLAGS[@]}" NO_PYTHON=1 \
- trace-cmd libs
+ trace-cmd
if use python; then
python_copy_sources
@@ -77,7 +77,7 @@ src_compile() {
python_compile() {
pushd "${BUILD_DIR}" > /dev/null || die
- python_is_python3 && eapply "${FILESDIR}/trace-cmd-2.8-python3-warnings.patch"
+ python_is_python3 && eapply "${FILESDIR}/trace-cmd-2.8.3-python3-warnings.patch"
emake "${EMAKE_FLAGS[@]}" \
PYTHON_VERS="${EPYTHON}" \
diff --git a/dev-util/trace-cmd/trace-cmd-9999.ebuild b/dev-util/trace-cmd/trace-cmd-9999.ebuild
index 33ae834f1ac..cd3944c250c 100644
--- a/dev-util/trace-cmd/trace-cmd-9999.ebuild
+++ b/dev-util/trace-cmd/trace-cmd-9999.ebuild
@@ -8,10 +8,10 @@ DISTUTILS_OPTIONAL=1
inherit linux-info python-r1 toolchain-funcs
DESCRIPTION="User-space front-end for Ftrace"
-HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git"
+HOMEPAGE="http://trace-cmd.org/"
if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/${PN}.git"
+ EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git"
inherit git-r3
else
SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/${PN}-v${PV}.tar.gz"
@@ -20,7 +20,7 @@ else
fi
LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
+SLOT="0/${PV}"
IUSE="+audit doc python udis86"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -33,7 +33,6 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
dev-lang/swig
)
-
doc? ( app-text/asciidoc )"
CONFIG_CHECK="
@@ -41,20 +40,15 @@ CONFIG_CHECK="
~FTRACE
~BLK_DEV_IO_TRACE"
-PATCHES=(
- "${FILESDIR}/trace-cmd-2.7-makefile.patch"
- "${FILESDIR}/trace-cmd-2.8-python-pkgconfig-name.patch"
- "${FILESDIR}/trace-cmd-2.8-soname.patch"
-)
-
pkg_setup() {
linux-info_pkg_setup
}
src_configure() {
EMAKE_FLAGS=(
- "prefix=/usr"
- "libdir=/usr/$(get_libdir)"
+ BUILD_OUTPUT="${WORKDIR}/${P}_build"
+ "prefix=${EPREFIX}/usr"
+ "libdir=${EPREFIX}/usr/$(get_libdir)"
"CC=$(tc-getCC)"
"AR=$(tc-getAR)"
$(usex audit '' '' '' 'NO_AUDIT=1')
@@ -65,7 +59,7 @@ src_configure() {
src_compile() {
emake "${EMAKE_FLAGS[@]}" NO_PYTHON=1 \
- trace-cmd libs
+ trace-cmd
if use python; then
python_copy_sources
@@ -77,7 +71,6 @@ src_compile() {
python_compile() {
pushd "${BUILD_DIR}" > /dev/null || die
- python_is_python3 && eapply "${FILESDIR}/trace-cmd-2.8-python3-warnings.patch"
emake "${EMAKE_FLAGS[@]}" \
PYTHON_VERS="${EPYTHON}" \
diff --git a/dev-util/uftrace/Manifest b/dev-util/uftrace/Manifest
index f8d995fdc3f..9db5f04e0e1 100644
--- a/dev-util/uftrace/Manifest
+++ b/dev-util/uftrace/Manifest
@@ -1 +1 @@
-DIST uftrace-0.9.1.tar.gz 967083 BLAKE2B 2e381f5cda92fadd963fc7e0ccebaec6b6796acd75d8436b66f9b6ee4257141f704471832e224712bb65e7570fe4997f953458455b2b0f257ead7f4093140313 SHA512 a906664f883e08f19063229e7dd43aebc9115b08829d866fb887dd281a0375a5684332920c3f7307a4d62baa14e982cb7535bdfe454ab3ad5d8ec7fb5792402e
+DIST uftrace-0.9.3.tar.gz 1003880 BLAKE2B ae5e1c44412055ea59e85378877cf3c18f33e0c6ae3a904253b03587dae2c7cce4350f1480f499e645375b1b2502a51a8b8d44e9b7ff1ee588be7180c12b63f3 SHA512 671486a05da8c44400169f21426505266db89e94ef9483370dff8f465b673f70fba994174458f3033991ea0640225e13c639418380a6a580d24c302d42327382
diff --git a/dev-util/uftrace/metadata.xml b/dev-util/uftrace/metadata.xml
index 9be2c3f269d..0162146a7ba 100644
--- a/dev-util/uftrace/metadata.xml
+++ b/dev-util/uftrace/metadata.xml
@@ -5,4 +5,7 @@
<upstream>
<remote-id type="github">namhyung/uftrace</remote-id>
</upstream>
+ <use>
+ <flag name="capstone">Use capstone to provide dynamic tracing without recompilation</flag>
+ </use>
</pkgmetadata>
diff --git a/dev-util/uftrace/uftrace-0.9.1.ebuild b/dev-util/uftrace/uftrace-0.9.3.ebuild
index 60c4d379344..d48d238c801 100644
--- a/dev-util/uftrace/uftrace-0.9.1.ebuild
+++ b/dev-util/uftrace/uftrace-0.9.3.ebuild
@@ -1,8 +1,12 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
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"
@@ -10,15 +14,17 @@ SRC_URI="https://github.com/namhyung/uftrace/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64"
-IUSE=""
+IUSE="capstone"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
RESTRICT="test"
RDEPEND="
- dev-lang/python:2.7
+ ${PYTHON_DEPS}
sys-devel/gcc:*[cxx]
sys-libs/ncurses:=
virtual/libelf:=
+ capstone? ( dev-libs/capstone:0= )
"
DEPEND="${RDEPEND}"
@@ -26,3 +32,7 @@ src_prepare() {
default
sed -i -e "s/ARCH/MYARCH/g" -e "/ldconfig/d" Makefile || die
}
+
+src_configure() {
+ econf $(use_with capstone)
+}
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index 1328be555cf..9e177450793 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,5 +1,2 @@
-DIST vulkan-headers-1.1.101.tar.gz 556510 BLAKE2B 12cde0e5fe17e4119ceb87d5e58c0147f128af0a435d8be1c0a9fe862c68c59df6ec1ff77b62b07bba4792c3f70c30f172678e60707dc46a53c4037fbdf40dc3 SHA512 36fc1059a50c8f1f66f2f79c1e8058d26a30a2083b1cb431536b476f8e4a6edbcac56a99a35accd20a6e19471f86940d9dd3dfc9f0940be212b36400bd0ed394
DIST vulkan-headers-1.1.106.tar.gz 576943 BLAKE2B 6985b5635e0e9201dd931035470638f85a0accfa679c71aa98bb6174853eb324cd926941bc8f259a879e4a269c27686ca30e9b83946cab6e42036631a2753c40 SHA512 4b0bd6cdc3b29cff0960c592c9a40fddfe64c828e77f3ff52dcb8d5848e71ad6454b13f95b64e39227bd442b1ba2692abf7a824cdc9476b339fc31e4c8b728f0
DIST vulkan-headers-1.1.114.tar.gz 596033 BLAKE2B 707b820ab37e7de92540196c181dea7a0ef1461e15f2b39f4a8355f265ec8d422e69987f3e49f210b8e9f8ebe20f99a682805b2c9b94755f94d2a1b2213b67d5 SHA512 6da91d7207575437f4322ddcacda25f85910266012625a2485124d8dc7d91d88386cc8d93ae5ded4f9e7d862b7139573118df550022ec912a5b2685048cbc6ce
-DIST vulkan-headers-1.1.82.0.tar.gz 472739 BLAKE2B 323635c02909e1713973787812ea94cf14e9d6bbb16359594e2ac3910bab1a8de383674157575ef82f7fe100d78fdfdf1b6e82d75bed5d63abc7d38af555a6ab SHA512 9236db6d3e5c24687ae4ee01237190e4594657e6c6f00b3e859dbf34f6bfccea37a4d56fa7112d3d982c4fdabc1967e96c0fbbd07cc835591e4f48f00518ddb7
-DIST vulkan-headers-1.1.92.0.tar.gz 541278 BLAKE2B f1743a376d18185bed136acd11cab0f8cdea2146ae4f9d389332b1afd83a29a32f2dc2a66f441cdb07f99a24c68d8743710762716cc3d0baf8f10933a3db0351 SHA512 61e47eec60ca713e958cbe2fe80241afe699a7853a0ca2b7f866aa37de064115df8418226b2ace22def12fdf97531f2301a92756b6ebe7862a11004d2f1d93c4
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.1.101.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.1.101.ebuild
deleted file mode 100644
index a563eae4f24..00000000000
--- a/dev-util/vulkan-headers/vulkan-headers-1.1.101.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Headers.git"
- inherit git-r3
-else
- EGIT_COMMIT="8e2c4cd554b644592a6d904f2c8000ebbd4aa77f"
- KEYWORDS="~amd64 x86"
- SRC_URI="https://github.com/KhronosGroup/Vulkan-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/Vulkan-Headers-${EGIT_COMMIT}"
-fi
-
-DESCRIPTION="Vulkan Header files and API registry"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-# Old packaging will cause file collisions
-RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.1.106.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.1.106.ebuild
index 2cfd9a91ef3..645ee5d02cb 100644
--- a/dev-util/vulkan-headers/vulkan-headers-1.1.106.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-1.1.106.ebuild
@@ -10,7 +10,7 @@ if [[ "${PV}" == "9999" ]]; then
inherit git-r3
else
EGIT_COMMIT="08cbb5458f692d4778806775f65eb3dc642ddbbf"
- KEYWORDS="~amd64 x86"
+ KEYWORDS="amd64 x86"
SRC_URI="https://github.com/KhronosGroup/Vulkan-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/Vulkan-Headers-${EGIT_COMMIT}"
fi
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.1.82.0.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.1.82.0.ebuild
deleted file mode 100644
index 08976482e5e..00000000000
--- a/dev-util/vulkan-headers/vulkan-headers-1.1.82.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Headers.git"
- inherit git-r3
-else
- EGIT_COMMIT="c4e056d365472174471a243dfefbfe66a03564af"
- KEYWORDS="~amd64"
- SRC_URI="https://github.com/KhronosGroup/Vulkan-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/Vulkan-Headers-${EGIT_COMMIT}"
-fi
-
-DESCRIPTION="Vulkan Header files and API registry"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-# Old packaging will cause file collisions
-RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.1.92.0.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.1.92.0.ebuild
deleted file mode 100644
index 990f33299dc..00000000000
--- a/dev-util/vulkan-headers/vulkan-headers-1.1.92.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Headers.git"
- inherit git-r3
-else
- EGIT_COMMIT="114c3546e195819bd53a34b39f5194b2989a5b12"
- KEYWORDS="amd64"
- SRC_URI="https://github.com/KhronosGroup/Vulkan-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/Vulkan-Headers-${EGIT_COMMIT}"
-fi
-
-DESCRIPTION="Vulkan Header files and API registry"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-# Old packaging will cause file collisions
-RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
diff --git a/dev-util/vulkan-headers/vulkan-headers-9999.ebuild b/dev-util/vulkan-headers/vulkan-headers-9999.ebuild
index 0e2db963613..06f98f73c88 100644
--- a/dev-util/vulkan-headers/vulkan-headers-9999.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-9999.ebuild
@@ -10,7 +10,7 @@ if [[ "${PV}" == "9999" ]]; then
inherit git-r3
else
EGIT_COMMIT="b1577d5fbd5424c863710aa156aaafa77cae3de8"
- KEYWORDS="~amd64"
+ KEYWORDS="~amd64 ~x86"
SRC_URI="https://github.com/KhronosGroup/Vulkan-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/Vulkan-Headers-${EGIT_COMMIT}"
fi
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 5d686ffc074..571497db52d 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,2 +1 @@
DIST vulkan-tools-1.1.106.tar.gz 611700 BLAKE2B 510ec1f759ae9657a57f641f3a74c87d82c181f6c328a2b682c89cf3a676ae03c59e4be96747b64f29be9ff3f7c5e00eb9ce7cd59d49ab2c8c3bc5e52f1915f1 SHA512 7ce80fe42032058fc7cf2462d2afe49e843f58c412c39338862805b3bcfadf5abef85043e2b21df92662c619bcd34271e2dda5ec9ed8ff9a4dcd74deedfa4c82
-DIST vulkan-tools-1.1.92.0.tar.gz 344286 BLAKE2B 2bbf19b458b780f26b5520fa298416cda50c951fd04529da4fdf77b0e2c57d38ca1dd7e9bd08cb14cf9a7eda0b5a58623f7a75e0d421d1511ed50056c2b369ca SHA512 cdca9332b399300b7011c90ab25a8227028009ffade9c587788229175476a000843a340625691a6a7970433961b776d8aab69332a4d3b5a2d89fdc18330302cc
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.106-r1.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.106-r1.ebuild
index 1956a5c0166..4b502753322 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.1.106-r1.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.1.106-r1.ebuild
@@ -10,7 +10,7 @@ if [[ "${PV}" == "9999" ]]; then
inherit git-r3
else
EGIT_COMMIT="2abb69904b9ad017d39d3da1e7fc3dec1a584cd8"
- KEYWORDS="~amd64"
+ KEYWORDS="amd64"
SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}"
fi
@@ -22,7 +22,7 @@ HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="+cube +vulkaninfo X wayland"
+IUSE="+cube +vulkaninfo +X wayland"
COMMON_DEPEND="media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?]
wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
X? (
@@ -37,7 +37,7 @@ RDEPEND="${COMMON_DEPEND}"
# Vulkaninfo does not support wayland
REQUIRED_USE="|| ( X wayland )
- vulkaninfo? ( X )"
+ vulkaninfo? ( X )"
pkg_setup() {
MULTILIB_CHOST_TOOLS=()
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.106.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.106.ebuild
deleted file mode 100644
index ddc3a474aef..00000000000
--- a/dev-util/vulkan-tools/vulkan-tools-1.1.106.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Tools.git"
- EGIT_SUBMODULES=()
- inherit git-r3
-else
- EGIT_COMMIT="2abb69904b9ad017d39d3da1e7fc3dec1a584cd8"
- KEYWORDS="~amd64"
- SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}"
-fi
-
-inherit python-any-r1 cmake-multilib
-
-DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+cube +vulkaninfo X wayland"
-
-DEPEND="${PYTHON_DEPS}
- cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
- >=dev-util/vulkan-headers-1.1.106
- media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?]
- wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
- X? (
- x11-libs/libX11:=[${MULTILIB_USEDEP}]
- x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
- )"
-
-# Vulkaninfo does not support wayland
-REQUIRED_USE="|| ( X wayland )
- vulkaninfo? ( X )"
-
-pkg_setup() {
- MULTILIB_CHOST_TOOLS=()
-
- if use vulkaninfo; then
- MULTILIB_CHOST_TOOLS+=( /usr/bin/vulkaninfo )
- fi
-
- if use cube; then
- MULTILIB_CHOST_TOOLS+=(
- /usr/bin/vkcube
- /usr/bin/vkcubepp
- )
- fi
-
- python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DCMAKE_SKIP_RPATH=True
- -DBUILD_CUBE=$(usex cube)
- -DBUILD_VULKANINFO=$(usex vulkaninfo)
- -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
- -DBUILD_WSI_XCB_SUPPORT=$(usex X)
- -DBUILD_WSI_XLIB_SUPPORT=$(usex X)
- -DGLSLANG_INSTALL_DIR="/usr"
- -DVULKAN_HEADERS_INSTALL_DIR="/usr"
- )
-
- # Upstream only supports one window system at a time
- # If X is set at all, even if wayland is set, use X
- #
- # If -cube and/or -vulkaninfo is set, the flags we set
- # are ignored, so we don't need to consider that
- if use X; then
- mycmakeargs+=(
- -DCUBE_WSI_SELECTION="XCB"
- )
- fi
-
- if ! use X && use wayland; then
- mycmakeargs+=(
- -DCUBE_WSI_SELECTION="WAYLAND"
- )
- fi
-
- cmake-utils_src_configure
-}
-
-multilib_src_install() {
- cmake-utils_src_install
-}
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.92.0.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.92.0.ebuild
deleted file mode 100644
index f3e214574ec..00000000000
--- a/dev-util/vulkan-tools/vulkan-tools-1.1.92.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-if [[ "${PV}" == "9999" ]]; then
- EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Tools.git"
- EGIT_SUBMODULES=()
- inherit git-r3
-else
- EGIT_COMMIT="9bbdd552f0fd62741aa1f1e02ab3eafc45cf3c1e"
- KEYWORDS="amd64"
- SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}"
-fi
-
-inherit python-any-r1 cmake-multilib
-
-DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+cube +vulkaninfo X wayland"
-
-DEPEND="${PYTHON_DEPS}
- cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
- dev-util/vulkan-headers
- media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?]
- wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
- X? (
- x11-libs/libX11:=[${MULTILIB_USEDEP}]
- x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
- )"
-
-# Vulkaninfo does not support wayland
-REQUIRED_USE="|| ( X wayland )
- vulkaninfo? ( X )"
-
-pkg_setup() {
- MULTILIB_CHOST_TOOLS=()
-
- if use vulkaninfo; then
- MULTILIB_CHOST_TOOLS+=( /usr/bin/vulkaninfo )
- fi
-
- if use cube; then
- MULTILIB_CHOST_TOOLS+=(
- /usr/bin/vkcube
- /usr/bin/vkcubepp
- )
- fi
-
- python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DCMAKE_SKIP_RPATH=True
- -DBUILD_CUBE=$(usex cube)
- -DBUILD_VULKANINFO=$(usex vulkaninfo)
- -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
- -DBUILD_WSI_XCB_SUPPORT=$(usex X)
- -DBUILD_WSI_XLIB_SUPPORT=$(usex X)
- -DGLSLANG_INSTALL_DIR="/usr"
- -DVULKAN_HEADERS_INSTALL_DIR="/usr"
- )
-
- # Upstream only supports one window system at a time
- # If X is set at all, even if wayland is set, use X
- #
- # If -cube and/or -vulkaninfo is set, the flags we set
- # are ignored, so we don't need to consider that
- if use X; then
- mycmakeargs+=(
- -DCUBE_WSI_SELECTION="XCB"
- )
- fi
-
- if ! use X && use wayland; then
- mycmakeargs+=(
- -DCUBE_WSI_SELECTION="WAYLAND"
- )
- fi
-
- cmake-utils_src_configure
-}
-
-multilib_src_install() {
- cmake-utils_src_install
-}
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
index 2cac7708424..574fee54f75 100644
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{5,6,7} )
if [[ "${PV}" == "9999" ]]; then
EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Tools.git"
@@ -22,7 +22,7 @@ HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="+cube +vulkaninfo X wayland"
+IUSE="+cube +vulkaninfo +X wayland"
COMMON_DEPEND="media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?]
wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
X? (
@@ -37,7 +37,7 @@ RDEPEND="${COMMON_DEPEND}"
# Vulkaninfo does not support wayland
REQUIRED_USE="|| ( X wayland )
- vulkaninfo? ( X )"
+ vulkaninfo? ( X )"
pkg_setup() {
MULTILIB_CHOST_TOOLS=()
diff --git a/dev-util/xfce4-dev-tools/Manifest b/dev-util/xfce4-dev-tools/Manifest
index b0288db63c7..76fa2ab8c9e 100644
--- a/dev-util/xfce4-dev-tools/Manifest
+++ b/dev-util/xfce4-dev-tools/Manifest
@@ -1,2 +1,3 @@
DIST xfce4-dev-tools-4.12.0.tar.bz2 309586 BLAKE2B 8ebcc8f133772eb39acba0b2f189a67751b9a2b4d36e5897003d56f6b88d3e97e89e0383b98c4b5ae684786d5aed3409a4b491fdbaa6e37bf8fc7447a33b8605 SHA512 60f90daaaac3eea355779ee1bb6a0cf24fb9e0ba70971c9c26ea681755de41560cfbca59a28241c2fd818031dc46e95c550424577451ceb7a42b1de0b0ff4a31
DIST xfce4-dev-tools-4.13.0.tar.bz2 292066 BLAKE2B 3200bb73f135d4c82ef785269d26a34f3874e69188831c94574766080a26d7837ab3a05b88457397044b66c58cc78d1b136d3ee303ae3b78e7894fc91aac3c7c SHA512 ee1289044cda9d908b15b7c88c5911f785efec1fed4c4ff20d66d535078a652f827489ec8ce58467f44b185ccba887fd9b4cd55ea62dfc181ddc87ce74ed5618
+DIST xfce4-dev-tools-4.14.0.tar.bz2 292275 BLAKE2B 18f28394ded038a7bcf0e754ebb359464358df245903a0c4441df2845e57c9059de6e6775a90c0e6c3cde4936a847ddf26ae88ff61fe7612fc2626b00f1d56a7 SHA512 e22b139ff7516ec0e510f882cc6a9e8e8b2b7bd41093c8e67e5ef11eb6c2c2848637513369d652f7238f10b5005c5483a938d3348020b48a4c1fadadd6d635f8
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.14.0.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.14.0.ebuild
new file mode 100644
index 00000000000..2d5f6650e28
--- /dev/null
+++ b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.14.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A set of scripts and m4/autoconf macros that ease build system maintenance"
+HOMEPAGE="https://www.xfce.org/ http://users.xfce.org/~benny/projects/xfce4-dev-tools/"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.42"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
diff --git a/dev-util/xxdi/metadata.xml b/dev-util/xxdi/metadata.xml
index 2e483a03094..9950818d5fd 100644
--- a/dev-util/xxdi/metadata.xml
+++ b/dev-util/xxdi/metadata.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <!--maintainer-needed-->
<longdescription lang="en">
xxdi.pl is a perl script that implements vim's 'xxd -i' mode
so that packages do not have to use all of vim just to get this
diff --git a/dev-util/xxdi/xxdi-1.0.0.ebuild b/dev-util/xxdi/xxdi-1.0.0.ebuild
index b67be9f6790..2946a65edff 100644
--- a/dev-util/xxdi/xxdi-1.0.0.ebuild
+++ b/dev-util/xxdi/xxdi-1.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/gregkh/xxdi/archive/v${MODULE_VERSION}.tar.gz -> ${P
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm64 ppc ppc64 x86"
IUSE=""
RDEPEND="dev-lang/perl