summaryrefslogtreecommitdiff
path: root/dev-util
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/gdbus-codegen/gdbus-codegen-2.68.3.ebuild2
-rw-r--r--dev-util/glib-utils/glib-utils-2.68.3.ebuild2
-rw-r--r--dev-util/lldb/lldb-12.0.1.9999.ebuild102
-rw-r--r--dev-util/qbs/Manifest2
-rw-r--r--dev-util/qbs/metadata.xml12
-rw-r--r--dev-util/qbs/qbs-1.19.1.ebuild (renamed from dev-util/qbs/qbs-1.16.0.ebuild)48
-rw-r--r--dev-util/strace/files/strace-5.5-static.patch178
-rw-r--r--dev-util/sysprof-common/sysprof-common-3.40.1.ebuild2
-rw-r--r--dev-util/sysprof/sysprof-3.40.1-r1.ebuild2
9 files changed, 39 insertions, 311 deletions
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.68.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.68.3.ebuild
index 2bafb84d55f7..81c90e998aff 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.68.3.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.68.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~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/glib-utils-2.68.3.ebuild b/dev-util/glib-utils/glib-utils-2.68.3.ebuild
index 2581ffb3e472..88bfce9bd5a7 100644
--- a/dev-util/glib-utils/glib-utils-2.68.3.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.68.3.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 ~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 ~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/lldb/lldb-12.0.1.9999.ebuild b/dev-util/lldb/lldb-12.0.1.9999.ebuild
deleted file mode 100644
index e1d51d40658e..000000000000
--- a/dev-util/lldb/lldb-12.0.1.9999.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="+libedit lzma ncurses +python test"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-RESTRICT="test"
-
-RDEPEND="
- libedit? ( dev-libs/libedit:0= )
- lzma? ( app-arch/xz-utils:= )
- ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
- python? (
- $(python_gen_cond_dep '
- dev-python/six[${PYTHON_USEDEP}]
- ')
- ${PYTHON_DEPS}
- )
- ~sys-devel/clang-${PV}[xml]
- ~sys-devel/llvm-${PV}
- !<sys-devel/llvm-4.0"
-DEPEND="${RDEPEND}"
-BDEPEND="
- >=dev-util/cmake-3.16
- python? ( >=dev-lang/swig-3.0.11 )
- test? (
- $(python_gen_cond_dep "
- ~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
- dev-python/psutil[\${PYTHON_USEDEP}]
- ")
- sys-devel/lld
- )
- ${PYTHON_DEPS}"
-
-LLVM_COMPONENTS=( lldb )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
-llvm.org_set_globals
-
-pkg_setup() {
- LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
- python-single-r1_pkg_setup
-}
-
-src_configure() {
- local mycmakeargs=(
- -DLLDB_ENABLE_CURSES=$(usex ncurses)
- -DLLDB_ENABLE_LIBEDIT=$(usex libedit)
- -DLLDB_ENABLE_PYTHON=$(usex python)
- -DLLDB_ENABLE_LZMA=$(usex lzma)
- -DLLDB_USE_SYSTEM_SIX=1
- -DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-
- -DLLDB_INCLUDE_TESTS=$(usex test)
-
- -DCLANG_LINK_CLANG_DYLIB=ON
- # TODO: fix upstream to detect this properly
- -DHAVE_LIBDL=ON
- -DHAVE_LIBPTHREAD=ON
-
- # normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
- # and TERMINFO_LIBS... so just force FindCurses.cmake to use
- # ncurses with complete library set (including autodetection
- # of -ltinfo)
- -DCURSES_NEED_NCURSES=ON
-
- -DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${PV%_*}"
-
- -DPython3_EXECUTABLE="${PYTHON}"
- )
- use test && mycmakeargs+=(
- -DLLVM_BUILD_TESTS=$(usex test)
- -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
- -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
- -DLLVM_LIT_ARGS="$(get_lit_flags)"
- )
-
- cmake_src_configure
-}
-
-src_test() {
- local -x LIT_PRESERVES_TMP=1
- cmake_build check-lldb-lit
- # failures + hangs
- #use python && cmake_build check-lldb
-}
-
-src_install() {
- cmake_src_install
- find "${D}" -name '*.a' -delete || die
-
- use python && python_optimize
-}
diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index 142b017fb2d7..bfcc02f2c5b5 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,2 +1,2 @@
-DIST qbs-src-1.16.0.tar.gz 4571788 BLAKE2B 4fb06314d0d0a532574e0d245ea85b6d596850ffe4b81b621406d1bc99e0529fc491bf5c7db514d90026c0bf4916f9fa102457aab2bbaaddbbe2e90c03aa04a4 SHA512 65c5398ffad54e10e251bed79a5b58abd722c0f95a031c536fc8647d915dd696923401c767a7a8ac029f4f571b6bbf96ef4b7493bb30768f675477bd68fcc21c
DIST qbs-src-1.18.0.tar.gz 4921432 BLAKE2B 4c081434596c58d433e52ca9e335e3b4d62b75e401290895719b7fbe4f3c20cf8b34ab0753ae79a34b4e29c8859751a6276da8d6dbd5f3c711581af16ab61415 SHA512 bdef30200c7e74749c363b1d68232fd90d1dfc998722bee0e058ffcaff8e003599e0404b49f86cbeae098d59ccb5663316db5094d77b50a217fcf4ab5ae64d83
+DIST qbs-src-1.19.1.tar.gz 4961984 BLAKE2B 2b9333ac8bba12f311ad47b1315d0a61ddf3b3a804888369f3fd868fbebca4ad13bd857451cb3fe3515fd9f9e69b42b84484289e79d3e7911c69720d7d08ab29 SHA512 b53dae9631c9d4ec1f799395948a67ce4b62ae88908cce3b00f42fb0213d80d32127c3429b95d5c32c9f7c1b861fc5a52ac6952046a6d91d035539d7412a5c4d
diff --git a/dev-util/qbs/metadata.xml b/dev-util/qbs/metadata.xml
index f0b766892fa7..111026bc3d90 100644
--- a/dev-util/qbs/metadata.xml
+++ b/dev-util/qbs/metadata.xml
@@ -14,10 +14,14 @@
projects across multiple platforms. Qbs can be used for any software
project, regardless of programming language, toolkit, or libraries used.
- Qbs is an all-in-one tool that generates a build graph from a
- high-level project description (like qmake or cmake) and additionally
- undertakes the task of executing the commands in the low-level build
- graph (like make).
+ Qbs projects are specified in a QML dialect. QML is a concise, easy to
+ learn, and intuitive language that is used successfully in the Qt project.
+ Its core is declarative, but it can be extended with JavaScript snippets
+ for extra flexibility.
+
+ Qbs is an all-in-one tool that generates a build graph from a high-level
+ project description (like qmake or CMake) and additionally undertakes the
+ task of executing the commands in the low-level build graph (like make).
</longdescription>
<upstream>
<bugs-to>https://bugreports.qt.io/</bugs-to>
diff --git a/dev-util/qbs/qbs-1.16.0.ebuild b/dev-util/qbs/qbs-1.19.1.ebuild
index 2ecd2be09ac4..3339bb574287 100644
--- a/dev-util/qbs/qbs-1.16.0.ebuild
+++ b/dev-util/qbs/qbs-1.19.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit qmake-utils toolchain-funcs
@@ -9,37 +9,40 @@ MY_P=${PN}-src-${PV}
DESCRIPTION="Modern build tool for software projects"
HOMEPAGE="https://doc.qt.io/qbs/"
-SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz"
+SRC_URI="https://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
LICENSE="|| ( LGPL-2.1 LGPL-3 )"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc examples test"
+IUSE="doc examples gui test"
RESTRICT="!test? ( test )"
-# see bug 581874 for the qttest dep in RDEPEND
RDEPEND="
dev-qt/qtcore:5=
- dev-qt/qtgui:5
dev-qt/qtnetwork:5
dev-qt/qtscript:5
- dev-qt/qtwidgets:5
dev-qt/qtxml:5
- test? ( dev-qt/qttest:5 )
+ gui? (
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
"
DEPEND="${RDEPEND}
- doc? (
- dev-qt/qdoc:5
- dev-qt/qthelp:5
- )
test? (
dev-qt/linguist-tools:5
dev-qt/qtdbus:5
dev-qt/qtdeclarative:5
+ dev-qt/qttest:5
+ )
+"
+BDEPEND="
+ dev-qt/qtcore:5
+ doc? (
+ dev-qt/qdoc:5
+ dev-qt/qthelp:5
)
"
-
-S=${WORKDIR}/${MY_P}
src_prepare() {
default
@@ -48,18 +51,19 @@ src_prepare() {
sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die
fi
- echo "SUBDIRS = $(usex test auto '')" >> tests/tests.pro
+ if ! use gui; then
+ sed -i -e '/SUBDIRS += config-ui/ d' src/app/app.pro || die
+ fi
+
+ echo "SUBDIRS = $(usev test auto)" >> tests/tests.pro
# skip several tests that fail and/or have additional deps
sed -i \
- -e 's/findArchiver("7z")/""/' `# requires p7zip, fails` \
-e 's/findArchiver(binaryName,.*/"";/' `# requires zip and jar` \
-e 's/p\.value("nodejs\./true||&/' `# requires nodejs, bug 527652` \
-e 's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/' `# requires nodejs and typescript` \
tests/auto/blackbox/tst_blackbox.cpp || die
-
- # requires jdk, fails, bug 585398
- sed -i -e '/blackbox-java\.pro/ d' tests/auto/auto.pro || die
+ sed -i -re '/blackbox-(android|apple|java)\.pro/ d' tests/auto/auto.pro || die
}
src_configure() {
@@ -68,7 +72,7 @@ src_configure() {
-recursive
CONFIG+=qbs_disable_rpath
CONFIG+=qbs_enable_project_file_updates
- $(usex test 'CONFIG+=qbs_enable_unit_tests' '')
+ $(usev test 'CONFIG+=qbs_enable_unit_tests')
QBS_INSTALL_PREFIX="${EPREFIX}/usr"
QBS_LIBRARY_DIRNAME="$(get_libdir)"
)
@@ -102,9 +106,9 @@ src_test() {
}
src_install() {
- emake INSTALL_ROOT="${D}" install
+ emake -j1 INSTALL_ROOT="${D}" install
- dodoc -r changelogs README.md
+ dodoc -r changelogs CONTRIBUTING.md README.md
# install documentation
if use doc; then
diff --git a/dev-util/strace/files/strace-5.5-static.patch b/dev-util/strace/files/strace-5.5-static.patch
deleted file mode 100644
index da57ee0f9388..000000000000
--- a/dev-util/strace/files/strace-5.5-static.patch
+++ /dev/null
@@ -1,178 +0,0 @@
---- /Makefile.am
-+++ /Makefile.am
-@@ -379,7 +379,6 @@
- if USE_LIBDW
- strace_SOURCES += unwind-libdw.c
- strace_CPPFLAGS += $(libdw_CPPFLAGS)
--strace_CFLAGS += $(libdw_CFLAGS)
- strace_LDFLAGS += $(libdw_LDFLAGS)
- strace_LDADD += $(libdw_LIBS)
- endif
---- /configure.ac
-+++ /configure.ac
-@@ -48,6 +48,15 @@
- AC_DEFINE([MANPAGE_DATE], "[manpage_date]", [Date])
- AC_SUBST([MANPAGE_DATE], [manpage_date])
-
-+AC_ARG_ENABLE([static],
-+ [AS_HELP_STRING([--enable-static],
-+ [link strace statically])],
-+ [], [enable_static=no])
-+if test "$enable_static" = "yes"; then
-+ # Add -pthread since strace wants -lrt for timer_create, and -lrt uses -lpthread.
-+ LDFLAGS="$LDFLAGS -pthread -static"
-+fi
-+
- AC_C_BIGENDIAN
-
- AC_MSG_CHECKING([for supported architecture])
---- /m4/st_libdw.m4
-+++ /m4/st_libdw.m4
-@@ -8,7 +8,6 @@
- AC_DEFUN([st_ARG_LIBDW], [dnl
-
- : ${libdw_CPPFLAGS=}
--: ${libdw_CFLAGS=}
- : ${libdw_LDFLAGS=}
- : ${libdw_LIBS=}
-
-@@ -34,48 +33,14 @@
- have_libdw=
-
- AS_IF([test "x$with_libdw" != xno && test "x$use_unwinder" = x],
-- [saved_CPPFLAGS="$CPPFLAGS"
-- saved_CFLAGS="$CFLAGS"
-- CPPFLAGS="$CPPFLAGS $libdw_CPPFLAGS"
-- CFLAGS="$CFLAGS $libdw_CFLAGS"
--
-- AC_CHECK_HEADERS([elfutils/libdwfl.h],
-- [AC_CHECK_LIB([dw], [dwfl_linux_proc_attach],
-- [libdw_LIBS="-ldw $libdw_LIBS"
-- AC_CACHE_CHECK([for elfutils version],
-- [st_cv_ELFUTILS_VERSION],
-- [[st_cv_ELFUTILS_VERSION="$(echo _ELFUTILS_VERSION |
-- $CPP $CPPFLAGS -P -imacros elfutils/version.h - |
-- grep '^[0-9]')"
-- test -n "$st_cv_ELFUTILS_VERSION" ||
-- st_cv_ELFUTILS_VERSION=0
-- ]]
-- )
-- AS_IF([test "$st_cv_ELFUTILS_VERSION" -ge 164],
-- [have_libdw=yes],
-- [AS_IF([test "x$with_libdw" = xyes],
-- [AC_MSG_ERROR([elfutils version >= 164 is required for stack tracing support])],
-- [AC_MSG_WARN([elfutils version >= 164 is required for stack tracing support])]
-- )
-- ]
-- )
-- ],
-- [AS_IF([test "x$with_libdw" = xyes],
-- [AC_MSG_FAILURE([failed to find dwfl_linux_proc_attach in libdw])],
-- )
-- ],
-- [$libdw_LDFLAGS $libdw_LIBS]
-- )
-- ],
-- [AS_IF([test "x$with_libdw" = xyes],
-- [AC_MSG_FAILURE([failed to find elfutils/libdwfl.h])]
-- )
-- ]
-- )
--
-- CFLAGS="$saved_CFLAGS"
-- CPPFLAGS="$saved_CPPFLAGS"
-- ]
-+ [if test "$enable_static" = "yes"; then
-+ PKG_CHECK_MODULES_STATIC([LIBDW], [libdw >= 0.164])
-+ else
-+ PKG_CHECK_MODULES([LIBDW], [libdw >= 0.164])
-+ fi
-+ have_libdw=yes
-+ libdw_CPPFLAGS="$LIBDW_CFLAGS"
-+ libdw_LIBS="$LIBDW_LIBS"]
- )
-
- AS_IF([test "x$have_libdw" = xyes],
-@@ -84,7 +49,6 @@
- [Whether to use libdw for stack tracing]
- )
- AC_SUBST(libdw_CPPFLAGS)
-- AC_SUBST(libdw_CFLAGS)
- AC_SUBST(libdw_LDFLAGS)
- AC_SUBST(libdw_LIBS)
- ]
---- /m4/st_libunwind.m4
-+++ /m4/st_libunwind.m4
-@@ -28,64 +28,14 @@
- libunwind_LIBS=
-
- AS_IF([test "x$with_libunwind" != xno && test "x$use_unwinder" = x],
-- [saved_CPPFLAGS="$CPPFLAGS"
-- CPPFLAGS="$CPPFLAGS $libunwind_CPPFLAGS"
--
-- AC_CHECK_HEADERS([libunwind-ptrace.h],
-- [saved_LDFLAGS="$LDFLAGS"
-- LDFLAGS="$LDFLAGS $libunwind_LDFLAGS"
--
-- AC_CHECK_LIB([unwind], [backtrace],
-- [libunwind_LIBS="-lunwind $libunwind_LIBS"
--
-- AC_MSG_CHECKING([for unw_create_addr_space in libunwind-generic])
-- saved_LIBS="$LIBS"
-- LIBS="-lunwind-generic $libunwind_LIBS $LIBS"
--
-- AC_LINK_IFELSE(
-- [AC_LANG_PROGRAM([[#include <libunwind-ptrace.h>]],
-- [[return !unw_create_addr_space(0, 0)]])
-- ],
-- [AC_MSG_RESULT([yes])
-- libunwind_LIBS="-lunwind-generic $libunwind_LIBS"
--
-- AC_CHECK_LIB([unwind-ptrace], [_UPT_create],
-- [libunwind_LIBS="-lunwind-ptrace $libunwind_LIBS"
-- use_unwinder=libunwind
-- ],
-- [if test "x$with_libunwind" != xcheck; then
-- AC_MSG_FAILURE([failed to find _UPT_create in libunwind-ptrace])
-- fi
-- ],
-- [$libunwind_LIBS]
-- )
-- ],
-- [AC_MSG_RESULT([no])
-- if test "x$with_libunwind" != xcheck; then
-- AC_MSG_FAILURE([failed to find unw_create_addr_space in libunwind-generic])
-- fi
-- ]
-- )
--
-- LIBS="$saved_LIBS"
-- ],
-- [if test "x$with_libunwind" != xcheck; then
-- AC_MSG_FAILURE([failed to find libunwind])
-- fi
-- ],
-- [$libunwind_LIBS]
-- )
--
-- LDFLAGS="$saved_LDFLAGS"
-- ],
-- [if test "x$with_libunwind" != xcheck; then
-- AC_MSG_FAILURE([failed to find libunwind-ptrace.h])
-- fi
-- ]
-- )
--
-- CPPFLAGS="$saved_CPPFLAGS"
-- ]
-+ [if test "$enable_static" = "yes"; then
-+ PKG_CHECK_MODULES_STATIC([LIBUNWIND], [libunwind libunwind-generic libunwind-ptrace])
-+ else
-+ PKG_CHECK_MODULES([LIBUNWIND], [libunwind libunwind-generic libunwind-ptrace])
-+ fi
-+ use_unwinder="libunwind"
-+ libunwind_CPPFLAGS="$LIBUNWIND_CFLAGS"
-+ libunwind_LIBS="$LIBUNWIND_LIBS"]
- )
-
- if test "x$use_unwinder" = xlibunwind; then
diff --git a/dev-util/sysprof-common/sysprof-common-3.40.1.ebuild b/dev-util/sysprof-common/sysprof-common-3.40.1.ebuild
index 96a57b010725..6f87bc9b52ab 100644
--- a/dev-util/sysprof-common/sysprof-common-3.40.1.ebuild
+++ b/dev-util/sysprof-common/sysprof-common-3.40.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://sysprof.com/"
LICENSE="GPL-3+ GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
!=dev-util/sysprof-3.34.1-r0
diff --git a/dev-util/sysprof/sysprof-3.40.1-r1.ebuild b/dev-util/sysprof/sysprof-3.40.1-r1.ebuild
index bbcfc1400ed8..8d316efc9e52 100644
--- a/dev-util/sysprof/sysprof-3.40.1-r1.ebuild
+++ b/dev-util/sysprof/sysprof-3.40.1-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://sysprof.com/"
LICENSE="GPL-3+ GPL-2+"
API_VERSION="4"
SLOT="0/${API_VERSION}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="gtk +unwind"
RDEPEND="