summaryrefslogtreecommitdiff
path: root/dev-util
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/android-tools/android-tools-31.0.3_p1.ebuild4
-rw-r--r--dev-util/android-tools/files/android-tools-31.0.3_p1-gcc12.patch15
-rw-r--r--dev-util/ccache/ccache-4.6-r1.ebuild2
-rw-r--r--dev-util/diffoscope/Manifest1
-rw-r--r--dev-util/diffoscope/diffoscope-212.ebuild108
-rw-r--r--dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild2
-rw-r--r--dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r3.ebuild2
-rw-r--r--dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r2.ebuild2
-rw-r--r--dev-util/scons/scons-4.3.0.ebuild2
-rw-r--r--dev-util/shadowman/shadowman-3.ebuild4
-rw-r--r--dev-util/vulkan-tools/vulkan-tools-1.3.211.ebuild2
-rw-r--r--dev-util/vulkan-tools/vulkan-tools-9999.ebuild2
12 files changed, 136 insertions, 10 deletions
diff --git a/dev-util/android-tools/android-tools-31.0.3_p1.ebuild b/dev-util/android-tools/android-tools-31.0.3_p1.ebuild
index 35a1c84cf3c8..b1d5d13e7394 100644
--- a/dev-util/android-tools/android-tools-31.0.3_p1.ebuild
+++ b/dev-util/android-tools/android-tools-31.0.3_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -54,6 +54,8 @@ src_prepare() {
eapply "${DISTDIR}/${PN}-31.0.3-disable-werror-boringssl.patch"
cd "${S}/vendor/boringssl" || die
eapply "${S}/patches/boringssl/0011-Disable-Werror.patch"
+ cd "${S}/vendor/adb" || die
+ eapply "${FILESDIR}/${PN}-31.0.3_p1-gcc12.patch"
cd "${S}"
eapply "${DISTDIR}/${PN}-31.0.3_p1-install-e2fsdroid-ext2simg.patch"
rm -r patches || die
diff --git a/dev-util/android-tools/files/android-tools-31.0.3_p1-gcc12.patch b/dev-util/android-tools/files/android-tools-31.0.3_p1-gcc12.patch
new file mode 100644
index 000000000000..aa313daf9042
--- /dev/null
+++ b/dev-util/android-tools/files/android-tools-31.0.3_p1-gcc12.patch
@@ -0,0 +1,15 @@
+From 752fc3bd9a971858dbb7b51a0ef0289232e67e58 Mon Sep 17 00:00:00 2001
+From: Mike Lothian <mike@fireburn.co.uk>
+Date: Sat, 14 May 2022 02:01:18 +0100
+Subject: [PATCH] Add functional include
+
+--- a/tls/include/adb/tls/tls_connection.h
++++ b/tls/include/adb/tls/tls_connection.h
+@@ -19,6 +19,7 @@
+ #include <stddef.h>
+ #include <stdint.h>
+
++#include <functional>
+ #include <string_view>
+ #include <vector>
+
diff --git a/dev-util/ccache/ccache-4.6-r1.ebuild b/dev-util/ccache/ccache-4.6-r1.ebuild
index d3c7ceee833f..046476bcf614 100644
--- a/dev-util/ccache/ccache-4.6-r1.ebuild
+++ b/dev-util/ccache/ccache-4.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://github.com/ccache/ccache/releases/download/v${P
LICENSE="GPL-3 LGPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
IUSE="doc redis +static-c++ test"
RESTRICT="!test? ( test )"
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 892c256e09ac..d0dd9cf0db64 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,3 +1,4 @@
DIST diffoscope-207.tar.gz 2707223 BLAKE2B e20f21c9e0acc78cadfce082f874b3e3cbbbd26cfa5041012eb07a347f177724506d1263b6636c71c5304993e52b81e8ac1fa82ee7231d892346ede2d00de37f SHA512 ebbcf3e7e41f042626f2d175cea027392fc52f65dd11ded8e2a65ed3d58129fe4948e6129c2aec74d58d8f6b58855ada23be8231b426a9473b165eba0f182955
DIST diffoscope-210.tar.gz 2709384 BLAKE2B 86b88dacf1d777bc63f7698197bc26abe638a25857fa43eac48051b91c07699d7beb9c0ac6bef6baf23fda895a07ca69342c9469a1853a38276f93fac11ea8fa SHA512 b0bd05ffb6112f5f6cdd7f9567ecbbda286226cc6874dfdded39b5d7221d2dbab4b01f02741f7e10a219bf03f94bc803c651963deebb67308a134b8e97fb3b05
DIST diffoscope-211.tar.gz 2709392 BLAKE2B c3570f88bcca7193a9650d970f2d943ebe33cc428c5ce3d4c5812588cbb57ae83dd795674e364d5acbb2d1504bd218036a6b04d9431786668386f28bdd6939b7 SHA512 8d674f41e955bd7537ba0cf7df0c886ff87b017a7d756246a183d9ec5ac3b286a798d60d29aadda550de6838b264a9e27fb37cf472b6e93caab7fce2fb65a1b1
+DIST diffoscope-212.tar.gz 2710499 BLAKE2B b941e16ab4520998ddfc039f1d68cc28f60415a1d9adc462651598b0e009cfcb9c5247f05be959a4a044647823b1a4987e6a40d1c1811ba039e67056b833fa8e SHA512 85dfc4dc4fc3bf78432de1782800db5c94a0d9d1d8369071cd2cfce0b0352cfbe51c4746bb2073ade47237911f08b86a2bb22529e13c19e91935c0126e2aadb8
diff --git a/dev-util/diffoscope/diffoscope-212.ebuild b/dev-util/diffoscope/diffoscope-212.ebuild
new file mode 100644
index 000000000000..1081d714e4fb
--- /dev/null
+++ b/dev-util/diffoscope/diffoscope-212.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10} pypy3 )
+PYTHON_REQ_USE="ncurses"
+inherit distutils-r1
+
+DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
+HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
+find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
+mono opendocument pascal pdf postscript R rpm sqlite squashfs
+ssh tar test tcpdump zip zlib zstd"
+
+RESTRICT="!test? ( test )"
+
+# pull in optional tools for tests:
+# img2txt: bug #797688
+# docx2txt: bug #797688
+BDEPEND="test? (
+ app-text/docx2txt
+ media-libs/libcaca
+ virtual/imagemagick-tools[jpeg]
+ )"
+RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
+ dev-python/libarchive-c[${PYTHON_USEDEP}]
+ dev-python/distro[${PYTHON_USEDEP}]
+ acl? ( sys-apps/acl )
+ binutils? ( sys-devel/binutils )
+ bzip2? ( app-arch/bzip2 )
+ libcaca? ( media-libs/libcaca )
+ colord? ( x11-misc/colord )
+ cpio? ( app-arch/cpio )
+ diff? ( sys-apps/diffutils )
+ docx? ( app-text/docx2txt )
+ dtc? ( sys-apps/dtc )
+ e2fsprogs? ( sys-fs/e2fsprogs )
+ file? ( sys-apps/file )
+ find? ( sys-apps/findutils )
+ gettext? ( sys-devel/gettext )
+ gif? ( media-libs/giflib )
+ gpg? ( app-crypt/gnupg )
+ haskell? ( dev-lang/ghc )
+ hdf5? ( sci-libs/hdf5 )
+ hex? ( app-editors/vim-core )
+ imagemagick? ( media-gfx/imagemagick )
+ iso? ( app-cdr/cdrtools )
+ java? ( virtual/jdk )
+ llvm? ( sys-devel/llvm )
+ lzma? ( app-arch/xz-utils )
+ mono? ( dev-lang/mono )
+ opendocument? ( app-text/odt2txt )
+ pascal? ( dev-lang/fpc )
+ pdf? (
+ app-text/pdftk
+ app-text/poppler
+ dev-python/PyPDF2[${PYTHON_USEDEP}]
+ )
+ postscript? ( app-text/ghostscript-gpl )
+ R? ( dev-lang/R )
+ rpm? ( app-arch/rpm )
+ sqlite? ( dev-db/sqlite:3 )
+ squashfs? ( sys-fs/squashfs-tools )
+ ssh? ( net-misc/openssh )
+ tar? ( app-arch/tar )
+ tcpdump? ( net-analyzer/tcpdump )
+ zip? ( app-arch/unzip )
+ zlib? ( app-arch/gzip )
+ zstd? ( app-arch/zstd )
+"
+# Presence if filemagic's magic.py breaks imports
+# of dev-python/python-magic: https://bugs.gentoo.org/716482
+RDEPEND+=" !dev-python/filemagic"
+
+EPYTEST_DESELECT=(
+ # Test seems to use different tarball
+ tests/test_presenters.py::test_text_proper_indentation
+
+ # Needs triage
+ tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
+ tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
+
+ # img2txt based failures, bug #797688
+ tests/comparators/test_ico_image.py::test_diff
+ tests/comparators/test_ico_image.py::test_diff_meta
+ tests/comparators/test_ico_image.py::test_diff_meta2
+ tests/comparators/test_ico_image.py::test_has_visuals
+ tests/comparators/test_jpeg_image.py::test_diff
+ tests/comparators/test_jpeg_image.py::test_compare_non_existing
+ tests/comparators/test_jpeg_image.py::test_diff_meta
+ tests/comparators/test_jpeg_image.py::test_has_visuals
+
+ # docx2txt based falures, bug #797688
+ tests/comparators/test_docx.py::test_diff
+
+ # Formatting
+ tests/test_source.py::test_code_is_black_clean
+)
+
+distutils_enable_tests pytest
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild
index d082ba67bbc6..76ea7da69341 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-10.0.0-r1.ebuild
@@ -58,7 +58,7 @@ src_configure() {
MW_LDFLAGS=${LDFLAGS} # keep non-stripped for gendef not respecting it
# likely cross-compiling from here, update toolchain variables
- ${MW_CROSS} &&
+ ${MW_CROSS} && [[ ! -v MINGW_BYPASS ]] &&
unset AR AS CC CPP CXX LD NM OBJCOPY OBJDUMP RANLIB RC STRIP
local CHOST=${CTARGET}
strip-unsupported-flags
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r3.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r3.ebuild
index 7eaca692a9d3..faedf8c7e909 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r3.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-8.0.0-r3.ebuild
@@ -60,7 +60,7 @@ src_configure() {
MW_LDFLAGS=${LDFLAGS} # keep non-stripped for gendef not respecting it
# likely cross-compiling from here, update toolchain variables
- ${MW_CROSS} &&
+ ${MW_CROSS} && [[ ! -v MINGW_BYPASS ]] &&
unset AR AS CC CPP CXX LD NM OBJCOPY OBJDUMP RANLIB RC STRIP
local CHOST=${CTARGET}
strip-unsupported-flags
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r2.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r2.ebuild
index d082ba67bbc6..76ea7da69341 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r2.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-9.0.0-r2.ebuild
@@ -58,7 +58,7 @@ src_configure() {
MW_LDFLAGS=${LDFLAGS} # keep non-stripped for gendef not respecting it
# likely cross-compiling from here, update toolchain variables
- ${MW_CROSS} &&
+ ${MW_CROSS} && [[ ! -v MINGW_BYPASS ]] &&
unset AR AS CC CPP CXX LD NM OBJCOPY OBJDUMP RANLIB RC STRIP
local CHOST=${CTARGET}
strip-unsupported-flags
diff --git a/dev-util/scons/scons-4.3.0.ebuild b/dev-util/scons/scons-4.3.0.ebuild
index 9786c1f49909..be542decfa3b 100644
--- a/dev-util/scons/scons-4.3.0.ebuild
+++ b/dev-util/scons/scons-4.3.0.ebuild
@@ -23,7 +23,7 @@ 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"
+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 ~x64-solaris ~x86-solaris"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-util/shadowman/shadowman-3.ebuild b/dev-util/shadowman/shadowman-3.ebuild
index a82abe5d8b80..726b5ca3aef4 100644
--- a/dev-util/shadowman/shadowman-3.ebuild
+++ b/dev-util/shadowman/shadowman-3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/shadowman/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE=""
RDEPEND="app-admin/eselect"
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.3.211.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.3.211.ebuild
index 8e14e3df46f1..a5c943972bf8 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.3.211.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.3.211.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 ~loong ~ppc ~ppc64 ~riscv"
S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
fi
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
index 8e14e3df46f1..a5c943972bf8 100644
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.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 ~loong ~ppc ~ppc64 ~riscv"
S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
fi
generated by cgit v1.3 (git 2.53.0) at 2026-10-15 05:27:14 +0000