diff options
Diffstat (limited to 'dev-util')
29 files changed, 67 insertions, 705 deletions
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest index 23bbbbcaec7d..633589e56b4b 100644 --- a/dev-util/gdbus-codegen/Manifest +++ b/dev-util/gdbus-codegen/Manifest @@ -1,3 +1,2 @@ -DIST glib-2.72.1.tar.xz 4890672 BLAKE2B 95a563b5388ee4d239034fef6ec071a7d608be3dd5de716e7c5baca641a70d19ce6b14b693ac1041f65bfae815e5b829f02983234d1bbe6546cdd1c5159a8eab SHA512 341acc91b4bed7a980b396888a0ab504337b6870422a708ea3e178598c028bc230457a328c35db469d92b0067ce8ec35d08dbcfe6d5af3340b574d41c0131913 DIST glib-2.72.2.tar.xz 4891264 BLAKE2B 932613e69edc302793c5db9fdff36fb4ec04df3820aaa3dc2ef6cc01b8124bee3fe2f96cabd9c44b49601425ba7af072f8ad6fd331f6247e00ab6fc94f7f2620 SHA512 9a1121be1d5b1de50fb732d55298a8deb6e6e7fe02e06ab18fdfbc51a0f0d77c13c5faf29a227b5746b0f8c1c0502fc79c36cef2b7a62c4701b9deffe5887e69 DIST glib-2.72.3.tar.xz 4893484 BLAKE2B 1360c887b07ede3de3a7d31589f3dfc07ada2fe3e7901d3f30048ab9a1379357753ae142c6c107b3fcd6dd61e1401fbe6db22f0e89ea617db2c1073f1900cbe6 SHA512 8834ab7498577c2f659d135b87c27b34e1157be27f6c1fe5af0d64a94654f78cbe6a87e6868966849674c34e88a9d51d2de8d89f78f86aa1e1af3482761f0638 diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.72.1.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.72.1.ebuild deleted file mode 100644 index 04d697ee6327..000000000000 --- a/dev-util/gdbus-codegen/gdbus-codegen-2.72.1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -GNOME_ORG_MODULE="glib" -PYTHON_COMPAT=( python3_{7,8,9,10} ) -PYTHON_REQ_USE="xml" -DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_USE_SETUPTOOLS=no - -inherit gnome.org distutils-r1 - -DESCRIPTION="GDBus code and documentation generator" -HOMEPAGE="https://www.gtk.org/" - -LICENSE="LGPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" - -RDEPEND="${PYTHON_DEPS}" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-libs/libxslt - app-text/docbook-xsl-stylesheets -" - -S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen" - -python_prepare_all() { - PATCHES=( - "${FILESDIR}/${PN}-2.56.1-sitedir.patch" - ) - distutils-r1_python_prepare_all - - local MAJOR_VERSION=$(ver_cut 1) - local MINOR_VERSION=$(ver_cut 2) - sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die - sed -e "s:@VERSION@:${PV}:" \ - -e "s:@MAJOR_VERSION@:${MAJOR_VERSION}:" \ - -e "s:@MINOR_VERSION@:${MINOR_VERSION}:" config.py.in > config.py || die - cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed" - sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed" -} - -do_xsltproc_command() { - # Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils) - xsltproc \ - --nonet \ - --stringparam man.output.quietly 1 \ - --stringparam funcsynopsis.style ansi \ - --stringparam man.th.extra1.suppress 1 \ - --stringparam man.authors.section.enabled 0 \ - --stringparam man.copyright.section.enabled 0 \ - -o "${2}" \ - http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \ - "${1}" || die "manpage generation failed" -} - -src_compile() { - distutils-r1_src_compile - do_xsltproc_command "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1" -} - -src_test() { - einfo "Skipping tests. This package is tested by dev-libs/glib" - einfo "when merged with FEATURES=test" -} - -python_install_all() { - distutils-r1_python_install_all # no-op, but prevents QA warning - doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1" -} diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.72.2.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.72.2.ebuild index c41edadabff8..4616655755bf 100644 --- a/dev-util/gdbus-codegen/gdbus-codegen-2.72.2.ebuild +++ b/dev-util/gdbus-codegen/gdbus-codegen-2.72.2.ebuild @@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/" LICENSE="LGPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" RDEPEND="${PYTHON_DEPS}" DEPEND="${RDEPEND}" diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest index 23bbbbcaec7d..633589e56b4b 100644 --- a/dev-util/glib-utils/Manifest +++ b/dev-util/glib-utils/Manifest @@ -1,3 +1,2 @@ -DIST glib-2.72.1.tar.xz 4890672 BLAKE2B 95a563b5388ee4d239034fef6ec071a7d608be3dd5de716e7c5baca641a70d19ce6b14b693ac1041f65bfae815e5b829f02983234d1bbe6546cdd1c5159a8eab SHA512 341acc91b4bed7a980b396888a0ab504337b6870422a708ea3e178598c028bc230457a328c35db469d92b0067ce8ec35d08dbcfe6d5af3340b574d41c0131913 DIST glib-2.72.2.tar.xz 4891264 BLAKE2B 932613e69edc302793c5db9fdff36fb4ec04df3820aaa3dc2ef6cc01b8124bee3fe2f96cabd9c44b49601425ba7af072f8ad6fd331f6247e00ab6fc94f7f2620 SHA512 9a1121be1d5b1de50fb732d55298a8deb6e6e7fe02e06ab18fdfbc51a0f0d77c13c5faf29a227b5746b0f8c1c0502fc79c36cef2b7a62c4701b9deffe5887e69 DIST glib-2.72.3.tar.xz 4893484 BLAKE2B 1360c887b07ede3de3a7d31589f3dfc07ada2fe3e7901d3f30048ab9a1379357753ae142c6c107b3fcd6dd61e1401fbe6db22f0e89ea617db2c1073f1900cbe6 SHA512 8834ab7498577c2f659d135b87c27b34e1157be27f6c1fe5af0d64a94654f78cbe6a87e6868966849674c34e88a9d51d2de8d89f78f86aa1e1af3482761f0638 diff --git a/dev-util/glib-utils/glib-utils-2.72.1.ebuild b/dev-util/glib-utils/glib-utils-2.72.1.ebuild deleted file mode 100644 index b48c6b557d2b..000000000000 --- a/dev-util/glib-utils/glib-utils-2.72.1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{7,8,9,10} ) -GNOME_ORG_MODULE="glib" - -inherit gnome.org python-single-r1 - -DESCRIPTION="Build utilities for GLib using projects" -HOMEPAGE="https://www.gtk.org/" - -LICENSE="LGPL-2.1+" -SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" - -RDEPEND="${PYTHON_DEPS}" -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/glib-utils/glib-utils-2.72.2.ebuild b/dev-util/glib-utils/glib-utils-2.72.2.ebuild index 6732370edfbf..b48c6b557d2b 100644 --- a/dev-util/glib-utils/glib-utils-2.72.2.ebuild +++ b/dev-util/glib-utils/glib-utils-2.72.2.ebuild @@ -14,7 +14,7 @@ LICENSE="LGPL-2.1+" SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature REQUIRED_USE="${PYTHON_REQUIRED_USE}" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" RDEPEND="${PYTHON_DEPS}" DEPEND="${RDEPEND}" diff --git a/dev-util/glslang/glslang-1.3.216.ebuild b/dev-util/glslang/glslang-1.3.216.ebuild index d5b083dfc3b0..aa39caaf3d57 100644 --- a/dev-util/glslang/glslang-1.3.216.ebuild +++ b/dev-util/glslang/glslang-1.3.216.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then else SNAPSHOT_COMMIT="sdk-${PV}.0" SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm ~arm64 ~loong ppc ppc64 ~riscv x86" + KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}" fi diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest index 65b62a9908fa..828deb59a157 100644 --- a/dev-util/gnome-builder/Manifest +++ b/dev-util/gnome-builder/Manifest @@ -1,2 +1 @@ -DIST gnome-builder-3.40.2.tar.xz 12083992 BLAKE2B 136c3e89378221116b5252a8472768888f11bd580cf9d1d524504f9000b8123ee479e19073630bb678cc7392b716e45d122b406dc7d44b13ba0ba77b435077e0 SHA512 e0d1f0f21fe0f681f87d1ad672cb5bf60df3ef16541fffd8ca62d447339371bdb5cbc10d8fc83496822d6eb35ad8078b095ff97d950d940d862d6fd7968147a4 DIST gnome-builder-42.1.tar.xz 13276028 BLAKE2B 657e362ab9a2df1c70d9071ecc010747e5c73bbaa1c0d903778720e4fe874361013cfca3fe162328dfae180502c4fcc68ee01f04d1329add874b9e8db41abcd1 SHA512 a04a71efb163808ed4bfc446334b8f9cabe33cd33c977c9047e4fb00042b18cf7095217b2e287a45efda863ef479fce11435a2d24d489ba1816e3f36a561244e diff --git a/dev-util/gnome-builder/gnome-builder-3.40.2.ebuild b/dev-util/gnome-builder/gnome-builder-3.40.2.ebuild deleted file mode 100644 index d02ed98aa9db..000000000000 --- a/dev-util/gnome-builder/gnome-builder-3.40.2.ebuild +++ /dev/null @@ -1,183 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9,10} ) -DISABLE_AUTOFORMATTING=1 -FORCE_PRINT_ELOG=1 - -inherit gnome.org gnome2-utils llvm meson optfeature 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.67.4: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) - -Dplugin_color_picker=false # needs libportal - $(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 - - optfeature_header "Code beautifiers" - optfeature "Python" dev-python/autopep8 - optfeature "C/C++/Java" dev-util/uncrustify -} - -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/maturin/maturin-0.13.0.ebuild b/dev-util/maturin/maturin-0.13.0.ebuild index 7bd907a63470..341628211120 100644 --- a/dev-util/maturin/maturin-0.13.0.ebuild +++ b/dev-util/maturin/maturin-0.13.0.ebuild @@ -381,6 +381,19 @@ src_prepare() { use !debug || sed -i "s/^cargo_args = \[/&'--profile','dev',/" setup.py || die filter-lto # undefined references with ring crate + + # ensure rustls is disabled on arches where ring crate is problematic, + # keep in sync with src_configure below (bug #859577) + if use ppc64 || use s390; then + sed -i '/^if platform.machine/s/^if/if True or/' setup.py || die + fi +} + +src_configure() { + if use ppc64 || use s390; then + local myfeatures=( upload log human-panic ) # sync with setup.py + cargo_src_configure --no-default-features + fi } python_compile_all() { diff --git a/dev-util/shfmt/Manifest b/dev-util/shfmt/Manifest index 2a1bf631ebc5..418b8f58afae 100644 --- a/dev-util/shfmt/Manifest +++ b/dev-util/shfmt/Manifest @@ -1,2 +1,6 @@ -DIST shfmt-3.5.0-deps.tar.xz 3121980 BLAKE2B 411e7df230864d1692899b89c4b5e25f54582752a10bde30a8a5e1ae03da3b325353d9bab71b46795f3d285747fbbcc63dd367ecddc8055d5df45013c5f491ae SHA512 562fc2a58c0c115d132c9107c569f5139d7e1f817c91077b80151d0043601c328b083ce8261301689ce72deecabe3957bc11e4dc4388024234a2791c9f118743 -DIST shfmt-3.5.0.tar.gz 222262 BLAKE2B a54c91afd1da39084637aba43dc9e3af82c2c57dabdd3e24cd80bbfc5fed9632da0e98b5a65169dc439216218a4664afcc8dc77cd409f15a35cd0b505d39dd39 SHA512 9071a015369088dbba8eb7221305893095ebeaa72124e1ca964b7b1e6f34dedc9d11f2daa2f679d24637b04925cbf58427a24cc4885d8e918cb81844e71d3c6b +DIST github.com-golang-sys-9197077.tar.gz 1540407 BLAKE2B d1ae2fbbbb1aba2db1b3bbab07ce6ca7a8eb43ea1e4fbf690348c9ba3e5bcbc48add0619430a08a273e70b5c0e4380c237108198ccf74a8ac6aa538fc6b6b20a SHA512 9bff781a71306cfe2f8791a309f39e7ad5a904b1b82cca0caab77cea19e517ecc9da97949e44ee24e74dfee9acae20e9f14b069ef7fabd3a1baf4db27b512985 +DIST github.com-golang-term-ad39bd3.tar.gz 3891 BLAKE2B 16c707e5b25296e3f0f700d644ebfc84bb602aaf9f8490110197f1a6e0d7a8ea1eadef497f7e09a7aa751162aefae4ca9343d9a3cf95addd4c1af54bb19b2afe SHA512 c23cd5da67a6734cc8fb8c9bbda7286581cdd7d0182a0a8ddcc999e256c2c41ee3c4aa10cd000e7bc6734c8be61e48c709acee005e4fae02df903f56ba1bb22c +DIST github.com-google-renameio-f0e3298.tar.gz 9724 BLAKE2B 82e818a97eceb2d6917e5c1f21afe6284cc88d223b1af5992219d03dd6bc1f59a072413b913c3f6ffd2a919a40bf6c6db480bb36d7f15aafca513e156ab1f7fc SHA512 556d6df5328dde7aa46619fbe8cf2f1f00289544d1e96b23c97521d9f8b2773276c628a424f45f8d5720d17a3aec0080a3bbfcd3bcc8203ad30bac6a41a31b39 +DIST github.com-mvdan-editorconfig-e40951b.tar.gz 9303 BLAKE2B 46cefb76c0537c1dba29ed6ece9a8b29f9404c0adac03a08aa254de34a443a21c2302b5c8af6e71784a656cce04305e2085d06b9ac3ec9808cf00185ee84f458 SHA512 48c836caf69d8b751415ccc00b00451cc2aeed132b6f7662c3525bd059d6f231e78db789677e63b5f25637429f6eff4bd63ec7ace1b036293f22648d44038592 +DIST github.com-pkg-diff-5319263.tar.gz 11597 BLAKE2B 5be0365f1a3456710e4ad2e94da6b05b33fae6c8c611c7016568c6d2d3a8257994cc658320e25a8fd5e0ef9b02f9063dc73716ce68f9aba8425f92a0aefcca54 SHA512 63f5b5c1e0df55ceaecdd1988585639c3e5bfc4624e3ae85b419d3e3015a2de6944319636b387298b89ff406878ac26894aff66dd2837a670b1f6f999bafcdc6 +DIST shfmt-3.1.2.tar.gz 193379 BLAKE2B e970ccb34989e3272c9c937917370a1d60d3f19891d8cae1f390e69789755bec46ec6de17d5af77084150dc6c6ab4d6d2f9acb431d5da5dd3adbe5f5cd2b56ff SHA512 6e367a7a05c5e18d6de7f822ef181443b22d05f94a5fe5a0cf4759bc1e4a07dfac0e2704eb3025868e0f44c0e04a9cbd28dfe5a977381b2ba6fe274ac97ef29a diff --git a/dev-util/shfmt/metadata.xml b/dev-util/shfmt/metadata.xml index c20d3da1c785..7cf1ac1fff23 100644 --- a/dev-util/shfmt/metadata.xml +++ b/dev-util/shfmt/metadata.xml @@ -2,12 +2,10 @@ <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>ran.dall@icloud.com</email> - <name>Randall Vasquez</name> + <email>toffanin.mauro@gmail.com</email> + <name>Mauro Toffanin</name> + <description>Maintainer. Assign bugs to him</description> </maintainer> - <longdescription lang="en"> - A shell parser, formatter, and interpreter with bash support; includes shfmt. Supports POSIX Shell, Bash, and mksh. - </longdescription> - <origin>gentoo-guru-overlay</origin> + <origin>go-overlay</origin> </pkgmetadata>
\ No newline at end of file diff --git a/dev-util/shfmt/shfmt-3.1.2.ebuild b/dev-util/shfmt/shfmt-3.1.2.ebuild new file mode 100644 index 000000000000..dba936db29bc --- /dev/null +++ b/dev-util/shfmt/shfmt-3.1.2.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2020 Go Overlay Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +GOLANG_PKG_IMPORTPATH="github.com/mvdan" +GOLANG_PKG_IMPORTPATH_ALIAS="mvdan.cc" +GOLANG_PKG_NAME="sh" +GOLANG_PKG_ARCHIVEPREFIX="v" +GOLANG_PKG_BUILDPATH="/cmd/${PN}" +GOLANG_PKG_LDFLAGS="-X main.version=v${PV} -extldflags=-static" +GOLANG_PKG_HAVE_TEST=1 + +GOLANG_PKG_DEPENDENCIES=( + "github.com/google/renameio:f0e3298" #v0.1.0 + "github.com/pkg/diff:5319263" + "github.com/mvdan/editorconfig:e40951b" #v0.1.1 + + "github.com/golang/sys:9197077 -> golang.org/x" + "github.com/golang/term:ad39bd3 -> golang.org/x" +) + +inherit golang-single + +HOMEPAGE="https://github.com/mvdan/sh" +DESCRIPTION="A shell parser and formatter for POSIX shell and bash" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm arm64 x86" + +src_prepare() { + golang-single_src_prepare + + golang_fix_importpath_alias \ + "github.com/mvdan/editorconfig" \ + "mvdan.cc/editorconfig" +} diff --git a/dev-util/shfmt/shfmt-3.5.0.ebuild b/dev-util/shfmt/shfmt-3.5.0.ebuild deleted file mode 100644 index 96a20587ac5e..000000000000 --- a/dev-util/shfmt/shfmt-3.5.0.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 2020-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit go-module - -DESCRIPTION="Shell script formatter" -HOMEPAGE="https://github.com/mvdan/sh" -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/mvdan/sh.git" - RESTRICT="fetch mirror test" -else - SRC_URI="https://github.com/mvdan/sh/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - SRC_URI+=" https://github.com/ran-dall/portage-deps/raw/master/${P}-deps.tar.xz" - KEYWORDS="~amd64 ~arm64 ~x86" - RESTRICT="mirror test" - S="${WORKDIR}/${PN//fmt}-${PV}" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="+man" - -BDEPEND="man? ( app-text/scdoc )" - -src_unpack() { - default - if [[ ${PV} == *9999 ]]; then - git-r3_src_unpack - go-module_live_vendor - else - go-module_src_unpack - fi -} - -src_compile() { - ego build -v -ldflags "-s -w" -o "${PN}" "./cmd/shfmt" - if use man; then - scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1 || die "conversation of man page failed" - fi -} - -src_install() { - dobin ${PN} - if use man; then - doman shfmt.1 - fi -} diff --git a/dev-util/shfmt/shfmt-9999.ebuild b/dev-util/shfmt/shfmt-9999.ebuild deleted file mode 100644 index 96a20587ac5e..000000000000 --- a/dev-util/shfmt/shfmt-9999.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 2020-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit go-module - -DESCRIPTION="Shell script formatter" -HOMEPAGE="https://github.com/mvdan/sh" -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/mvdan/sh.git" - RESTRICT="fetch mirror test" -else - SRC_URI="https://github.com/mvdan/sh/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - SRC_URI+=" https://github.com/ran-dall/portage-deps/raw/master/${P}-deps.tar.xz" - KEYWORDS="~amd64 ~arm64 ~x86" - RESTRICT="mirror test" - S="${WORKDIR}/${PN//fmt}-${PV}" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="+man" - -BDEPEND="man? ( app-text/scdoc )" - -src_unpack() { - default - if [[ ${PV} == *9999 ]]; then - git-r3_src_unpack - go-module_live_vendor - else - go-module_src_unpack - fi -} - -src_compile() { - ego build -v -ldflags "-s -w" -o "${PN}" "./cmd/shfmt" - if use man; then - scdoc < cmd/shfmt/shfmt.1.scd > shfmt.1 || die "conversation of man page failed" - fi -} - -src_install() { - dobin ${PN} - if use man; then - doman shfmt.1 - fi -} diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest index 221d2a0da822..452f8b6a8804 100644 --- a/dev-util/spirv-headers/Manifest +++ b/dev-util/spirv-headers/Manifest @@ -1,2 +1 @@ -DIST spirv-headers-1.3.211.tar.gz 420022 BLAKE2B 4feea5f566401aef8c1aa6d677301b6871f8af5213d1f3d257719182b4109fef37c21342e38c6170bc4252a92ea9c2c45470bb9b23425a58f0d6d883982350a9 SHA512 39357d060c9bf030e8df71e734c2adb47832d7fa1a29825305cc92b3e87770a4fe383b534b798da008168bbeedc9f659f97b58a7b13c141d4f8ac94fc329f25f DIST spirv-headers-1.3.216.tar.gz 437011 BLAKE2B df48c7709c79b2132056d51e513b564539aaba335dbd68b4849aa871b688b9db5a5ec50142b3d448fe50ce6c4e5f2016e516e9e31441c8d1ad89c90c24bfe14f SHA512 951715cf62a643bfce6a3854f2206b95dd65e60b27355a2f290e829da0f06e19877e9dfcbf53f455b8a0524fb851a851742f3e16bb29be2f470cd62d3a8fc8f0 diff --git a/dev-util/spirv-headers/spirv-headers-1.3.211.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.211.ebuild deleted file mode 100644 index 294d87e79a46..000000000000 --- a/dev-util/spirv-headers/spirv-headers-1.3.211.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Machine-readable files for the SPIR-V Registry" -HOMEPAGE="https://www.khronos.org/registry/spir-v/" -EGIT_COMMIT="sdk-${PV}.0" -SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" - -S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}" diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest index 20c4be99a67f..406db9466a87 100644 --- a/dev-util/spirv-tools/Manifest +++ b/dev-util/spirv-tools/Manifest @@ -1,2 +1 @@ -DIST spirv-tools-1.3.211.tar.gz 2995491 BLAKE2B 545457d097d1e00720a3f97c1f2ed0f27c7b8b6e799ac22c6adbbed7fed17edee27e13c04848db70ee08ac3319ed9a322e22a9288184651f8aa4c03df0ab4057 SHA512 df7de69779baa7ea2269cb4c9813a7d8026763f7d4f7408ea5c160ca7bd670e46e75dcbf9d99ca5f1619f37f504e695d151ede5d5cd0ef675a8898bb297c5842 DIST spirv-tools-1.3.216.tar.gz 3019645 BLAKE2B 88fed3d48f50c50276746dd2b69740482c95c83df13312e081ae4066351454f0a3afaad2f146c629ee39dd34708dd105941e2bc374146a6e9806631227372105 SHA512 85418189962611724488ea61f1b123c55c2f5ab9dd50d028c7ed1ed2965ff23e2679d514e863ac16b60a3c7c6b4fbd05e7c7ff398415e0435d72c96363b95188 diff --git a/dev-util/spirv-tools/files/spirv-tools-1.3.211-cmake-librt.patch b/dev-util/spirv-tools/files/spirv-tools-1.3.211-cmake-librt.patch deleted file mode 100644 index 48afd5a736f1..000000000000 --- a/dev-util/spirv-tools/files/spirv-tools-1.3.211-cmake-librt.patch +++ /dev/null @@ -1,40 +0,0 @@ -https://github.com/KhronosGroup/SPIRV-Tools/commit/cb96abbf7affd986016f17dd09f9f971138a922b - -From: Chad Versace <chad@kiwitree.net> -Date: Thu, 14 Apr 2022 06:04:12 -0700 -Subject: [PATCH] Fix CMake for librt (#4773) - -In the installed file -/usr/lib64/cmake/SPIRV-Tools/SPIRV-ToolsTarget.cmake, occurences of -librt in the INTERFACE_LINK_LIBRARIES property are incorrect. The -property contains the absolute path to librt. In most situations, this -produces no problem. But when building in a sysroot, which is commonly -done when cross-compiling, the absolute path breaks dependent projects. - -For example, when building spirv-tools using the Chrome OS SDK, and -targeting the board 'volteer', where the build sysroot is -'/build/volteer', the file includes this line - INTERFACE_LINK_LIBRARIES "/build/volteer/usr/lib64/librt.so" -when it should instead say - INTERFACE_LINK_LIBRARIES "rt" - -The CMake documentation agrees [1]: - Note that it is not advisable to populate the - INTERFACE_LINK_LIBRARIES of a target with absolute paths to - dependencies. That would hard-code into installed packages the - library file paths for dependencies as found on the machine the - package was made on. - -[1] https://cmake.org/cmake/help/latest/prop_tgt/INTERFACE_LINK_LIBRARIES.html ---- a/source/CMakeLists.txt -+++ b/source/CMakeLists.txt -@@ -407,7 +407,7 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") - find_library(LIBRT rt) - if(LIBRT) - foreach(target ${SPIRV_TOOLS_TARGETS}) -- target_link_libraries(${target} ${LIBRT}) -+ target_link_libraries(${target} rt) - endforeach() - endif() - endif() - diff --git a/dev-util/spirv-tools/spirv-tools-1.3.211-r1.ebuild b/dev-util/spirv-tools/spirv-tools-1.3.211-r1.ebuild deleted file mode 100644 index c404270cbad8..000000000000 --- a/dev-util/spirv-tools/spirv-tools-1.3.211-r1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN=SPIRV-Tools -CMAKE_ECLASS="cmake" -PYTHON_COMPAT=( python3_{7,8,9,10} ) -PYTHON_REQ_USE="xml(+)" -inherit cmake-multilib python-any-r1 - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git" - inherit git-r3 -else - EGIT_COMMIT="sdk-${PV}.0" - SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" - S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT} -fi - -DESCRIPTION="Provides an API and commands for processing SPIR-V modules" -HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools" - -LICENSE="Apache-2.0" -SLOT="0" -# Tests fail upon finding symbols that do not match a regular expression -# in the generated library. Easily hit with non-standard compiler flags -RESTRICT="test" -COMMON_DEPEND="~dev-util/spirv-headers-${PV}" -DEPEND="${COMMON_DEPEND}" -RDEPEND="" -BDEPEND="${PYTHON_DEPS} - ${COMMON_DEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-cmake-librt.patch -) - -multilib_src_configure() { - local mycmakeargs=( - "-DSPIRV-Headers_SOURCE_DIR=${ESYSROOT}/usr/" - "-DSPIRV_WERROR=OFF" - "-DSPIRV_TOOLS_BUILD_STATIC=OFF" - "-DBUILD_SHARED_LIBS=ON" - ) - - cmake_src_configure -} diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest index 08956719538c..2af2d49a3dbd 100644 --- a/dev-util/umockdev/Manifest +++ b/dev-util/umockdev/Manifest @@ -1,2 +1 @@ DIST umockdev-0.17.13.tar.xz 489728 BLAKE2B 0bb4d912aa924c91ff1f4e2cd5ca4ddf81eea1db55ddf9e4cd9a7e9683ed92a268063601a38f7f0a6fb669b301fa9ace94c413e5958ad5587db0097acb2f066c SHA512 77863ad67be0995869b35d12dc43a809d2e67e95f727312ffd9f585c5bb1598c4d31f4909fcff5035dfccdbde8c36819daa633cae53c57ea2d9c3ede3587ec4d -DIST umockdev-0.17.9.tar.xz 487592 BLAKE2B 9b96ab26d31d927de240fcbbc3139f86ca3108240cbcc4d330a7793472b8b716aa3a573a7ee6a899562411192a6cffed707118a4e648802c84089c211dd870c3 SHA512 f56cc9a1513d05747eda2d36cd7c632502d7f70ccc612e11bdcd1610c96a2be9cf8e883282d024406485c44fb3cedc80dc803a12216ed61f593030d12ece21c9 diff --git a/dev-util/umockdev/umockdev-0.17.13.ebuild b/dev-util/umockdev/umockdev-0.17.13.ebuild index cd45e43bb084..beb634e37b30 100644 --- a/dev-util/umockdev/umockdev-0.17.13.ebuild +++ b/dev-util/umockdev/umockdev-0.17.13.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-util/umockdev/umockdev-0.17.9.ebuild b/dev-util/umockdev/umockdev-0.17.9.ebuild deleted file mode 100644 index 30879a481d0b..000000000000 --- a/dev-util/umockdev/umockdev-0.17.9.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{7,8,9,10} ) - -inherit meson-multilib python-any-r1 vala - -DESCRIPTION="Mock hardware devices for creating unit tests" -HOMEPAGE="https://github.com/martinpitt/umockdev/" -SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar.xz" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - net-libs/libpcap[${MULTILIB_USEDEP}] - virtual/libudev:=[${MULTILIB_USEDEP}] - >=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}] - >=dev-libs/gobject-introspection-1.32:= -" -DEPEND="${RDEPEND} - test? ( - ${PYTHON_DEPS} - dev-libs/libgudev:=[${MULTILIB_USEDEP}] - ) -" -BDEPEND=" - $(vala_depend) - app-arch/xz-utils - virtual/pkgconfig -" - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - default - vala_setup -} - -multilib_src_configure() { - export VALAC="$(type -P valac-$(vala_best_api_version))" - meson_src_configure -} - -multilib_src_test() { - meson_src_test --no-suite fails-valgrind -} diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest index 11e7d914edc5..4d1d460d1c52 100644 --- a/dev-util/vulkan-headers/Manifest +++ b/dev-util/vulkan-headers/Manifest @@ -1,2 +1 @@ -DIST vulkan-headers-1.3.211.tar.gz 1469275 BLAKE2B 4b9f5df8a07188b89c2be09e1d71279af1e1513f072d04e0da944b7697759e5c747bf40b78330edbf3ea71287921a9cc0fd9247d188ba9a761feb2bf04d0627f SHA512 35f849b0c493e6e1ecfeb91089085f3a567cce76466f8cc17acadfa2a2b3163420489c11fc5b547de52aed1575f28fc23c1a62ce6d321ccba3dd04fbf7e50ca3 DIST vulkan-headers-1.3.216.tar.gz 1489322 BLAKE2B a6bdc5d0517405b121861f18c330dc9db28df9c7d48994c6131e047ff640f6dd858cd3fa6efe70d8feb910d3b51c4a7d5676c8d87eefbddbedc30ff3b6af6ace SHA512 cabce62c3e681c2f89f808a0838300f859d1ea046f0036f44c5191f5a9ebbc15058507cd5d07519c34b81ba602058a137f27142c58d4e6c84b2ad382431d675a diff --git a/dev-util/vulkan-headers/vulkan-headers-1.3.211.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.3.211.ebuild deleted file mode 100644 index 767fada760a0..000000000000 --- a/dev-util/vulkan-headers/vulkan-headers-1.3.211.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN=Vulkan-Headers -inherit cmake - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git" - inherit git-r3 -else - SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" - S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0 -fi - -DESCRIPTION="Vulkan Header files and API registry" -HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers" - -LICENSE="Apache-2.0" -SLOT="0" - -BDEPEND=">=dev-util/cmake-3.10.2" diff --git a/dev-util/vulkan-headers/vulkan-headers-1.3.216.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.3.216.ebuild index ccecb4634168..767fada760a0 100644 --- a/dev-util/vulkan-headers/vulkan-headers-1.3.216.ebuild +++ b/dev-util/vulkan-headers/vulkan-headers-1.3.216.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm ~arm64 ~loong ppc ppc64 ~riscv x86" + KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0 fi diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest index 78a98f89ac09..7a6b8b318367 100644 --- a/dev-util/vulkan-tools/Manifest +++ b/dev-util/vulkan-tools/Manifest @@ -1,2 +1 @@ -DIST vulkan-tools-1.3.211.tar.gz 864436 BLAKE2B 09dcb3ce388962cff0e75837d07e58572ac1cbdabdc26edf7f6bd1740278f7ea871e0e14c4ac6a203fa13033616240d7338dfb1a52c4e2ed045ed28585bc62cf SHA512 36be2970dd42e12bf6f6644bc1b14f102af36f1297c33fadddca470b65d7d324532b20c071d2f0dd790d556cd99012a4fb80f185db6165ed3f09d1fd7e5c50e7 DIST vulkan-tools-1.3.216.tar.gz 866091 BLAKE2B 750b7d26de64844162f13bb5f2c82b134c0996e2bf23883b381fc05bb8eb26c19ef3a8dc4da63543096473845952115a8e3213ee3972baa9b01104adaa09ed82 SHA512 57d152072ecad744256397e357d756f82457929a026a29127a079ea7b3b805b99ece1e0eddfecb215882a8de18cf9ab3c32c4c90126e261bc582ad05ae6173e2 diff --git a/dev-util/vulkan-tools/vulkan-tools-1.3.211.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.3.211.ebuild deleted file mode 100644 index 4b6ada42e4f8..000000000000 --- a/dev-util/vulkan-tools/vulkan-tools-1.3.211.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN=Vulkan-Tools -CMAKE_ECLASS="cmake" -PYTHON_COMPAT=( python3_{7,8,9,10} ) -inherit cmake-multilib python-any-r1 - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git" - EGIT_SUBMODULES=() - inherit git-r3 -else - SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv" - S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0 -fi - -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 wayland +X" - -# Cube demo only supports one window system at a time -REQUIRED_USE="cube? ( ^^ ( X wayland ) )" - -BDEPEND="${PYTHON_DEPS} - >=dev-util/cmake-3.10.2 - cube? ( ~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}] ) -" -RDEPEND=" - ~media-libs/vulkan-loader-${PV}:=[${MULTILIB_USEDEP},wayland?,X?] - wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) - X? ( - x11-libs/libX11:=[${MULTILIB_USEDEP}] - x11-libs/libXrandr:=[${MULTILIB_USEDEP}] - ) -" -DEPEND="${RDEPEND} - ~dev-util/vulkan-headers-${PV} -" - -pkg_setup() { - MULTILIB_CHOST_TOOLS=( - /usr/bin/vulkaninfo - ) - - use cube && MULTILIB_CHOST_TOOLS+=( - /usr/bin/vkcube - /usr/bin/vkcubepp - ) - - python-any-r1_pkg_setup -} - -multilib_src_configure() { - local mycmakeargs=( - -DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG" - -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG" - -DCMAKE_SKIP_RPATH=ON - -DBUILD_VULKANINFO=ON - -DBUILD_CUBE=$(usex cube) - -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) - -DBUILD_WSI_XCB_SUPPORT=$(usex X) - -DBUILD_WSI_XLIB_SUPPORT=$(usex X) - -DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr" - ) - - use cube && mycmakeargs+=( - -DGLSLANG_INSTALL_DIR="${ESYSROOT}/usr" - -DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND) - ) - - cmake_src_configure -} - -multilib_src_install() { - cmake_src_install -} diff --git a/dev-util/vulkan-tools/vulkan-tools-1.3.216.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.3.216.ebuild index b6fc67bcf1f4..4b6ada42e4f8 100644 --- a/dev-util/vulkan-tools/vulkan-tools-1.3.216.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-1.3.216.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm ~arm64 ~loong ppc ppc64 ~riscv" + KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv" S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0 fi |