diff options
Diffstat (limited to 'dev-util')
29 files changed, 165 insertions, 1015 deletions
diff --git a/dev-util/cunit/cunit-2.1_p3.ebuild b/dev-util/cunit/cunit-2.1_p3.ebuild index d3f3008c426e..e07862b56e4d 100644 --- a/dev-util/cunit/cunit-2.1_p3.ebuild +++ b/dev-util/cunit/cunit-2.1_p3.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit autotools flag-o-matic multilib-minimal toolchain-funcs MY_PN="CUnit" @@ -19,7 +20,7 @@ IUSE="ncurses static-libs" RDEPEND="ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND}" -BDEPEND="" +BDEPEND="virtual/pkgconfig" S="${WORKDIR}/${MY_P}" diff --git a/dev-util/editorconfig-geany/editorconfig-geany-0.2.ebuild b/dev-util/editorconfig-geany/editorconfig-geany-0.2.ebuild index cc715d422e3c..2c9be9381e6e 100644 --- a/dev-util/editorconfig-geany/editorconfig-geany-0.2.ebuild +++ b/dev-util/editorconfig-geany/editorconfig-geany-0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,6 +18,7 @@ CDEPEND="app-text/editorconfig-core-c:=" DEPEND="${CDEPEND} dev-util/geany" RDEPEND="${CDEPEND}" +BDEPEND="virtual/pkgconfig" S=${WORKDIR}/${PN}-${EGIT_COMMIT#v} src_prepare() { diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest index 2daa216ceac7..0614d46b7383 100644 --- a/dev-util/gnome-builder/Manifest +++ b/dev-util/gnome-builder/Manifest @@ -1,3 +1 @@ -DIST gnome-builder-3.36.1.tar.xz 12026976 BLAKE2B d833665bb71b1549fe789d05dbd89db588ae4cc7187e532f38f3bd9e779bccab644d9f9bfc4c84bd484ac678bcf8594e4aa4edff29ea8c87c5c557fc3e422a4f SHA512 284da6e5a9e766cb6f6122f1134c779cde8406b006728ae1fff3518020ef4b96239aa5037cd2d35cfe4728ea088d61c4eeabc39ea753a16208fdaba7b04e63c2 -DIST gnome-builder-3.38.1.tar.xz 12077860 BLAKE2B 68dfbf9aeda93c695035a51c020735a914a11a09d7106228c2b7fe603b3b1b7b292f6a110c77df2057d40ae7f0c7559cb48c6ecc888de2767984a03d34467a2f SHA512 50872a7285292f4e29acec153a7ba4616ab8e69529fbc7682fb74fa9d8b5c49ed52b939c7652bcf410444e2c2de969280b82ab4da44008f4b95863bfd52ac59a DIST gnome-builder-3.38.2.tar.xz 12078024 BLAKE2B 9cf8a74be5a48b73c21ce247a07fcb1441482edab8fd118a2d773429f68efcd50f4a8a1ef826cf90a9f76e482f25d9a092ca1700504178051fcf903abe9eb1ae SHA512 6f9d284a9c915562fe55a863ddcc385ca9278b4ee201f4b97272f425937066d630c35c0b337bdf94ce4b12226080a9020eb5dc253ccfb25bc6cdbf8e50779569 diff --git a/dev-util/gnome-builder/gnome-builder-3.36.1.ebuild b/dev-util/gnome-builder/gnome-builder-3.36.1.ebuild deleted file mode 100644 index a8ae1772796a..000000000000 --- a/dev-util/gnome-builder/gnome-builder-3.36.1.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -DISABLE_AUTOFORMATTING=1 -FORCE_PRINT_ELOG=1 - -inherit gnome.org gnome2-utils llvm meson python-single-r1 readme.gentoo-r1 virtualx xdg - -DESCRIPTION="An IDE for writing GNOME-based software" -HOMEPAGE="https://wiki.gnome.org/Apps/Builder" - -# FIXME: Review licenses at some point -LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="clang +devhelp doc +git +glade gtk-doc spell sysprof test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within. -# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking. -# The listed RDEPEND order shold roughly match that output as well, with toplevel one first then sorted by file path. -# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of -# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small -# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except. - -# FIXME: plugin_flatpak needs flatpak.pc >=0.8.0, ostree-1, libsoup-2.4.pc >=2.52.0 and git plugin enabled -# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2? -# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4 - -# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build -RDEPEND=" - >=dev-libs/libdazzle-3.33.90[introspection] - >=dev-libs/glib-2.61.2:2 - >=x11-libs/gtk+-3.22.26:3[introspection] - >=x11-libs/gtksourceview-4.0.0:4[introspection] - >=dev-libs/json-glib-1.2.0 - >=dev-libs/jsonrpc-glib-3.19.91 - >=x11-libs/pango-1.38.0 - >=dev-libs/libpeas-1.22.0[python,${PYTHON_SINGLE_USEDEP}] - >=dev-libs/template-glib-3.28.0[introspection] - >=x11-libs/vte-0.40.2:2.91[introspection] - >=net-libs/webkit-gtk-2.12.0:4=[introspection] - >=dev-libs/libxml2-2.9.0 - git? ( dev-libs/libgit2:=[ssh,threads] - >=dev-libs/libgit2-glib-0.28.0.1[ssh] - ) - dev-libs/libpcre:3 - dev-libs/libpcre2 - - >=dev-libs/gobject-introspection-1.54.0:= - $(python_gen_cond_dep ' - >=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}] - ') - ${PYTHON_DEPS} - clang? ( sys-devel/clang:= ) - devhelp? ( >=dev-util/devhelp-3.25.1:= ) - glade? ( >=dev-util/glade-3.22.0:3.10= ) - spell? ( >=app-text/gspell-1.8:0= - app-text/enchant:2 ) - >=dev-util/sysprof-capture-3.33.1:3 - sysprof? ( >=dev-util/sysprof-3.33.4:0/3[gtk] ) -" -DEPEND="${RDEPEND}" -# TODO: runtime ctags path finding.. - -# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional -# appstream-glib needed for validation with appstream-util with FEATURES=test -BDEPEND=" - doc? ( $(python_gen_cond_dep ' - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] - ') ) - gtk-doc? ( dev-util/gtk-doc - app-text/docbook-xml-dtd:4.3 ) - test? ( - dev-libs/appstream-glib - sys-apps/dbus ) - dev-util/desktop-file-utils - dev-util/glib-utils - >=dev-util/meson-0.49.2 - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide -extra capabilities beyond these expressed via USE flags. Some of these -that are currently available with packages include: - -* dev-util/uncrustify and dev-python/autopep8 for various Code Beautifier - plugin out of the box functionality. -* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for - C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic - highlighting and symbol resolving support. -* dev-python/jedi and dev-python/lxml for more accurate Python - autocompletion support. -* dev-util/valgrind for integration with valgrind. -* dev-util/meson for integration with the Meson build system. -* dev-util/cargo for integration with the Rust Cargo build system. -* dev-util/cmake for integration with the CMake build system. -* net-libs/nodejs[npm] for integration with the NPM package system. -' -# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important -# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..) -# jhbuild support -# rust language server via rls; Go via go-langserver -# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template -# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE -# stylelint for stylesheet (CSS and co) linting -# gvls for vala language-server integration - -llvm_check_deps() { - has_version "sys-devel/clang:${LLVM_SLOT}" -} - -pkg_setup() { - python-single-r1_pkg_setup - use clang && llvm_pkg_setup -} - -src_configure() { - local emesonargs=( - -Dtracing=false - -Dprofiling=false # not passing -pg to CFLAGS - -Dtcmalloc=false - -Dchannel=other - - $(meson_use doc help) - $(meson_use gtk-doc docs) - - -Dnetwork_tests=false - $(meson_use clang plugin_clang) - $(meson_use devhelp plugin_devhelp) - -Dplugin_deviced=false - -Dplugin_editorconfig=true # needs libpcre - -Dplugin_flatpak=false - $(meson_use git plugin_git) - $(meson_use glade plugin_glade) - -Dplugin_podman=false - $(meson_use spell plugin_spellcheck) - $(meson_use sysprof plugin_sysprof) - -Dplugin_update_manager=false - ) - meson_src_configure -} - -src_install() { - meson_src_install - python_optimize - if use doc; then - rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die - rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die - rm -r "${ED}"/usr/share/doc/gnome-builder/en/.doctrees || die - # custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825 - mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die - # _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is. - rmdir "${ED}"/usr/share/doc/gnome-builder/ || die - fi - readme.gentoo_create_doc -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update - readme.gentoo_print_elog -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} - -src_test() { - # FIXME: can't run meson_src_test together with virtx or dbus-run-session - virtx dbus-run-session meson test -C "${BUILD_DIR}" -} diff --git a/dev-util/gnome-builder/gnome-builder-3.38.1.ebuild b/dev-util/gnome-builder/gnome-builder-3.38.1.ebuild deleted file mode 100644 index d6c20964ab23..000000000000 --- a/dev-util/gnome-builder/gnome-builder-3.38.1.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -DISABLE_AUTOFORMATTING=1 -FORCE_PRINT_ELOG=1 - -inherit gnome.org gnome2-utils llvm meson python-single-r1 readme.gentoo-r1 virtualx xdg - -DESCRIPTION="An IDE for writing GNOME-based software" -HOMEPAGE="https://wiki.gnome.org/Apps/Builder" - -# FIXME: Review licenses at some point -LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="clang +devhelp doc +git +glade gtk-doc spell sysprof test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within. -# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking. -# The listed RDEPEND order shold roughly match that output as well, with toplevel one first then sorted by file path. -# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of -# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small -# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except. - -# FIXME: plugin_flatpak needs flatpak.pc >=0.8.0, ostree-1, libsoup-2.4.pc >=2.52.0 and git plugin enabled -# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2? -# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4 - -# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build -# TODO: automagic libportal dep -# TODO: automagic sysprof dep for tracing paths from toplevel meson.build -RDEPEND=" - >=dev-libs/libdazzle-3.37.0[introspection] - >=dev-libs/glib-2.65.0:2 - >=x11-libs/gtk+-3.22.26:3[introspection] - >=x11-libs/gtksourceview-4.0.0:4[introspection] - >=dev-libs/json-glib-1.2.0 - >=dev-libs/jsonrpc-glib-3.19.91 - >=x11-libs/pango-1.38.0 - >=dev-libs/libpeas-1.22.0[python,${PYTHON_SINGLE_USEDEP}] - >=dev-libs/template-glib-3.28.0[introspection] - >=x11-libs/vte-0.40.2:2.91[introspection] - >=net-libs/webkit-gtk-2.26:4=[introspection] - >=dev-libs/libxml2-2.9.0 - git? ( dev-libs/libgit2:=[ssh,threads] - >=dev-libs/libgit2-glib-0.28.0.1[ssh] - ) - dev-libs/libpcre:3 - dev-libs/libpcre2 - - >=dev-libs/gobject-introspection-1.54.0:= - $(python_gen_cond_dep ' - >=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}] - ') - ${PYTHON_DEPS} - clang? ( sys-devel/clang:= ) - devhelp? ( >=dev-util/devhelp-3.25.1:= ) - glade? ( >=dev-util/glade-3.22.0:3.10= ) - spell? ( >=app-text/gspell-1.8:0= - app-text/enchant:2 ) - sysprof? ( >=dev-util/sysprof-3.37.1:0/4[gtk] ) -" -DEPEND="${RDEPEND}" -# TODO: runtime ctags path finding.. - -# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional -# appstream-glib needed for validation with appstream-util with FEATURES=test -BDEPEND=" - doc? ( $(python_gen_cond_dep ' - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] - ') ) - gtk-doc? ( dev-util/gtk-doc - app-text/docbook-xml-dtd:4.3 ) - test? ( - dev-libs/appstream-glib - sys-apps/dbus ) - dev-util/desktop-file-utils - dev-util/glib-utils - >=dev-util/meson-0.49.2 - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide -extra capabilities beyond these expressed via USE flags. Some of these -that are currently available with packages include: - -* dev-util/uncrustify and dev-python/autopep8 for various Code Beautifier - plugin out of the box functionality. -* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for - C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic - highlighting and symbol resolving support. -* dev-python/jedi and dev-python/lxml for more accurate Python - autocompletion support. -* dev-util/valgrind for integration with valgrind. -* dev-util/meson for integration with the Meson build system. -* dev-util/cargo for integration with the Rust Cargo build system. -* dev-util/cmake for integration with the CMake build system. -* net-libs/nodejs[npm] for integration with the NPM package system. -' -# FIXME: Package codespell and mention here -# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important -# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..) -# jhbuild support -# rust support via rust-analyzer (rls plugin now disabled by default); Go via go-langserver -# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template -# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE -# stylelint for stylesheet (CSS and co) linting -# gvls for vala language-server integration - -llvm_check_deps() { - has_version "sys-devel/clang:${LLVM_SLOT}" -} - -pkg_setup() { - python-single-r1_pkg_setup - use clang && llvm_pkg_setup -} - -src_configure() { - local emesonargs=( - -Dtracing=false - -Dprofiling=false # not passing -pg to CFLAGS - -Dtcmalloc=false - -Dchannel=other - - $(meson_use doc help) - $(meson_use gtk-doc docs) - - -Dnetwork_tests=false - $(meson_use clang plugin_clang) - $(meson_use devhelp plugin_devhelp) - -Dplugin_deviced=false - -Dplugin_editorconfig=true # needs libpcre - -Dplugin_flatpak=false - $(meson_use git plugin_git) - $(meson_use glade plugin_glade) - -Dplugin_podman=false - $(meson_use spell plugin_spellcheck) - $(meson_use sysprof plugin_sysprof) - -Dplugin_update_manager=false - ) - meson_src_configure -} - -src_install() { - meson_src_install - python_optimize - if use doc; then - rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die - rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die - # custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825 - mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die - # _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is. - rmdir "${ED}"/usr/share/doc/gnome-builder/ || die - fi - readme.gentoo_create_doc -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update - readme.gentoo_print_elog -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} - -src_test() { - # FIXME: can't run meson_src_test together with virtx or dbus-run-session - virtx dbus-run-session meson test -C "${BUILD_DIR}" -} diff --git a/dev-util/gtk-doc-am/Manifest b/dev-util/gtk-doc-am/Manifest index 79e8dddc85bf..380dd096304f 100644 --- a/dev-util/gtk-doc-am/Manifest +++ b/dev-util/gtk-doc-am/Manifest @@ -1,2 +1 @@ -DIST gtk-doc-1.32.tar.xz 762000 BLAKE2B e87b0ed5dffd04acc7569171343839a742a874438248546b1b85ca71102d5a546f41b450c5cedf54ecab5b7b6585a4dac36d7600b21b5cce491470a50f82d3b0 SHA512 6d28395968c2951f1685570e5778b5add76d1b9cff8fcb8632b200b3ba251602a1ea59b1def84fc28560988b87fc0dbbc6947af88d268db6ff23e9c28aea3b28 DIST gtk-doc-1.33.1.tar.xz 768896 BLAKE2B 0d6cc32611618669aac4045942497a404f4d3ed703341cce56efefba439eb8595877297b76085c6a57d3d76710257153040b8f895d6dd6381502e852e6b82e93 SHA512 18620f0164382849980938103a9243abc35ea5a2628258f00e096e16a698b598d0c7fe80a1739fc689217c59a648c728a014bc672a92346c65768ebf89675b90 diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild deleted file mode 100644 index 8068a6397922..000000000000 --- a/dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME_ORG_MODULE="gtk-doc" - -inherit gnome.org - -DESCRIPTION="Automake files from gtk-doc" -HOMEPAGE="https://www.gtk.org/gtk-doc/" - -LICENSE="GPL-2 FDL-1.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -RDEPEND="" -DEPEND="${RDEPEND} - virtual/pkgconfig - !<dev-util/gtk-doc-${GNOME_ORG_PVP} -" -# This ebuild doesn't even compile anything, causing tests to fail when updating (bug #316071) -RESTRICT="test" - -src_configure() { - : -} - -src_compile() { - : -} - -src_install() { - insinto /usr/share/aclocal - doins buildsystems/autotools/gtk-doc.m4 -} diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest index 79e8dddc85bf..380dd096304f 100644 --- a/dev-util/gtk-doc/Manifest +++ b/dev-util/gtk-doc/Manifest @@ -1,2 +1 @@ -DIST gtk-doc-1.32.tar.xz 762000 BLAKE2B e87b0ed5dffd04acc7569171343839a742a874438248546b1b85ca71102d5a546f41b450c5cedf54ecab5b7b6585a4dac36d7600b21b5cce491470a50f82d3b0 SHA512 6d28395968c2951f1685570e5778b5add76d1b9cff8fcb8632b200b3ba251602a1ea59b1def84fc28560988b87fc0dbbc6947af88d268db6ff23e9c28aea3b28 DIST gtk-doc-1.33.1.tar.xz 768896 BLAKE2B 0d6cc32611618669aac4045942497a404f4d3ed703341cce56efefba439eb8595877297b76085c6a57d3d76710257153040b8f895d6dd6381502e852e6b82e93 SHA512 18620f0164382849980938103a9243abc35ea5a2628258f00e096e16a698b598d0c7fe80a1739fc689217c59a648c728a014bc672a92346c65768ebf89675b90 diff --git a/dev-util/gtk-doc/files/1.32-deprecation-parse-fixes.patch b/dev-util/gtk-doc/files/1.32-deprecation-parse-fixes.patch deleted file mode 100644 index 59f878cceac4..000000000000 --- a/dev-util/gtk-doc/files/1.32-deprecation-parse-fixes.patch +++ /dev/null @@ -1,180 +0,0 @@ -From 2667d8cd95a2a29c35c1bb8f4629c22fd0aa98e9 Mon Sep 17 00:00:00 2001 -From: Xavier Claessens <xavier.claessens@collabora.com> -Date: Thu, 2 Jan 2020 21:56:10 -0500 -Subject: [PATCH 1/3] Skip G_GNUC_(BEGIN|END)_IGNORE_DEPRECATIONS lines - -For some reason, glib has to put empty line before and after each of -these lines otherwise the symbol following it is undeclared. ---- - gtkdoc/scan.py | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/gtkdoc/scan.py b/gtkdoc/scan.py -index d04d4d4..7de08ad 100644 ---- a/gtkdoc/scan.py -+++ b/gtkdoc/scan.py -@@ -561,6 +561,11 @@ def ScanHeaderContent(input_lines, decl_list, get_types, options): - logging.info('Found start of comment: %s', line.strip()) - continue - -+ # Skip begin/end deprecation macros. -+ m = re.search(r'^\s*G_GNUC_(BEGIN|END)_IGNORE_DEPRECATIONS', line) -+ if m: -+ continue -+ - logging.info('no decl: %s', line.strip()) - - cm = [m.match(line) for m in CLINE_MATCHER] --- -2.20.1 - - -From 9e58548688c9768cf41c59ccef531d438ffb2504 Mon Sep 17 00:00:00 2001 -From: Xavier Claessens <xavier.claessens@collabora.com> -Date: Fri, 3 Jan 2020 06:47:47 -0500 -Subject: [PATCH 2/3] typedef can be followed by decorator - ---- - gtkdoc/scan.py | 30 +++++++++++++++++------------- - 1 file changed, 17 insertions(+), 13 deletions(-) - -diff --git a/gtkdoc/scan.py b/gtkdoc/scan.py -index 7de08ad..5a5da92 100644 ---- a/gtkdoc/scan.py -+++ b/gtkdoc/scan.py -@@ -96,19 +96,8 @@ CLINE_MATCHER = [ - (struct|union)\s* - \w*\s*{""", re.VERBOSE), - # 12-14: OTHER TYPEDEFS -- re.compile( -- r"""^\s*typedef\s+ -- (?:struct|union)\s+\w+[\s\*]+ -- (\w+) # 1: name -- \s*;""", re.VERBOSE), -- re.compile( -- r"""^\s* -- (?:G_GNUC_EXTENSION\s+)? -- typedef\s+ -- (.+[\s\*]) # 1: e.g. 'unsigned int' -- (\w+) # 2: name -- (?:\s*\[[^\]]+\])* -- \s*;""", re.VERBOSE), -+ None, # in InitScanner() -+ None, # in InitScanner() - re.compile(r'^\s*typedef\s+'), - # 15: VARIABLES (extern'ed variables) - None, # in InitScanner() -@@ -267,6 +256,21 @@ def InitScanner(options): - %s # 3: optional decorator - \s*;""" % optional_decorators_regex, re.VERBOSE) - # OTHER TYPEDEFS -+ CLINE_MATCHER[12] = re.compile( -+ r"""^\s*typedef\s+ -+ (?:struct|union)\s+\w+[\s\*]+ -+ (\w+) # 1: name -+ %s # 2: optional decorator -+ \s*;""" % optional_decorators_regex, re.VERBOSE) -+ CLINE_MATCHER[13] = re.compile( -+ r"""^\s* -+ (?:G_GNUC_EXTENSION\s+)? -+ typedef\s+ -+ (.+?[\s\*]) # 1: e.g. 'unsigned int' -+ (\w+) # 2: name -+ (?:\s*\[[^\]]+\])* -+ %s # 3: optional decorator -+ \s*;""" % optional_decorators_regex, re.VERBOSE) - CLINE_MATCHER[15] = re.compile( - r"""^\s* - (?:extern|[A-Za-z_]+VAR%s)\s+ --- -2.20.1 - - -From 5bfe23f0257e1b4c6c9a4e3a2dbb180455f753f2 Mon Sep 17 00:00:00 2001 -From: Jason Crain <jason@inspiresomeone.us> -Date: Mon, 6 Jan 2020 19:05:42 -0700 -Subject: [PATCH 3/3] scan: support deprecated struct members - -gcc allows deprecating members of structs. For example: - -struct data { - int x G_GNUC_DEPRECATED_FOR(replacement); -}; - -However, this currently causes the entire struct to be marked as -deprecated and confuses mkdb because it doesn't understand the -G_GNUC_DEPRECATED_FOR symbol. - -Fix this by having the whole struct only be marked as deprecated if the -'_DEPRECATED' is after the closing bracket of the struct, similar to how -it already does for enums, and having scan automatically remove all -G_GNUC_* decorators from struct members, similar to how it already does -for functions. ---- - gtkdoc/scan.py | 12 ++++++++++-- - tests/scan.py | 17 +++++++++++++++++ - 2 files changed, 27 insertions(+), 2 deletions(-) - -diff --git a/gtkdoc/scan.py b/gtkdoc/scan.py -index 5a5da92..6c6534a 100644 ---- a/gtkdoc/scan.py -+++ b/gtkdoc/scan.py -@@ -538,7 +538,7 @@ def ScanHeaderContent(input_lines, decl_list, get_types, options): - # section (#endif /* XXX_DEPRECATED */ - if deprecated_conditional_nest == 0 and '_DEPRECATED' in line: - m = re.search(r'^\s*#\s*(if*|define|endif)', line) -- if not (m or in_declaration == 'enum'): -+ if not (m or in_declaration == 'enum' or in_declaration == 'struct'): - logging.info('Found deprecation annotation (decl: "%s"): "%s"', - in_declaration, line.strip()) - deprecated_conditional_nest += 0.1 -@@ -953,9 +953,17 @@ def ScanHeaderContent(input_lines, decl_list, get_types, options): - title = '<TITLE>%s</TITLE>' % objectname - - logging.info('Store struct: "%s"', symbol) -+ # Structs could contain deprecated members and that doesn't -+ # mean the whole struct is deprecated, so they are ignored when -+ # setting deprecated_conditional_nest above. Here we can check -+ # if the _DEPRECATED is between '}' and ';' which would mean -+ # the struct as a whole is deprecated. -+ if re.search(r'\n\s*\}.*_DEPRECATED.*;\s*$', decl): -+ deprecated = '<DEPRECATED/>\n' - if AddSymbolToList(slist, symbol): - structsym = in_declaration.upper() -- stripped_decl = re.sub('(%s)' % optional_decorators_regex, '', decl) -+ regex = r'(?:\s+(?:G_GNUC_\w+(?:\(\w*\))?%s))' % ignore_decorators -+ stripped_decl = re.sub(regex, '', decl) - decl_list.append('<%s>\n<NAME>%s</NAME>\n%s%s</%s>\n' % - (structsym, symbol, deprecated, stripped_decl, structsym)) - if symbol in forward_decls: -diff --git a/tests/scan.py b/tests/scan.py -index ad63541..6d608b6 100755 ---- a/tests/scan.py -+++ b/tests/scan.py -@@ -552,6 +552,23 @@ class ScanHeaderContentStructs(ScanHeaderContentTestCase): - slist, doc_comments = self.scanHeaderContent([header]) - self.assertDecl('data', expected, slist) - -+ def test_HandleDeprecatedMemberDecorator(self): -+ """Struct with deprecated members.""" -+ header = textwrap.dedent("""\ -+ struct data { -+ int x1 G_GNUC_DEPRECATED; -+ int x2 G_GNUC_DEPRECATED_FOR(replacement); -+ };""") -+ expected = textwrap.dedent("""\ -+ struct data { -+ int x1; -+ int x2; -+ };""") -+ scan.InitScanner(self.options) -+ slist, doc_comments = self.scanHeaderContent( -+ header.splitlines(keepends=True)) -+ self.assertDecl('data', expected, slist) -+ - - class ScanHeaderContentUnions(ScanHeaderContentTestCase): - """Test parsing of union declarations.""" --- -2.20.1 - diff --git a/dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild b/dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild deleted file mode 100644 index 1e216ee83445..000000000000 --- a/dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) - -inherit eutils elisp-common gnome2 python-single-r1 readme.gentoo-r1 - -DESCRIPTION="GTK+ Documentation Generator" -HOMEPAGE="https://www.gtk.org/gtk-doc/" - -LICENSE="GPL-2 FDL-1.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris" - -IUSE="debug doc emacs" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - >=dev-libs/glib-2.6:2 - dev-libs/libxslt - >=dev-libs/libxml2-2.3.6:2 - ~app-text/docbook-xml-dtd-4.3 - app-text/docbook-xsl-stylesheets - ~app-text/docbook-sgml-dtd-3.0 - >=app-text/docbook-dsssl-stylesheets-1.40 - emacs? ( >=app-editors/emacs-23.1:* ) - $(python_gen_cond_dep ' - dev-python/pygments[${PYTHON_MULTI_USEDEP}] - ') -" -DEPEND="${RDEPEND} - ~dev-util/gtk-doc-am-${PV} - dev-util/itstool - virtual/pkgconfig -" - -# tests require unpackaged python module "anytree", and require java(fop) or tex(dblatex) -RESTRICT="test" - -pkg_setup() { - DOC_CONTENTS="gtk-doc does no longer define global key bindings for Emacs. - You may set your own key bindings for \"gtk-doc-insert\" and - \"gtk-doc-insert-section\" in your ~/.emacs file." - SITEFILE=61${PN}-gentoo.el - python-single-r1_pkg_setup -} - -src_prepare() { - # Remove global Emacs keybindings, bug #184588 - eapply "${FILESDIR}"/${PN}-1.8-emacs-keybindings.patch - - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \ - $(use_enable debug) -} - -src_compile() { - gnome2_src_compile - use emacs && elisp-compile tools/gtk-doc.el -} - -src_install() { - gnome2_src_install - - python_fix_shebang "${ED}"/usr/bin/gtkdoc-depscan - - # Don't install this file, it's in gtk-doc-am now - rm "${ED}"/usr/share/aclocal/gtk-doc.m4 || die "failed to remove gtk-doc.m4" - - if use doc; then - docinto doc - dodoc doc/* - docinto examples - dodoc examples/* - fi - - if use emacs; then - elisp-install ${PN} tools/gtk-doc.el* - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - readme.gentoo_create_doc - fi -} - -pkg_postinst() { - gnome2_pkg_postinst - if use emacs; then - elisp-site-regen - readme.gentoo_print_elog - fi -} - -pkg_postrm() { - gnome2_pkg_postrm - use emacs && elisp-site-regen -} diff --git a/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild b/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild deleted file mode 100644 index 4880403af67c..000000000000 --- a/dev-util/gtk-doc/gtk-doc-1.32-r2.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) - -inherit eutils elisp-common gnome2 python-single-r1 readme.gentoo-r1 - -DESCRIPTION="GTK+ Documentation Generator" -HOMEPAGE="https://www.gtk.org/gtk-doc/" - -LICENSE="GPL-2 FDL-1.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris" - -IUSE="debug doc emacs" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - ${PYTHON_DEPS} - >=dev-libs/glib-2.6:2 - dev-libs/libxslt - >=dev-libs/libxml2-2.3.6:2 - ~app-text/docbook-xml-dtd-4.3 - app-text/docbook-xsl-stylesheets - ~app-text/docbook-sgml-dtd-3.0 - >=app-text/docbook-dsssl-stylesheets-1.40 - emacs? ( >=app-editors/emacs-23.1:* ) - $(python_gen_cond_dep ' - dev-python/pygments[${PYTHON_MULTI_USEDEP}] - ') -" -DEPEND="${RDEPEND} - ~dev-util/gtk-doc-am-${PV} - dev-util/itstool - virtual/pkgconfig -" - -# tests require unpackaged python module "anytree", and require java(fop) or tex(dblatex) -RESTRICT="test" - -pkg_setup() { - DOC_CONTENTS="gtk-doc does no longer define global key bindings for Emacs. - You may set your own key bindings for \"gtk-doc-insert\" and - \"gtk-doc-insert-section\" in your ~/.emacs file." - SITEFILE=61${PN}-gentoo.el - python-single-r1_pkg_setup -} - -src_prepare() { - # Remove global Emacs keybindings, bug #184588 - eapply "${FILESDIR}"/${PN}-1.8-emacs-keybindings.patch - # Fix dev-libs/glib[gtk-doc] doc generation tests by fixing stuff surrounding deprecations - # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1488 - eapply "${FILESDIR}"/${PV}-deprecation-parse-fixes.patch - - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \ - $(use_enable debug) -} - -src_compile() { - gnome2_src_compile - use emacs && elisp-compile tools/gtk-doc.el -} - -src_install() { - gnome2_src_install - - python_fix_shebang "${ED}"/usr/bin/gtkdoc-depscan - - # Don't install this file, it's in gtk-doc-am now - rm "${ED}"/usr/share/aclocal/gtk-doc.m4 || die "failed to remove gtk-doc.m4" - - if use doc; then - docinto doc - dodoc doc/* - docinto examples - dodoc examples/* - fi - - if use emacs; then - elisp-install ${PN} tools/gtk-doc.el* - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - readme.gentoo_create_doc - fi -} - -pkg_postinst() { - gnome2_pkg_postinst - if use emacs; then - elisp-site-regen - readme.gentoo_print_elog - fi -} - -pkg_postrm() { - gnome2_pkg_postrm - use emacs && elisp-site-regen -} diff --git a/dev-util/gtk-doc/gtk-doc-1.33.1-r3.ebuild b/dev-util/gtk-doc/gtk-doc-1.33.1-r3.ebuild deleted file mode 100644 index 6f4c26fef21e..000000000000 --- a/dev-util/gtk-doc/gtk-doc-1.33.1-r3.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) - -inherit elisp-common gnome.org meson python-single-r1 readme.gentoo-r1 - -DESCRIPTION="GTK+ Documentation Generator" -HOMEPAGE="https://wiki.gnome.org/DocumentationProject/GtkDoc" - -LICENSE="GPL-2 FDL-1.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris" - -IUSE="doc emacs test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="!test? ( test )" - -RDEPEND=" - ${PYTHON_DEPS} - >=dev-libs/glib-2.38:2 - dev-libs/libxslt - >=dev-libs/libxml2-2.3.6:2 - ~app-text/docbook-xml-dtd-4.3 - app-text/docbook-xsl-stylesheets - ~app-text/docbook-sgml-dtd-3.0 - >=app-text/docbook-dsssl-stylesheets-1.40 - emacs? ( >=app-editors/emacs-23.1:* ) - $(python_gen_cond_dep ' - dev-python/pygments[${PYTHON_MULTI_USEDEP}] - ') -" -DEPEND="${RDEPEND} - test? ( - $(python_gen_cond_dep ' - dev-python/parameterized[${PYTHON_USEDEP}] - ') - ) -" -BDEPEND=" - ~dev-util/gtk-doc-am-${PV} - virtual/pkgconfig -" - -PATCHES=( - # Remove global Emacs keybindings, bug #184588 - "${FILESDIR}"/${PN}-1.8-emacs-keybindings.patch -) - -pkg_setup() { - DOC_CONTENTS="gtk-doc does no longer define global key bindings for Emacs. - You may set your own key bindings for \"gtk-doc-insert\" and - \"gtk-doc-insert-section\" in your ~/.emacs file." - SITEFILE=61${PN}-gentoo.el - python-single-r1_pkg_setup -} - -src_prepare() { - default - - # Requires the unpackaged Python "anytree" module - sed -i -e '/mkhtml2/d' "${S}"/tests/meson.build || die -} - -src_configure() { - local emesonargs=( - $(meson_use test tests) - $(meson_use doc yelp_manual) - ) - meson_src_configure -} - -src_compile() { - meson_src_compile - use emacs && elisp-compile tools/gtk-doc.el -} - -src_install() { - meson_src_install - - # The meson build system configures the shebangs to the temporary python - # used during the build. We need to fix it. - sed -i -e 's:^#!.*python3:#!/usr/bin/env python3:' "${ED}"/usr/bin/* || die - python_fix_shebang "${ED}"/usr/bin - - # Don't install this file, it's in gtk-doc-am now - rm "${ED}"/usr/share/aclocal/gtk-doc.m4 || die "failed to remove gtk-doc.m4" - rmdir "${ED}"/usr/share/aclocal || die - - if use emacs; then - elisp-install ${PN} tools/gtk-doc.el* - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - readme.gentoo_create_doc - fi -} - -pkg_postinst() { - if use emacs; then - elisp-site-regen - readme.gentoo_print_elog - fi -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-10.2.89-r1.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-10.2.89-r1.ebuild index 73a79f45175e..0ddaadfb8164 100644 --- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-10.2.89-r1.ebuild +++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-10.2.89-r1.ebuild @@ -25,8 +25,9 @@ RDEPEND=" media-libs/glew:0= !prefix? ( >=x11-drivers/nvidia-drivers-${DRIVER_PV}[uvm(+)] ) mpi? ( virtual/mpi ) - )" + )" DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" RESTRICT="test" diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-8.0.61-r1.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-8.0.61-r1.ebuild index 8e04354cdce4..5ed2d2a84f38 100644 --- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-8.0.61-r1.ebuild +++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-8.0.61-r1.ebuild @@ -26,7 +26,10 @@ RDEPEND=" >=x11-drivers/nvidia-drivers-375.26[uvm(+)] mpi? ( virtual/mpi ) )" -DEPEND="${RDEPEND}" +DEPEND=" + ${RDEPEND} + virtual/pkgconfig +" RESTRICT="test" diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.2.88-r1.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.2.88-r1.ebuild index a0f373850925..45e4d209861e 100644 --- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.2.88-r1.ebuild +++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.2.88-r1.ebuild @@ -26,7 +26,10 @@ RDEPEND=" >=x11-drivers/nvidia-drivers-396.24[uvm(+)] mpi? ( virtual/mpi ) )" -DEPEND="${RDEPEND}" +DEPEND=" + ${RDEPEND} + virtual/pkgconfig +" RESTRICT="test" diff --git a/dev-util/perf/perf-5.10.16.ebuild b/dev-util/perf/perf-5.10.16.ebuild index d9f7e8d604ea..e8b32579779a 100644 --- a/dev-util/perf/perf-5.10.16.ebuild +++ b/dev-util/perf/perf-5.10.16.ebuild @@ -40,6 +40,7 @@ BDEPEND=" ${LINUX_PATCH+dev-util/patchutils} sys-devel/bison sys-devel/flex + virtual/pkgconfig doc? ( app-text/asciidoc app-text/sgml-common diff --git a/dev-util/perf/perf-5.11.ebuild b/dev-util/perf/perf-5.11.ebuild index d9f7e8d604ea..e8b32579779a 100644 --- a/dev-util/perf/perf-5.11.ebuild +++ b/dev-util/perf/perf-5.11.ebuild @@ -40,6 +40,7 @@ BDEPEND=" ${LINUX_PATCH+dev-util/patchutils} sys-devel/bison sys-devel/flex + virtual/pkgconfig doc? ( app-text/asciidoc app-text/sgml-common diff --git a/dev-util/perf/perf-5.8.ebuild b/dev-util/perf/perf-5.8.ebuild index a2a06c1e1929..171f9cc29ce6 100644 --- a/dev-util/perf/perf-5.8.ebuild +++ b/dev-util/perf/perf-5.8.ebuild @@ -62,6 +62,7 @@ DEPEND="${RDEPEND} ${LINUX_PATCH+dev-util/patchutils} sys-devel/bison sys-devel/flex + virtual/pkgconfig java? ( virtual/jdk ) doc? ( app-text/asciidoc diff --git a/dev-util/perf/perf-5.9.9.ebuild b/dev-util/perf/perf-5.9.9.ebuild index 851dc5373250..94ad6c2f7253 100644 --- a/dev-util/perf/perf-5.9.9.ebuild +++ b/dev-util/perf/perf-5.9.9.ebuild @@ -40,6 +40,7 @@ BDEPEND=" ${LINUX_PATCH+dev-util/patchutils} sys-devel/bison sys-devel/flex + virtual/pkgconfig doc? ( app-text/asciidoc app-text/sgml-common diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest index ad15617c38f9..f17fb782b4a5 100644 --- a/dev-util/radare2/Manifest +++ b/dev-util/radare2/Manifest @@ -1,2 +1,3 @@ DIST radare2-4.5.1.tar.gz 8266567 BLAKE2B 0d23c1d47dd79ffd9398ca7b2c8b383ba6a7e3ec662046d1111ab34cabcdaaf1fdd449686433b3229e3c22c31c705530b0a85bbd22b5fc79891a5ad292ba0ff1 SHA512 f08a4cd1e0d65643463d9f9dbb1aacfe793c7b411ec820a18b75a5975d265cfc2cf91e593522c8823aa369098ded21415939acb07c84d8acd102889bf5aed899 DIST radare2-5.1.1.tar.gz 7920840 BLAKE2B c6109453d3da6a08f8169bfdc610614f2aee2d6ef13a975ed89e5337c79ad1a8340a08df1ba9d08cbb0db7b61db8c0357a4878e7b948a988c08b895c24ec366b SHA512 b6728bb59788804f5442d5eec8141f62c3b51f589955589b310733b3aeb28beedb969af540649f454dad96710231df384e389d8b4a1d55627d8370e4d3da454f +DIST radare2-5.2.0.tar.gz 8254980 BLAKE2B 51335b5560ea9085a7cb6ae998657d62353ad65e10f715ca25ec34cde75d48cd06d8312a898de71096138365d3ea13de45e6e48b2c0f06cea7d593cca43a0ef9 SHA512 664ea6df65c1ea8d13a80d281c3dbbcae16fb308826b9276e68d63f26f239f4a5c0d59abcf9325c299894ad4ebf1098b964aa3cad0bbe58b6c96cbd6e7b25952 diff --git a/dev-util/radare2/files/radare2-5.2.0-ssl-build.patch b/dev-util/radare2/files/radare2-5.2.0-ssl-build.patch new file mode 100644 index 000000000000..8701adb62664 --- /dev/null +++ b/dev-util/radare2/files/radare2-5.2.0-ssl-build.patch @@ -0,0 +1,54 @@ +From 7273429e4ba85318f0da2ae03ecc154834aaa73b Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyfox@gentoo.org> +Date: Mon, 12 Apr 2021 23:48:09 +0100 +Subject: [PATCH] state.c: fix --with-openssl build + +Build failure happens at: + +``` +$ ./configure --with-openssl && make +.... +state.c: In function 'r_hash_do_hmac_sha256': +state.c:155:19: error: 'r_SHA256_BLOCK_LENGTH' undeclared (first use in this function); did you mean 'SHA256_BLOCK_LENGTH'? + 155 | ut8 bskey[r_SHA256_BLOCK_LENGTH]; // block-sized key + | ^~~~~~~~~~~~~~~~~~~~~ + | SHA256_BLOCK_LENGTH +``` + +The change defines r2_.* aliases for openssl implementation. +--- + libr/hash/state.c | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +diff --git a/libr/hash/state.c b/libr/hash/state.c +index 6f3ae6b4c..93adafc81 100644 +--- a/libr/hash/state.c ++++ b/libr/hash/state.c +@@ -7,6 +7,24 @@ + #include <openssl/md4.h> + #include <openssl/md5.h> + #include <openssl/sha.h> ++ ++# define r_SHA256_BLOCK_LENGTH SHA256_BLOCK_LENGTH ++ ++# define r_SHA1_Init SHA1_Init ++# define r_SHA1_Update SHA1_Update ++# define r_SHA1_Final SHA1_Final ++ ++# define r_SHA256_Init SHA256_Init ++# define r_SHA256_Update SHA256_Update ++# define r_SHA256_Final SHA256_Final ++ ++# define r_SHA384_Init SHA384_Init ++# define r_SHA384_Update SHA384_Update ++# define r_SHA384_Final SHA384_Final ++ ++# define r_SHA512_Init SHA512_Init ++# define r_SHA512_Update SHA512_Update ++# define r_SHA512_Final SHA512_Final + #else + #include "md4.h" + #include "md5.h" +-- +2.31.1 + diff --git a/dev-util/radare2/radare2-4.5.1-r1.ebuild b/dev-util/radare2/radare2-4.5.1-r1.ebuild index 963c0b6b6e74..5dc5b337d6ad 100644 --- a/dev-util/radare2/radare2-4.5.1-r1.ebuild +++ b/dev-util/radare2/radare2-4.5.1-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit bash-completion-r1 eutils toolchain-funcs +inherit bash-completion-r1 toolchain-funcs DESCRIPTION="unix-like reverse engineering framework and commandline tools" HOMEPAGE="http://www.radare.org" @@ -67,8 +67,8 @@ src_install() { # 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'" + if [[ -d ${d} ]]; then + rm -rfv "${d}" || die "failed to delete '${d}'" fi done diff --git a/dev-util/radare2/radare2-5.1.1.ebuild b/dev-util/radare2/radare2-5.1.1.ebuild index fb93a9ece984..5dc5b337d6ad 100644 --- a/dev-util/radare2/radare2-5.1.1.ebuild +++ b/dev-util/radare2/radare2-5.1.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit bash-completion-r1 eutils toolchain-funcs +inherit bash-completion-r1 toolchain-funcs DESCRIPTION="unix-like reverse engineering framework and commandline tools" HOMEPAGE="http://www.radare.org" @@ -67,8 +67,8 @@ src_install() { # 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'" + if [[ -d ${d} ]]; then + rm -rfv "${d}" || die "failed to delete '${d}'" fi done diff --git a/dev-util/radare2/radare2-5.2.0.ebuild b/dev-util/radare2/radare2-5.2.0.ebuild new file mode 100644 index 000000000000..21ead643e77e --- /dev/null +++ b/dev-util/radare2/radare2-5.2.0.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit bash-completion-r1 toolchain-funcs + +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/radareorg/radare2" +else + SRC_URI="https://github.com/radareorg/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="ssl libressl" + +RDEPEND=" + dev-libs/libzip + dev-libs/xxhash + sys-apps/file + sys-libs/zlib + dev-libs/capstone:0= + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=("${FILESDIR}"/${P}-ssl-build.patch) + +src_prepare() { + # Fix hardcoded docdir for fortunes + sed -i -e "/^#define R2_FORTUNES/s/radare2/$PF/" \ + libr/include/r_userconf.h.acr + default +} + +src_configure() { + # Ideally these should be set by ./configure + tc-export CC AR LD OBJCOPY RANLIB + export HOST_CC=${CC} + + econf \ + --without-libuv \ + --with-syscapstone \ + --with-sysmagic \ + --with-sysxxhash \ + --with-syszip \ + $(use_with ssl openssl) +} + +src_install() { + default + + insinto /usr/share/zsh/site-functions + doins doc/zsh/_* + + newbashcomp doc/bash_autocompletion.sh "${PN}" + bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2 + + # a workaround for unstable $(INSTALL) call, bug #574866 + local d + for d in doc/*; do + if [[ -d ${d} ]]; then + rm -rfv "${d}" || die "failed to delete '${d}'" + fi + done + + # These are not really docs. radare assumes + # uncompressed files: bug #761250 + docompress -x /usr/share/doc/${PF}/fortunes.{creepy,fun,nsfw,tips} +} diff --git a/dev-util/radare2/radare2-9999.ebuild b/dev-util/radare2/radare2-9999.ebuild index 963c0b6b6e74..5dc5b337d6ad 100644 --- a/dev-util/radare2/radare2-9999.ebuild +++ b/dev-util/radare2/radare2-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit bash-completion-r1 eutils toolchain-funcs +inherit bash-completion-r1 toolchain-funcs DESCRIPTION="unix-like reverse engineering framework and commandline tools" HOMEPAGE="http://www.radare.org" @@ -67,8 +67,8 @@ src_install() { # 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'" + if [[ -d ${d} ]]; then + rm -rfv "${d}" || die "failed to delete '${d}'" fi done diff --git a/dev-util/sysprof/Manifest b/dev-util/sysprof/Manifest index 0af7bddcac0e..833ac9628388 100644 --- a/dev-util/sysprof/Manifest +++ b/dev-util/sysprof/Manifest @@ -1,2 +1 @@ -DIST sysprof-3.36.0.tar.xz 435956 BLAKE2B 990a6c6c28339594df915ed1fb98f504bf6b080a5e3c31af0cc4bcfd208027361f02a9068291692d082787a6fd42ab414079122a63e4706aee2511040379f0c8 SHA512 41f99cc3446a6624ea74fcdecd7a29a2e5e2d4086383d59a9064c4a3df5d9b8d08f4903ff4dcc85ffa9c6d42bd84dec5c03f6010fffd4415cc8fecf4dc0b23f4 DIST sysprof-3.38.1.tar.xz 458572 BLAKE2B 68c219a6c80ed070314fc7718a2995c49821cc7c761b277fdd29c233da9d81b561b6c68cd0d0a42cc3e4c150e3de438322f7d418140ce19f3381f4ffac78aa1a SHA512 7ba3dd51bd4055dcdf4d46ff87e46537afe42ba009809fdee5ba0ebcdf70776d9e1ff812714096d33b09ac57d459707b92b1ca07682e2f3888b612ca74820442 diff --git a/dev-util/sysprof/files/3.36.0-fix-32bit-tests-build.patch b/dev-util/sysprof/files/3.36.0-fix-32bit-tests-build.patch deleted file mode 100644 index a9d4ab58ef9a..000000000000 --- a/dev-util/sysprof/files/3.36.0-fix-32bit-tests-build.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 5dea152c7728f5a37370ad8a229115833e36b4f6 Mon Sep 17 00:00:00 2001 -From: Rasmus Thomsen <oss@cogitri.dev> -Date: Sat, 7 Mar 2020 10:44:16 +0100 -Subject: [PATCH] tests: use G_GSIZE_FORMAT instead of G_GUINT64_FORMAT for - gsize - -This fixes the build on 32-bit platforms with -Werror-format - -fixes #32 ---- - src/tests/allocs-by-size.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/tests/allocs-by-size.c b/src/tests/allocs-by-size.c -index 666113a..6260d4b 100644 ---- a/src/tests/allocs-by-size.c -+++ b/src/tests/allocs-by-size.c -@@ -109,7 +109,7 @@ allocs_by_size (SysprofCaptureReader *reader) - { - const Item *item = &g_array_index (ar, Item, i); - -- g_print ("%"G_GUINT64_FORMAT",%"G_GUINT64_FORMAT",%"G_GUINT64_FORMAT"\n", -+ g_print ("%"G_GSIZE_FORMAT",%"G_GSIZE_FORMAT",%"G_GSIZE_FORMAT"\n", - item->size, item->cmp, item->count); - } - } --- -2.20.1 - diff --git a/dev-util/sysprof/sysprof-3.36.0-r1.ebuild b/dev-util/sysprof/sysprof-3.36.0-r1.ebuild deleted file mode 100644 index a759c6a7ec27..000000000000 --- a/dev-util/sysprof/sysprof-3.36.0-r1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit gnome.org gnome2-utils meson systemd xdg - -DESCRIPTION="System-wide Linux Profiler" -HOMEPAGE="http://sysprof.com/" - -LICENSE="GPL-3+ GPL-2+" -API_VERSION="3" -SLOT="0/${API_VERSION}" -KEYWORDS="amd64 x86" -IUSE="gtk +unwind" - -RDEPEND=" - >=dev-libs/glib-2.61.3:2 - gtk? ( - >=x11-libs/gtk+-3.22.0:3 - >=dev-libs/libdazzle-3.30.0 - ) - >=sys-auth/polkit-0.114 - unwind? ( sys-libs/libunwind:= ) - >=dev-util/sysprof-common-${PV} - >=dev-util/sysprof-capture-${PV}:${API_VERSION} -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-libs/appstream-glib - dev-util/gdbus-codegen - dev-util/itstool - >=sys-devel/gettext-0.19.8 - >=sys-kernel/linux-headers-2.6.32 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PV}-fix-32bit-tests-build.patch -) - -src_prepare() { - xdg_src_prepare - # These are installed by dev-util/sysprof-capture - sed -i -e '/install/d' src/libsysprof-capture/meson.build || die - sed -i -e 's/pkgconfig\.generate/subdir_done()\npkgconfig\.generate/' src/libsysprof-capture/meson.build || die - # We want to ship org.gnome.Sysprof3.Profiler.xml in sysprof-common for the benefit of x11-wm/mutter - sed -i -e "s|if get_option('libsysprof')|if false|g" src/meson.build || die -} - -src_configure() { - # -Dwith_sysprofd=host currently unavailable from ebuild - local emesonargs=( - $(meson_use gtk enable_gtk) - -Dlibsysprof=true - -Dwith_sysprofd=bundled - -Dsystemdunitdir=$(systemd_get_systemunitdir) - # -Ddebugdir - -Dhelp=true - $(meson_use unwind libunwind) - ) - 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." -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/dev-util/wiggle/wiggle-0.9-r1.ebuild b/dev-util/wiggle/wiggle-0.9-r1.ebuild index a4f8cb6cfd8b..e0f496b157ae 100644 --- a/dev-util/wiggle/wiggle-0.9-r1.ebuild +++ b/dev-util/wiggle/wiggle-0.9-r1.ebuild @@ -34,6 +34,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" sys-apps/groff + virtual/pkgconfig test? ( sys-process/time ) " |