diff options
Diffstat (limited to 'dev-util')
36 files changed, 269 insertions, 252 deletions
diff --git a/dev-util/abootimg/abootimg-20150323.ebuild b/dev-util/abootimg/abootimg-20150323.ebuild index 99295b458292..42bf4e6748cb 100644 --- a/dev-util/abootimg/abootimg-20150323.ebuild +++ b/dev-util/abootimg/abootimg-20150323.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 COMMIT="1ebeb393252ab5aeed62e34bc439b6728444f06e" -DESCRIPTION="Manipulate Android boot images." +DESCRIPTION="Manipulate Android boot images" HOMEPAGE="https://gitlab.com/ajs124/abootimg" SRC_URI="https://gitlab.com/ajs124/abootimg/repository/archive.tar.gz?ref=$COMMIT -> ${P}.tar.gz" diff --git a/dev-util/bpftool/bpftool-5.14.14.ebuild b/dev-util/bpftool/bpftool-5.14.14.ebuild index 0fadd43da688..c163c94b8f3b 100644 --- a/dev-util/bpftool/bpftool-5.14.14.ebuild +++ b/dev-util/bpftool/bpftool-5.14.14.ebuild @@ -25,7 +25,7 @@ S="${S_K}/tools/bpf/bpftool" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="caps" RDEPEND=" diff --git a/dev-util/cargo-ebuild/cargo-ebuild-0.4.0.ebuild b/dev-util/cargo-ebuild/cargo-ebuild-0.4.0.ebuild index c920b933e82f..08e7d4655ff6 100644 --- a/dev-util/cargo-ebuild/cargo-ebuild-0.4.0.ebuild +++ b/dev-util/cargo-ebuild/cargo-ebuild-0.4.0.ebuild @@ -158,7 +158,7 @@ CRATES=" inherit cargo -DESCRIPTION="Generates an ebuild for a package using the in-tree eclasses." +DESCRIPTION="Generates an ebuild for a package using the in-tree eclasses" HOMEPAGE="https://gitweb.gentoo.org/proj/cargo-ebuild.git" SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2 $(cargo_crate_uris)" diff --git a/dev-util/cargo-ebuild/cargo-ebuild-0.5.0.ebuild b/dev-util/cargo-ebuild/cargo-ebuild-0.5.0.ebuild index baac7f396164..060e8599f4db 100644 --- a/dev-util/cargo-ebuild/cargo-ebuild-0.5.0.ebuild +++ b/dev-util/cargo-ebuild/cargo-ebuild-0.5.0.ebuild @@ -136,7 +136,7 @@ CRATES=" inherit cargo -DESCRIPTION="Generates an ebuild for a package using the in-tree eclasses." +DESCRIPTION="Generates an ebuild for a package using the in-tree eclasses" HOMEPAGE="https://gitweb.gentoo.org/proj/cargo-ebuild.git" SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2 $(cargo_crate_uris)" diff --git a/dev-util/colorgcc/colorgcc-1.3.2-r7.ebuild b/dev-util/colorgcc/colorgcc-1.3.2-r7.ebuild index 66eeaa0a89fc..5843b51a93c8 100644 --- a/dev-util/colorgcc/colorgcc-1.3.2-r7.ebuild +++ b/dev-util/colorgcc/colorgcc-1.3.2-r7.ebuild @@ -3,7 +3,7 @@ EAPI=7 -DESCRIPTION="Perl script to colorise the gcc output." +DESCRIPTION="Perl script to colorise the gcc output" HOMEPAGE="http://schlueters.de/colorgcc.html" SRC_URI="mirror://gentoo/${P}.tar.gz" diff --git a/dev-util/gertty/gertty-1.6.0-r1.ebuild b/dev-util/gertty/gertty-1.6.0-r1.ebuild index 693158abf1cf..4c9bb783e535 100644 --- a/dev-util/gertty/gertty-1.6.0-r1.ebuild +++ b/dev-util/gertty/gertty-1.6.0-r1.ebuild @@ -6,7 +6,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} ) inherit distutils-r1 -DESCRIPTION="Gertty is a console-based interface to the Gerrit Code Review system." +DESCRIPTION="Gertty is a console-based interface to the Gerrit Code Review system" HOMEPAGE="https://pypi.org/project/gertty/" if [[ ${PV} == *9999 ]];then inherit git-r3 diff --git a/dev-util/gertty/gertty-9999.ebuild b/dev-util/gertty/gertty-9999.ebuild index ae3e1bd9d135..f411acf6dc1e 100644 --- a/dev-util/gertty/gertty-9999.ebuild +++ b/dev-util/gertty/gertty-9999.ebuild @@ -6,7 +6,7 @@ PYTHON_COMPAT=( python3_{6,7,8,9,10} ) inherit distutils-r1 -DESCRIPTION="Gertty is a console-based interface to the Gerrit Code Review system." +DESCRIPTION="Gertty is a console-based interface to the Gerrit Code Review system" HOMEPAGE="https://pypi.org/project/gertty/" if [[ ${PV} == *9999 ]];then inherit git-r3 diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest index 8f52eab219c5..3734c6fa53f3 100644 --- a/dev-util/glslang/Manifest +++ b/dev-util/glslang/Manifest @@ -1,2 +1 @@ DIST glslang-1.2.198.tar.gz 3427490 BLAKE2B 0a9b116665e12aaff61b3c9628bba2b6ad6fe0ca7fa9954f568a3a1a0d4cbc41975446fc6760eef09bdea6a5d4aa746957b54972a0556f04c8ac39ba3e6241f9 SHA512 99cb60b01dd017533bcfd3fb258f1cad8c8fc90bc90efe346460e10f7887d7dc16468c93a5ae3bacc7579a31f58c2efc34c7e473515f07d03d2308894778bab5 -DIST glslang-11.6.0.tar.gz 3419655 BLAKE2B fb510b0e6e5986da117fb3d1ea7f1c543c5ace7053693b813c16c038c980f1123bdc6936dce67e313a401012753cbb900b8760282b80e9257d981f7325ec3d91 SHA512 f7c1affdb4923758f9ff5cae894c40ca86e723850a6265d9c13f996311451bd84c70a178d8d6c0961dcee39c19d724f02d19a21ee6f67f1bb4cdbc618fdc12cf diff --git a/dev-util/glslang/glslang-1.2.198.ebuild b/dev-util/glslang/glslang-1.2.198.ebuild index 5ca782af2415..33ea0f99f2bf 100644 --- a/dev-util/glslang/glslang-1.2.198.ebuild +++ b/dev-util/glslang/glslang-1.2.198.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 ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86" S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}" fi diff --git a/dev-util/glslang/glslang-11.6.0.ebuild b/dev-util/glslang/glslang-11.6.0.ebuild deleted file mode 100644 index 10f4a6bae737..000000000000 --- a/dev-util/glslang/glslang-11.6.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_ECLASS="cmake" -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -inherit cmake-multilib python-any-r1 - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git" - inherit git-r3 -else - SNAPSHOT_COMMIT="${PV}" - SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86" - S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}" -fi - -DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator" -HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang" - -LICENSE="BSD" -SLOT="0" - -BDEPEND="${PYTHON_DEPS}" - -# Bug 698850 -RESTRICT="test" diff --git a/dev-util/ignition-cmake/ignition-cmake-2.8.0.ebuild b/dev-util/ignition-cmake/ignition-cmake-2.8.0.ebuild index 2770e6466ae3..0eea0863d610 100644 --- a/dev-util/ignition-cmake/ignition-cmake-2.8.0.ebuild +++ b/dev-util/ignition-cmake/ignition-cmake-2.8.0.ebuild @@ -5,7 +5,7 @@ EAPI=7 inherit cmake -DESCRIPTION="CMake modules to be used by the Ignition projects." +DESCRIPTION="CMake modules to be used by the Ignition projects" HOMEPAGE="https://github.com/ignitionrobotics/ign-cmake" SRC_URI="https://osrf-distributions.s3.amazonaws.com/ign-cmake/releases/${PN}2-${PV}.tar.bz2" diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest index 23045a41b3f6..fd415add0961 100644 --- a/dev-util/meson/Manifest +++ b/dev-util/meson/Manifest @@ -1,3 +1,3 @@ -DIST meson-0.59.1.tar.gz 1944678 BLAKE2B 08dee8ada7824faf93b730bd8cf86113fe85ecf57c53a7ee4be89371004e13b99e14933761398e6db5a359c5aad07a96f99c0b5be144a75c749e40d153cefa7f SHA512 c45e29869dc681675b2643c37c892e7fff365c051edce4f2ec278fc6cee25bac6818add819e4db69d2fe3c1ba9572fc55bb8f67fe791cdc9c187627c71b01963 DIST meson-0.59.4.tar.gz 1953211 BLAKE2B e8699c274e60708e798ab7a57e096e606ba1552d4062a909610f5a8db8d27b864a9b9f01f32d68f65e0dcc2a75add7916617861edcc6058fc44c312e7a56048c SHA512 e02d13a4af592078c4dc34a1d9531e49d3b99f0996bcc2b04d9b9b446f0f7748fc2ccfeb9e6090a9fd2d95ad06594c770f90a87fafd9b1974117f24c5fb491e3 DIST meson-0.60.2.tar.gz 1998788 BLAKE2B 7fa59723e49f34a016eb3692ac63ebf38b5a7db1bfada522cc317c8500e29107783ef386a1312aa1ed73018fd93b22c6ee81fa9511e80e85461469d0129581ff SHA512 96064b49a479f81d6def321b4c3c24073b307c3ecd917ab2be2020fedf102da119b205e3d88b6fd1cd13af38949600abc72d4172967d651c78d2e9011276cb80 +DIST meson-0.60.3.tar.gz 2001124 BLAKE2B f66fb29d309f5dea9c0b1934e8b5dfc2b33586e06c6a2d616798d5724216035fe03a3f9b1c6976546d5d5c069734357d61a92aa43de01161cf1fe4297a1d1f2e SHA512 0aa6ef71c20cd899ebb0b202c6319e093e1df1c39fa58c94a1bb479efe630213272127346eab589948898d115d02d64f4bdffd892fbb9700884c1edf2dc6c6dc diff --git a/dev-util/meson/files/meson-tests-rust-add-libm.patch b/dev-util/meson/files/meson-tests-rust-add-libm.patch deleted file mode 100644 index 45803976bb9b..000000000000 --- a/dev-util/meson/files/meson-tests-rust-add-libm.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 7ad54cce49ce22b063e0cd56edb4b7f722dc5e8e Mon Sep 17 00:00:00 2001 -From: Dominique Leuenberger <dimstar@opensuse.org> -Date: Wed, 29 Sep 2021 14:20:53 +0200 -Subject: [PATCH] tests/rust: add libm to fix build with rust 1.55 - -Fixes #9309 ---- - test cases/rust/5 polyglot static/meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/test cases/rust/5 polyglot static/meson.build b/test cases/rust/5 polyglot static/meson.build -index de2e61bcbc3..a6e9550b6e2 100644 ---- a/test cases/rust/5 polyglot static/meson.build -+++ b/test cases/rust/5 polyglot static/meson.build -@@ -2,6 +2,7 @@ project('static rust and c polyglot executable', 'c', 'rust') - - deps = [ - meson.get_compiler('c').find_library('dl', required: false), -+ meson.get_compiler('c').find_library('m', required: false), - dependency('threads'), - ] - diff --git a/dev-util/meson/meson-0.59.1-r1.ebuild b/dev-util/meson/meson-0.60.3.ebuild index c64c0dcc8f15..a3e1b8ae03a1 100644 --- a/dev-util/meson/meson-0.59.1-r1.ebuild +++ b/dev-util/meson/meson-0.60.3.ebuild @@ -1,7 +1,7 @@ # Copyright 2016-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{6,7,8,9,10} ) if [[ ${PV} = *9999* ]]; then @@ -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 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi inherit distutils-r1 toolchain-funcs @@ -33,11 +33,6 @@ DEPEND=" ) " -PATCHES=( - "${FILESDIR}/meson-mcompile-treat-load-average-as-a-float.patch" - "${FILESDIR}/meson-tests-rust-add-libm.patch" -) - python_prepare_all() { local disable_unittests=( # ASAN and sandbox both want control over LD_PRELOAD @@ -88,7 +83,7 @@ python_test() { # If JAVA_HOME is not set, meson looks for javac in PATH. # If javac is in /usr/bin, meson assumes /usr/include is a valid # JDK include path. Setting JAVA_HOME works around this broken - # autodection. If no JDK is installed, we should end up with an empty + # autodetection. If no JDK is installed, we should end up with an empty # value in JAVA_HOME, and the tests should get skipped. export JAVA_HOME=$(java-config -O 2>/dev/null) diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild index 97e443bd1f18..a3e1b8ae03a1 100644 --- a/dev-util/meson/meson-9999.ebuild +++ b/dev-util/meson/meson-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 2016-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{6,7,8,9,10} ) if [[ ${PV} = *9999* ]]; then @@ -83,7 +83,7 @@ python_test() { # If JAVA_HOME is not set, meson looks for javac in PATH. # If javac is in /usr/bin, meson assumes /usr/include is a valid # JDK include path. Setting JAVA_HOME works around this broken - # autodection. If no JDK is installed, we should end up with an empty + # autodetection. If no JDK is installed, we should end up with an empty # value in JAVA_HOME, and the tests should get skipped. export JAVA_HOME=$(java-config -O 2>/dev/null) diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest index 85e69239a19a..7659e13876b4 100644 --- a/dev-util/pkgcheck/Manifest +++ b/dev-util/pkgcheck/Manifest @@ -1 +1,2 @@ DIST pkgcheck-0.10.8.tar.gz 460288 BLAKE2B aab2abdd9eaee483d580180753fc719127b7c7d0024b834e9199101aa2d18684ec7804efc4ddf59f4a44c0cc6c2896f437d4a7a9fe4496813be4a3a8d33ce7ad SHA512 9a186e032b86e1b565d6198dc9a993a9a8ef065e43f431d6d6dd9bbd6c32fe91501612984c7e3b2092754450c992fc683270d62c29ec85beeb97674b07a9ba9a +DIST pkgcheck-0.10.9.tar.gz 460614 BLAKE2B 5b581cf5acd6cf46d72bb3c928a93a20e3b2f552d447617eaf2b9ac50cd7956f9a43fa7b17932b27fa8dafc6d49e41cb8553e4a9059b0ef5fd769713deb6fb12 SHA512 cc800f89944353dec5a4293968a16c132e573b309b6074d4f950b993dab7ea8c51decf3921bd34d3b04520c932a932d27e6e969c8dcf86d20fd6917265d474b6 diff --git a/dev-util/pkgcheck/pkgcheck-0.10.9.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.9.ebuild new file mode 100644 index 000000000000..7db4e9c3321f --- /dev/null +++ b/dev-util/pkgcheck/pkgcheck-0.10.9.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) +DISTUTILS_IN_SOURCE_BUILD=1 +inherit distutils-r1 optfeature + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git" + inherit git-r3 +else + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +fi + +DESCRIPTION="pkgcore-based QA utility for ebuild repos" +HOMEPAGE="https://github.com/pkgcore/pkgcheck" + +LICENSE="BSD MIT" +SLOT="0" + +if [[ ${PV} == *9999 ]]; then + RDEPEND=" + ~dev-python/snakeoil-9999[${PYTHON_USEDEP}] + ~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]" +else + RDEPEND=" + >=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}] + >=sys-apps/pkgcore-0.12.8[${PYTHON_USEDEP}]" +fi +RDEPEND+=" + dev-python/chardet[${PYTHON_USEDEP}] + dev-python/lazy-object-proxy[${PYTHON_USEDEP}] + dev-python/lxml[${PYTHON_USEDEP}] + dev-python/pathspec[${PYTHON_USEDEP}] + >=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-vcs/git + ) +" + +distutils_enable_tests setup.py + +src_test() { + local -x PYTHONDONTWRITEBYTECODE= + distutils-r1_src_test +} + +python_install_all() { + local DOCS=( NEWS.rst ) + [[ ${PV} == *9999 ]] || doman man/* + distutils-r1_python_install_all +} + +pkg_postinst() { + optfeature "Network check support" dev-python/requests + optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version +} diff --git a/dev-util/rosdep/rosdep-0.21.0.ebuild b/dev-util/rosdep/rosdep-0.21.0.ebuild index fae1e4bcd022..e4861ace2c87 100644 --- a/dev-util/rosdep/rosdep-0.21.0.ebuild +++ b/dev-util/rosdep/rosdep-0.21.0.ebuild @@ -29,7 +29,7 @@ SLOT="0" # Tests need network RESTRICT="test" -PROPERTIES="test_network" +PROPERTIES+=" test_network" RDEPEND=" dev-python/catkin_pkg[${PYTHON_USEDEP}] diff --git a/dev-util/rosdep/rosdep-9999.ebuild b/dev-util/rosdep/rosdep-9999.ebuild index fae1e4bcd022..e4861ace2c87 100644 --- a/dev-util/rosdep/rosdep-9999.ebuild +++ b/dev-util/rosdep/rosdep-9999.ebuild @@ -29,7 +29,7 @@ SLOT="0" # Tests need network RESTRICT="test" -PROPERTIES="test_network" +PROPERTIES+=" test_network" RDEPEND=" dev-python/catkin_pkg[${PYTHON_USEDEP}] diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest index b7a44b312769..ac29b24e5995 100644 --- a/dev-util/scons/Manifest +++ b/dev-util/scons/Manifest @@ -1,3 +1,4 @@ +DIST SCons-4.3.0.tar.gz 3065509 BLAKE2B c36e816357f908d91d532cacde06ed75f57386bb9386bf751dd4ec65580894d8e04ad86380e421008374fa8d8c798323f9f8fb52d7e3d7d85140300a8b388def SHA512 200e087a0a3de7d92d7da6bdb7f2dc0f5d9ff4908a9d6aef2feab8cacfb2e480b7d88efca8f7a84bd39620db2efceaca14f68e6edbf494b1c28b80e35ed14f2c DIST scons-4.1.0-user.html 1454432 BLAKE2B 9fac4d7bfb4b25708bc4cc48d952beb030f88181af5dfee63090f726b1a82443c192c63ec5939869967ef8f374e8599321212971439fb265fb050b263681c9f8 SHA512 74f1349fa61dac9e66cfb863cb3126d07ce5f421b3e87d0220eb32bd5017ba8f6cf96eb8cb5ee45c39022671aa9f2d0408d4039970c438a69c002445aea510be DIST scons-4.1.0-user.pdf 2691364 BLAKE2B a910a09fa936d4d6f8dc967676d5aa009aac58a5a4566399b3ddc3512ac0259731e6c5399722fefadb3b79d8f89a5257e2e9bc2fa4d65697c8293ab995248d64 SHA512 64584731a59b59b78283be3876ecca91d742f83da2653d0de17922bec01e3c9cea1ce2ce3c8dc718597910ba86ed2c8aff0f7ae371bf763439b57a6d5484e1a7 DIST scons-4.1.0.gh.tar.gz 5609204 BLAKE2B ede3d47a1ec652b9248681e26738073e9d01daab7ffeccc58f0fcadb79661e30edb9a35a511518e4a58459243acb027afd8fa5849b0f9e4bae451055f7b1a062 SHA512 f79b86bb09783767b3872cfb8efb665372714a604af2aaf3adc66eee63d3afe27bc6b2aab83813743c83f71c81c800d42842e916501787ba402ce2726dda9b44 @@ -6,3 +7,6 @@ DIST scons-4.2.0-user.html 1514655 BLAKE2B 036fd0e994d4a3dbf820e864c18f1dda2bb38 DIST scons-4.2.0-user.pdf 2813567 BLAKE2B 2787c9dbecaefccc5f4df2bcccc474ee69e9883f9efa8358f6da00690d9f3fad48f7b696908cbb4cc8f3b9c195f86e11c81301d931783e463d7b2f3a5d528fc3 SHA512 3c36879af2b40190b7b68b162cb39e32e1d7ee01fe063dabe5404d616ab3c9972ebc8a6ce4c0b54a633cfc6825808f93207132ac9c9cd60d9e6ca28e864d5f16 DIST scons-4.2.0.gh.tar.gz 5677165 BLAKE2B c298152db937810ab73afc304a9dc480c185ef0d6e86be5ec7f2022a7d1ed4d3df6ecc18148c3143d4e76a7ea0e50790db1224e66db68bace0759daba7f36a91 SHA512 138573f7203b52fad0527d8d88ceabe182273eff7e4b74125e0d7eda51c44408b07e2c702ee63214519392101d8bbb30013e6d34000eaeb530a816c17396de97 DIST scons-4.2.0.tar.gz 3043008 BLAKE2B 3e69189e45b8ecc956419d3b7d4d36a78ffe219ff87a18d17c511434cf4306635c245107e7978d8f6b86f65bd2ac028fa3c76ab1212806a692d355d7d8036645 SHA512 91d77c858a888621d41432f39970547830997c8e28a851bbab7c0f181afda564abef321befaa33cbe6fd5fc4ac85fa80f2349994956edcc99c027cf7f526bbf0 +DIST scons-4.3.0-user.html 1529873 BLAKE2B 9f5b1bc0ab1d47769d8475ab86b1ae40cfc3643013c6e19692caac50dc37a306b6fd4654ec95c0ad6ad89531e2098253c62db679c9921680955b6dc11c4b247a SHA512 82e2de098c16a354ee3546a39f3ad923d8a40831d69d31266a795f7ce1a8d42e258e650f59f1910f0497d2d053eeb94aa1216c2a2108ca441844445e587490b2 +DIST scons-4.3.0-user.pdf 2851016 BLAKE2B 75282daad0c12da3afa71a0b34447545c2d93ab4fd0589395acd4a04242bb387b35ef2fb0469a57b96eda25258a28f18bd3bb693c6e2b02dc4e6b621a10f0f33 SHA512 c404508ca13e043f8a6717711294fa8cf4a513da7a09285fc6d73342d1f2b4fb0f718faa8fe6ee5b5ab92acf5839dfa05b86004ab0e0fcd7449a31fd5f6f003b +DIST scons-4.3.0.gh.tar.gz 5704869 BLAKE2B a43b509b358d47ee73f7eb714d1239b4fdc33f38483c1a3e72c3a8082242d7bb1a4925958a2648782aa28f4c22a6e018aea8fec1139cf44c59e859f6f902d1d3 SHA512 2d91cf3045797c888d24db38d5b44576e56b271a2c4e9d28d7e16026451865f713990ff9e57fa3e0a1c19603c2d6adbbd1ba36d297c9dcce4db4139fcc51cd62 diff --git a/dev-util/scons/scons-4.3.0.ebuild b/dev-util/scons/scons-4.3.0.ebuild new file mode 100644 index 000000000000..ac6a3f070209 --- /dev/null +++ b/dev-util/scons/scons-4.3.0.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) +PYTHON_REQ_USE="threads(+)" + +inherit distutils-r1 multiprocessing + +MY_P="SCons-${PV}" +DESCRIPTION="Extensible Python-based build utility" +HOMEPAGE="https://www.scons.org/" +SRC_URI=" + https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${MY_P}.tar.gz + doc? ( + https://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf + https://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 )" +S="${WORKDIR}/${P}/src" + +LICENSE="MIT" +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 ~x64-solaris ~x86-solaris" +IUSE="doc test" +RESTRICT="!test? ( test )" + +BDEPEND=" + test? ( + dev-libs/libxml2[${PYTHON_USEDEP}] + dev-python/lxml[${PYTHON_USEDEP}] + ) +" + +PATCHES=( + # support env passthrough for Gentoo ebuilds + "${FILESDIR}"/scons-4.1.0-env-passthrough.patch + # respect CC, CXX, C*FLAGS, LDFLAGS by default + "${FILESDIR}"/scons-4.2.0-respect-cc-etc.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}/${MY_P}.tar.gz" || die +} + +src_prepare() { + # apply patches relatively to top directory + cd "${WORKDIR}/${P}" || die + distutils-r1_src_prepare + + if use test; then + local remove_tests=( + # TODO: does not respect PATH? + test/Clang + # broken + test/DVIPDF/DVIPDFFLAGS.py + test/Java/swig-dependencies.py + test/Java/multi-step.py + # broken by commas in date, sic! + test/option/option-v.py + test/Interactive/version.py + ) + + if ! use amd64 && ! use x86 ; then + # These tests are currently broken on arm and other non-amd64/x86 platforms + # Work seems to be ongoing in e.g. https://github.com/SCons/scons/pull/4022 to + # better plumb up the MSVC tests for alternative arches. + # Try again after 4.2.0. + # See also: https://pairlist4.pair.net/pipermail/scons-users/2020-November/008452.html + # bug #757534 + remove_tests+=( + test/MSVS/vs-7.0-scc-files.py + test/MSVS/vs-7.0-scc-legacy-files.py + test/MSVS/vs-7.1-scc-files.py + test/MSVS/vs-7.1-scc-legacy-files.py + test/MSVS/vs-scc-files.py + test/MSVS/vs-scc-legacy-files.py + ) + fi + + rm -r "${remove_tests[@]}" || die + fi +} + +python_test() { + local -x COLUMNS=80 + # 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)")" + + # 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() { + rm "${ED}"/usr/*.1 || die + distutils-r1_python_install_all + + doman *.1 + use doc && dodoc "${DISTDIR}/${P}"-user.{pdf,html} +} diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest index cfc3e38f3b09..f90a32a56fd1 100644 --- a/dev-util/spirv-headers/Manifest +++ b/dev-util/spirv-headers/Manifest @@ -1,2 +1 @@ DIST spirv-headers-1.2.198.tar.gz 416113 BLAKE2B d2f767a36830a3d1fa6289cabc5f87432473f6f3d3ab3d07b4c6a008a4917f00b3472e6ae9abf12c1a148e757d5a71f270a2ad944413ebdbefb484f498af74ce SHA512 a35167f8de66f2e16c6d2dccdd69f95c58b08abcdef5dac5a705e8e52af049ec9b0e2d0ef6fb732454a0671cd331b69bea75b24911599c0a2ce3972d40addfef -DIST spirv-headers-20210817.tar.gz 414897 BLAKE2B f10997c6bca46d48a592ce12b59817d31b0e5cd77fa0518c8ecb0d1da56d54a49562fb8f6fd355feb964f93129a6304ec14ed2a5f1776c130c8e3b727fd93192 SHA512 837ebac5afe05b2eb08029058240a8f08d49eca701201f93181e3a9076a15b67421122e8322a4230d6e21766dc85396be6415d352769791d6a44dbae59ce908b diff --git a/dev-util/spirv-headers/spirv-headers-1.2.198.ebuild b/dev-util/spirv-headers/spirv-headers-1.2.198.ebuild index 2c68a5d0e55c..a1de79a9796f 100644 --- a/dev-util/spirv-headers/spirv-headers-1.2.198.ebuild +++ b/dev-util/spirv-headers/spirv-headers-1.2.198.ebuild @@ -12,6 +12,6 @@ SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.ta LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86" S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}" diff --git a/dev-util/spirv-headers/spirv-headers-20210817.ebuild b/dev-util/spirv-headers/spirv-headers-20210817.ebuild deleted file mode 100644 index 562a1b7c16a8..000000000000 --- a/dev-util/spirv-headers/spirv-headers-20210817.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2021 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="449bc986ba6f4c5e10e32828783f9daef2a77644" -SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86" - -S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}" diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest index d57d8a32e3ff..cb2ec4d8a7b7 100644 --- a/dev-util/spirv-llvm-translator/Manifest +++ b/dev-util/spirv-llvm-translator/Manifest @@ -1,2 +1,4 @@ DIST spirv-llvm-translator-11.1.0_pre20210212.tar.gz 702962 BLAKE2B 0c46b898e2d6c293b1db7b4aa65af7830869329cebc35e930b73f98dc038ae50d6adbdd9c6951e2ad427982d2a565c0925ecd056105cc37222b0d8ce7eb2e43b SHA512 3b8503be3ad65422f59ddbfd715a913dd6dab9416a14aea9e6a6793b2c959edaaab5433a3e253ee84c0b3644024a1f8a6b563af65e7aaad209c5f51e524cc96b DIST spirv-llvm-translator-12.0.0.tar.gz 1378222 BLAKE2B 059409364403316f84521e231bc14cade2875c2b914acea95619b0920ae4f13babb26411b20fead1d7a028320fa3aea637d087d869759cb23e3266753b5b2f46 SHA512 c23ef81802d2bf743564762815d7375a804bdf8029efd7430faea0b48b5e30a9778c1175f52309b522a07aadf8ff77461b912c1fb3b95af9b09273a483eac82a +DIST spirv-llvm-translator-13.0.0-rename-OpConstFunctionPointerINTEL.patch.bz2 3632 BLAKE2B b2c3ed9ff1040fef12cd5b7962c71f2e52febbf1e1d1d06bee079093940c32e67f7c246c92876207f296677bd655f91447d0ce837f191cd0d4cfb66adfb11a62 SHA512 bba6a9b838ebf0bd29f5fa906fefcecdb1b3832b15ac1af8a1ed86da0e988385172b1a51468a4d8d97352c4a57c3e224f12d7e24b7a202a38353e2dbd3a2c27c +DIST spirv-llvm-translator-13.0.0.tar.gz 1436324 BLAKE2B 254450f153a0f0d7c0a75005705f4a7d90effa1e6bcde0d6b931195e4a925ddc34896e66b686c55583d50ab99a9e1e45ad1c0600f7fa4eaa2039642460e9b711 SHA512 1ce7a38c2c3447249e19d50063a7a2acf32699905572950e4f102d8ce1680785433035154b7b55782d5a56211a50e042aef775836f37c33fe847b347a02b5a04 diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-13.0.0.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-13.0.0.ebuild new file mode 100644 index 000000000000..e7c554809d4d --- /dev/null +++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-13.0.0.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_ECLASS=cmake + +inherit cmake-multilib flag-o-matic llvm + +MY_PN="SPIRV-LLVM-Translator" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR" +HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator" +SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-rename-OpConstFunctionPointerINTEL.patch.bz2" +S="${WORKDIR}/${MY_P}" + +LICENSE="UoI-NCSA" +SLOT="$(ver_cut 1)" +KEYWORDS="~amd64" +IUSE="test +tools" + +REQUIRED_USE="test? ( tools )" +RESTRICT="!test? ( test )" + +RDEPEND="sys-devel/clang:${SLOT}=[${MULTILIB_USEDEP}] + dev-util/spirv-headers" +DEPEND="${RDEPEND}" +BDEPEND="test? ( dev-python/lit )" + +LLVM_MAX_SLOT="${SLOT}" + +PATCHES=( + "${WORKDIR}"/${P}-rename-OpConstFunctionPointerINTEL.patch +) + +src_prepare() { + append-flags -fPIC + cmake_src_prepare +} + +multilib_src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})" + -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${BROOT}/usr/include/spirv" + -DLLVM_BUILD_TOOLS=$(usex tools "ON" "OFF") + -DLLVM_SPIRV_INCLUDE_TESTS=$(usex test "ON" "OFF") + ) + cmake_src_configure +} + +multilib_src_test() { + # Some tests fail on amd64 when ABI==x86 + if multilib_is_native_abi; then + lit "${BUILD_DIR}/test" || die "Error running tests for ABI ${ABI}" + fi +} diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest index a3899134f0bc..df28c0831ed8 100644 --- a/dev-util/spirv-tools/Manifest +++ b/dev-util/spirv-tools/Manifest @@ -1,2 +1 @@ DIST spirv-tools-1.2.198.tar.gz 2888894 BLAKE2B 036f2457863c1bff47939d6238d6f270baee67253edeb5dc4cb1270eb32b9fdb6427c959bde4c5496056784c0334922276b9a4e0ac5530a4c662abdf0190f119 SHA512 90a53d0c7c6dfeb5ef2ee3e8b92c00cd39211f18f57aaeae079ac95b94ec4c839443017eb39fbee0f737d0c070ed64e2369609e81dba149f08676724b254f714 -DIST spirv-tools-20210825.tar.gz 2852443 BLAKE2B 87c24d6c5506097cf24b3008450e54a652c1e9d0ad1dd61499b65cc93e4783db2f86b3138ef2c8f33b8b242fc55dfa279d135d347bd21dd8977773ae302ae430 SHA512 d99cb85527810413e6df386342a5d0de201defe401fd175f0cd15604dcba0f8c157b63b4d49be64b5161b6a97c0a6ae16fe82080368ec6eb64cd71300d056bea diff --git a/dev-util/spirv-tools/spirv-tools-1.2.198.ebuild b/dev-util/spirv-tools/spirv-tools-1.2.198.ebuild index 606f0fcf1794..de5b9d2c4bdb 100644 --- a/dev-util/spirv-tools/spirv-tools-1.2.198.ebuild +++ b/dev-util/spirv-tools/spirv-tools-1.2.198.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then 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 ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86" S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT} fi diff --git a/dev-util/spirv-tools/spirv-tools-20210825.ebuild b/dev-util/spirv-tools/spirv-tools-20210825.ebuild deleted file mode 100644 index 3cb11d65927e..000000000000 --- a/dev-util/spirv-tools/spirv-tools-20210825.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2021 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_{6,7,8,9,10} ) -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="1fbed83c8aab8517d821fcb4164c08567951938f" - SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86" - S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT} -fi - -DESCRIPTION="Provides an API and commands for processing SPIR-V modules" -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-20210817" -DEPEND="${COMMON_DEPEND}" -RDEPEND="" -BDEPEND="${PYTHON_DEPS} - ${COMMON_DEPEND}" - -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/strace/strace-5.15.ebuild b/dev-util/strace/strace-5.15.ebuild index 8dffe5746047..9c248f5d99ea 100644 --- a/dev-util/strace/strace-5.15.ebuild +++ b/dev-util/strace/strace-5.15.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 else SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="A useful diagnostic, instructional, and debugging tool" diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest index 26cb564c105c..e11600705d59 100644 --- a/dev-util/vulkan-headers/Manifest +++ b/dev-util/vulkan-headers/Manifest @@ -1,2 +1 @@ -DIST vulkan-headers-1.2.189.tar.gz 1191160 BLAKE2B cd322dfd4ad9010cf4a7d84e8bd450fee48008f43aebed69253d42e786d446d1afa2fc32915d7021b8f75fe6a70400ca57e06a20b075aad78a524f811b3ba1fe SHA512 883a3d69c48bea307681791c6e9d5efa4f956c5beba70d3cac87826bade633cbc98feeaa34607a4754c460cb262e0d6a7b20ecae5c3fccb765181d04402daa13 DIST vulkan-headers-1.2.198.tar.gz 1288107 BLAKE2B 91ec6879af46418e9b4f67124f0aff96d6f748c7eb02b500350f350f1b323af9cbe34c383d3d03643cdd35205e286738072c81a192bb3de4cad7c9e525dbb1d0 SHA512 c46232df1f121e69124c4faf5749032f8b5a1bd03d8ca69a24450008cd0af9c5ce000e48ab5c491cdfffa765498022f50d15476cded958dc25bd90e139c71829 diff --git a/dev-util/vulkan-headers/vulkan-headers-1.2.189.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.2.189.ebuild deleted file mode 100644 index 482f4914180d..000000000000 --- a/dev-util/vulkan-headers/vulkan-headers-1.2.189.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2021 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/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86" - S="${WORKDIR}"/${MY_PN}-${PV} -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.2.198.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.2.198.ebuild index e103871e226d..789f82235589 100644 --- a/dev-util/vulkan-headers/vulkan-headers-1.2.198.ebuild +++ b/dev-util/vulkan-headers/vulkan-headers-1.2.198.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 ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm arm64 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 87b398c54a87..035961f14a8b 100644 --- a/dev-util/vulkan-tools/Manifest +++ b/dev-util/vulkan-tools/Manifest @@ -1,2 +1 @@ -DIST vulkan-tools-1.2.189.tar.gz 849041 BLAKE2B ae38aaca9789276bcb93c5c297c9113fcced4cd3417f0619c0e1fb539df5891e725a77785fbeca0c8957644af7245ff9f0a3981cf5f8726f4f231e39f05ddfbb SHA512 3ac4f79a6ba18690026d1933b7f3c45769f9759e25d19508bc34d431454dc548e1f738ae3d804db2864a97de3b8628f167bc00dcad4059eaeb1714e4fdd3507a DIST vulkan-tools-1.2.198.tar.gz 847429 BLAKE2B 8927740853eb45d495996a8be0bae3d40f84f14f12eb838474241745321d7337a6bae7e118bd626fbb15f8ffd42d574a04c93bd3aca0b3373976d7d976c05d2d SHA512 304ce76c47d4adef3a286439712ef4fd3f08ec8e47ed0e2a37162f9cac5e08af3c7b7fb449fddd4772080d678d84db9e238a5db4d98c7d4ee5f6d87a3f5c8f5f diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.189-r1.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.189-r1.ebuild deleted file mode 100644 index 3c66b603f619..000000000000 --- a/dev-util/vulkan-tools/vulkan-tools-1.2.189-r1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2021 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_{6,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/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv" - S="${WORKDIR}"/${MY_PN}-${PV} -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:=[${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.2.198.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.198.ebuild index 4caaa9d81547..b0da8c0a25c4 100644 --- a/dev-util/vulkan-tools/vulkan-tools-1.2.198.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-1.2.198.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 ~ppc ~ppc64 ~riscv" + KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv" S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0 fi |