summaryrefslogtreecommitdiff
path: root/dev-util
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/catalyst/catalyst-9999.ebuild8
-rw-r--r--dev-util/ccache/ccache-4.3.ebuild2
-rw-r--r--dev-util/diffoscope/diffoscope-177.ebuild16
-rw-r--r--dev-util/meson/Manifest2
-rw-r--r--dev-util/meson/meson-0.57.2.ebuild1
-rw-r--r--dev-util/meson/meson-0.58.1.ebuild (renamed from dev-util/meson/meson-0.56.2.ebuild)10
-rw-r--r--dev-util/meson/meson-9999.ebuild8
-rw-r--r--dev-util/pkgcheck/pkgcheck-0.10.1.ebuild2
-rw-r--r--dev-util/pkgdev/pkgdev-0.1.6.ebuild2
9 files changed, 36 insertions, 15 deletions
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 3bdf2f558bba..92a11773a637 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -46,28 +46,22 @@ RDEPEND="
iso? (
app-cdr/cdrtools
+ dev-libs/libisoburn
amd64? (
sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64]
)
- alpha? (
- dev-libs/libisoburn
- )
ia64? (
- dev-libs/libisoburn
sys-boot/grub[grub_platforms_efi-64]
sys-fs/mtools
)
ppc? (
- dev-libs/libisoburn
sys-boot/grub:2[grub_platforms_ieee1275]
)
ppc64? (
- dev-libs/libisoburn
sys-boot/grub:2[grub_platforms_ieee1275]
)
sparc? (
- dev-libs/libisoburn
sys-boot/grub:2[grub_platforms_ieee1275]
)
x86? (
diff --git a/dev-util/ccache/ccache-4.3.ebuild b/dev-util/ccache/ccache-4.3.ebuild
index 3f58044c6822..afcecdc6d9e4 100644
--- a/dev-util/ccache/ccache-4.3.ebuild
+++ b/dev-util/ccache/ccache-4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="test"
DEPEND=""
diff --git a/dev-util/diffoscope/diffoscope-177.ebuild b/dev-util/diffoscope/diffoscope-177.ebuild
index 4a1329168b84..5394d29bcb17 100644
--- a/dev-util/diffoscope/diffoscope-177.ebuild
+++ b/dev-util/diffoscope/diffoscope-177.ebuild
@@ -71,3 +71,19 @@ RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
# Presence if filemagic's magic.py breaks imports
# of dev-python/python-magic: https://bugs.gentoo.org/716482
RDEPEND+=" !dev-python/filemagic"
+
+distutils_enable_tests pytest
+
+python_test() {
+ local exclude=(
+ # 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
+
+ # needs triage
+ tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
+ )
+ epytest ${exclude[@]/#/--deselect }
+}
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 4e78be3c7562..cbe47bf22dc9 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,2 +1,2 @@
-DIST meson-0.56.2.tar.gz 1794847 BLAKE2B 350427e2ff4b4fe688220ca6279ff3361e1b2c7c573e1e0185ea9014fda73bc68929256073fe05855e3403638257e26477868d0a5683a5b91f6a74ee55a01f0e SHA512 3b6cc5cae31d756b251ecde3483d3710bceff50cfd03ef6cf6f939d9e599998e61fcb03a2ee09d6a6f9bfa2198f43e7f20447359de3bff1055febcf03e82e514
DIST meson-0.57.2.tar.gz 1853721 BLAKE2B 9c167a21745719589a165e7ffc31007bd6307b347027f390fd660b2f44b5a2e6d8f36e999e15fa4b28ae269ddb0bb3897e0297288c59b62cc493aad058126293 SHA512 a3b0bf3d5e1d1b7ac7c97313f43046c94aa2a6b21964958569c89764dfda08db166adb89d48cbfad735bd472114587a71089d5e8b4f0fce04c3289da21b3f40e
+DIST meson-0.58.1.tar.gz 1896205 BLAKE2B d42e04b262c6715ba2776f64d2e616016381303b07e609c804becf72db2ebd8ef08030c969f43813b2072552cb76974b2ed84f2da6d6c809ad612169d580395c SHA512 64ac1a9bcc642fb6d37c4b677d8b7db16d821f852f927a980d3fb1c149d680b7ff2c8d03676c6772666d46a33b6ce8674220433d302fcd92d13d9818558d6453
diff --git a/dev-util/meson/meson-0.57.2.ebuild b/dev-util/meson/meson-0.57.2.ebuild
index 0c8b0168d671..852dd7cdc74a 100644
--- a/dev-util/meson/meson-0.57.2.ebuild
+++ b/dev-util/meson/meson-0.57.2.ebuild
@@ -3,7 +3,6 @@
EAPI=7
PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/mesonbuild/meson"
diff --git a/dev-util/meson/meson-0.56.2.ebuild b/dev-util/meson/meson-0.58.1.ebuild
index 0c8b0168d671..97e443bd1f18 100644
--- a/dev-util/meson/meson-0.56.2.ebuild
+++ b/dev-util/meson/meson-0.58.1.ebuild
@@ -3,14 +3,13 @@
EAPI=7
PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/mesonbuild/meson"
inherit git-r3
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 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
@@ -81,6 +80,13 @@ python_test() {
# 'test cases/unit/73 summary' expects 80 columns
export COLUMNS=80
+ # 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
+ # value in JAVA_HOME, and the tests should get skipped.
+ export JAVA_HOME=$(java-config -O 2>/dev/null)
+
${EPYTHON} -u run_tests.py
) || die "Testing failed with ${EPYTHON}"
}
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index 890beb0cb042..97e443bd1f18 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -3,7 +3,6 @@
EAPI=7
PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/mesonbuild/meson"
@@ -81,6 +80,13 @@ python_test() {
# 'test cases/unit/73 summary' expects 80 columns
export COLUMNS=80
+ # 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
+ # value in JAVA_HOME, and the tests should get skipped.
+ export JAVA_HOME=$(java-config -O 2>/dev/null)
+
${EPYTHON} -u run_tests.py
) || die "Testing failed with ${EPYTHON}"
}
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.1.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.1.ebuild
index c29cb23df425..f1deab03c2ec 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.1.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.1.ebuild
@@ -10,7 +10,7 @@ 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"
+ 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
diff --git a/dev-util/pkgdev/pkgdev-0.1.6.ebuild b/dev-util/pkgdev/pkgdev-0.1.6.ebuild
index 7c16c37e4b45..34ececec12d8 100644
--- a/dev-util/pkgdev/pkgdev-0.1.6.ebuild
+++ b/dev-util/pkgdev/pkgdev-0.1.6.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~ppc64 ~riscv ~x64-macos"
+ KEYWORDS="amd64 ~ppc64 ~riscv ~x64-macos"
fi
DESCRIPTION="Collection of tools for Gentoo development"
generated by cgit v1.3 (git 2.53.0) at 2026-10-14 20:09:12 +0000