From 6d89c833628bb825e31e94489e12da601f54bb4b Mon Sep 17 00:00:00 2001 From: Zamarin Arthur Date: Fri, 23 Apr 2021 19:26:25 +0300 Subject: [PATCH 1/8] sys-process/iotop-c: add NET_ADMIN capability to binary Signed-off-by: Zamarin Arthur --- .../iotop-c/{iotop-c-1.17.ebuild => iotop-c-1.17-r1.ebuild} | 6 ++++++ 1 file changed, 6 insertions(+) rename sys-process/iotop-c/{iotop-c-1.17.ebuild => iotop-c-1.17-r1.ebuild} (89%) diff --git a/sys-process/iotop-c/iotop-c-1.17.ebuild b/sys-process/iotop-c/iotop-c-1.17-r1.ebuild similarity index 89% rename from sys-process/iotop-c/iotop-c-1.17.ebuild rename to sys-process/iotop-c/iotop-c-1.17-r1.ebuild index 033feb5343..d33361f8b2 100644 --- a/sys-process/iotop-c/iotop-c-1.17.ebuild +++ b/sys-process/iotop-c/iotop-c-1.17-r1.ebuild @@ -3,6 +3,8 @@ EAPI=7 +inherit fcaps + DESCRIPTION="top utility for IO (C port)" HOMEPAGE="https://github.com/Tomas-M/iotop" SRC_URI="https://github.com/Tomas-M/iotop/archive/v${PV}.tar.gz -> ${P}.tar.gz" @@ -18,6 +20,10 @@ BDEPEND="virtual/pkgconfig" S="${WORKDIR}/iotop-${PV}" +FILECAPS=( + cap_net_admin=eip usr/bin/iotop +) + src_compile() { emake V=1 } From e41a04e7f068dddb13053fd7e662af4f0b5bbf0c Mon Sep 17 00:00:00 2001 From: Zamarin Arthur Date: Fri, 23 Apr 2021 19:29:21 +0300 Subject: [PATCH 2/8] sys-process/iotop-c: add linux kernel config checks Signed-off-by: Zamarin Arthur --- sys-process/iotop-c/iotop-c-1.17-r1.ebuild | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys-process/iotop-c/iotop-c-1.17-r1.ebuild b/sys-process/iotop-c/iotop-c-1.17-r1.ebuild index d33361f8b2..ad5cd74c11 100644 --- a/sys-process/iotop-c/iotop-c-1.17-r1.ebuild +++ b/sys-process/iotop-c/iotop-c-1.17-r1.ebuild @@ -3,12 +3,14 @@ EAPI=7 -inherit fcaps +inherit fcaps linux-info DESCRIPTION="top utility for IO (C port)" HOMEPAGE="https://github.com/Tomas-M/iotop" SRC_URI="https://github.com/Tomas-M/iotop/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/iotop-${PV}" + LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" @@ -18,7 +20,7 @@ RDEPEND="sys-libs/ncurses:= DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" -S="${WORKDIR}/iotop-${PV}" +CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS ~VM_EVENT_COUNTERS" FILECAPS=( cap_net_admin=eip usr/bin/iotop From 3537c63f2c5fd1ecca3fe14213865a67087661bd Mon Sep 17 00:00:00 2001 From: Zamarin Arthur Date: Fri, 23 Apr 2021 19:32:04 +0300 Subject: [PATCH 3/8] sys-process/iotop-c: fix CC and PKG_CONFIG calls Closes: https://bugs.gentoo.org/785148 Signed-off-by: Zamarin Arthur --- sys-process/iotop-c/iotop-c-1.17-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-process/iotop-c/iotop-c-1.17-r1.ebuild b/sys-process/iotop-c/iotop-c-1.17-r1.ebuild index ad5cd74c11..d778526f66 100644 --- a/sys-process/iotop-c/iotop-c-1.17-r1.ebuild +++ b/sys-process/iotop-c/iotop-c-1.17-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit fcaps linux-info +inherit fcaps linux-info toolchain-funcs DESCRIPTION="top utility for IO (C port)" HOMEPAGE="https://github.com/Tomas-M/iotop" @@ -27,7 +27,7 @@ FILECAPS=( ) src_compile() { - emake V=1 + emake V=1 CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)" } src_install() { From 9ea9e2f03b225abceabc1179363640bf8ae18f2f Mon Sep 17 00:00:00 2001 From: "Ronny (tastytea) Gutbrod" Date: Fri, 23 Apr 2021 19:43:48 +0200 Subject: [PATCH 4/8] media-video/ciano: Declare Python support. meson calls a python post-install script during build. Closes: https://bugs.gentoo.org/785118 Signed-off-by: Ronny (tastytea) Gutbrod --- media-video/ciano/ciano-0.2.4.ebuild | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/media-video/ciano/ciano-0.2.4.ebuild b/media-video/ciano/ciano-0.2.4.ebuild index 184825fb39..3da996b41d 100644 --- a/media-video/ciano/ciano-0.2.4.ebuild +++ b/media-video/ciano/ciano-0.2.4.ebuild @@ -1,9 +1,10 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2020-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit gnome2-utils meson vala xdg +PYTHON_COMPAT=( python3_{8,9} ) +inherit gnome2-utils meson python-any-r1 vala xdg DESCRIPTION="A multimedia file converter focused on simplicity" HOMEPAGE="https://robertsanseries.github.io/ciano" @@ -14,6 +15,7 @@ SLOT="0" KEYWORDS="~amd64" DEPEND="dev-libs/granite" +BDEPEND="${PYTHON_DEPS}" RDEPEND=" ${DEPEND} media-video/ffmpeg From c020f8a37ef37eeffd01e6f66e8b3a085bb55a23 Mon Sep 17 00:00:00 2001 From: "Ronny (tastytea) Gutbrod" Date: Fri, 23 Apr 2021 19:54:03 +0200 Subject: [PATCH 5/8] media-video/ciano: Fix HOMEPAGE. Signed-off-by: Ronny (tastytea) Gutbrod --- media-video/ciano/ciano-0.2.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/ciano/ciano-0.2.4.ebuild b/media-video/ciano/ciano-0.2.4.ebuild index 3da996b41d..bb822f3066 100644 --- a/media-video/ciano/ciano-0.2.4.ebuild +++ b/media-video/ciano/ciano-0.2.4.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8,9} ) inherit gnome2-utils meson python-any-r1 vala xdg DESCRIPTION="A multimedia file converter focused on simplicity" -HOMEPAGE="https://robertsanseries.github.io/ciano" +HOMEPAGE="https://robertsanseries.github.io/ciano/" SRC_URI="https://github.com/robertsanseries/ciano/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2+" From f12cc86adbbe773bbfded87a4d61ae5262ec1092 Mon Sep 17 00:00:00 2001 From: "Ronny (tastytea) Gutbrod" Date: Fri, 23 Apr 2021 20:39:50 +0200 Subject: [PATCH 6/8] media-gfx/glimpse: Set compiler explicitly. The AX_PROG_CC_FOR_BUILD macro doesn't detect tuple-prefixed compilers automatically. Closes: https://bugs.gentoo.org/784968 Signed-off-by: Ronny (tastytea) Gutbrod --- media-gfx/glimpse/glimpse-0.2.0.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/media-gfx/glimpse/glimpse-0.2.0.ebuild b/media-gfx/glimpse/glimpse-0.2.0.ebuild index ca55db4982..b20d0e5ac8 100644 --- a/media-gfx/glimpse/glimpse-0.2.0.ebuild +++ b/media-gfx/glimpse/glimpse-0.2.0.ebuild @@ -7,7 +7,7 @@ EAPI=7 GNOME2_EAUTORECONF=yes WANT_AUTOMAKE= -inherit autotools gnome2 virtualx +inherit autotools gnome2 toolchain-funcs virtualx DESCRIPTION="Image editor based on the GNU Image Manipulation Program" HOMEPAGE="https://glimpse-editor.org/" @@ -120,6 +120,7 @@ src_prepare() { -i configure || die # bug #615144 fgrep -q GIMP_DISABLE_DEPRECATED configure || die # bug #615144, self-test + export CC_FOR_BUILD="$(tc-getBUILD_CC)" } _adjust_sandbox() { From a3801d8749295e6efcaa6aefd3d5d185e287f2f7 Mon Sep 17 00:00:00 2001 From: "Ronny (tastytea) Gutbrod" Date: Fri, 23 Apr 2021 21:17:23 +0200 Subject: [PATCH 7/8] x11-misc/xob: Set CC. Makefile calls `$(CC)`, which seems to default to `cc`. Closes: https://bugs.gentoo.org/785211 Signed-off-by: Ronny (tastytea) Gutbrod --- x11-misc/xob/xob-0.2.ebuild | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/x11-misc/xob/xob-0.2.ebuild b/x11-misc/xob/xob-0.2.ebuild index 2a73d3f57f..0b54a84338 100644 --- a/x11-misc/xob/xob-0.2.ebuild +++ b/x11-misc/xob/xob-0.2.ebuild @@ -1,8 +1,10 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2020-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit toolchain-funcs + DESCRIPTION="A lightweight overlay volume (or anything) bar for the X Window System" HOMEPAGE="https://github.com/florentc/xob" SRC_URI="https://github.com/florentc/xob/archive/v${PV}.tar.gz -> ${P}.tar.gz" @@ -17,6 +19,11 @@ RDEPEND=" " DEPEND="${RDEPEND}" +src_compile() { + tc-export CC + default +} + src_install() { emake prefix="${EPREFIX}"/usr \ sysconfdir="${EPREFIX}"/etc \ From 0672bdc8223636d712c661feff4ef88f592881b5 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Sat, 24 Apr 2021 08:37:39 +0200 Subject: [PATCH 8/8] sci-libs/kissfft: moved to ::gentoo Signed-off-by: Andrew Ammerlaan --- sci-libs/kissfft/Manifest | 1 - sci-libs/kissfft/kissfft-131.ebuild | 35 ---------------------------- sci-libs/kissfft/kissfft-9999.ebuild | 34 --------------------------- sci-libs/kissfft/metadata.xml | 8 ------- 4 files changed, 78 deletions(-) delete mode 100644 sci-libs/kissfft/Manifest delete mode 100644 sci-libs/kissfft/kissfft-131.ebuild delete mode 100644 sci-libs/kissfft/kissfft-9999.ebuild delete mode 100644 sci-libs/kissfft/metadata.xml diff --git a/sci-libs/kissfft/Manifest b/sci-libs/kissfft/Manifest deleted file mode 100644 index b772ae85a8..0000000000 --- a/sci-libs/kissfft/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST kissfft-131.tar.gz 44748 BLAKE2B 71418543995ce5bd26d12077bd7de24978ca30c827ea4fa210c63bb42fc64ee2449825605cc498d090670b08aaec08ea22901ae790a8276f156b899a687d5bc7 SHA512 6cc7efbe898287cdc623970f84b57c6a71148ded78732c36c4bd376a122efcf6c27d3a61679fccfbe47d0e79c7d1f3065b21a7091110154e402c0b2a49a378f9 diff --git a/sci-libs/kissfft/kissfft-131.ebuild b/sci-libs/kissfft/kissfft-131.ebuild deleted file mode 100644 index 8a1bbe1508..0000000000 --- a/sci-libs/kissfft/kissfft-131.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="A Fast Fourier Transform (FFT) library that tries to Keep it Simple, Stupid" -HOMEPAGE="https://github.com/mborgerding/kissfft" - -LICENSE="BSD" -IUSE="test" -RESTRICT="!test? ( test )" -SLOT="0" - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/mborgerding/kissfft" - inherit git-r3 -else - SRC_URI="https://github.com/mborgerding/kissfft/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DEPEND="sci-libs/fftw:3.0" -RDEPEND="${DEPEND}" - -src_install() { - dolib.so libkissfft.so - doheader kiss_fft.h -} - -src_test() { - make -C test testcpp && test/testcpp || die - make -C test DATATYPE=simd CFLAGADD="$(CFLAGADD)" test || die -} diff --git a/sci-libs/kissfft/kissfft-9999.ebuild b/sci-libs/kissfft/kissfft-9999.ebuild deleted file mode 100644 index 0c8c52a0ac..0000000000 --- a/sci-libs/kissfft/kissfft-9999.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="A Fast Fourier Transform (FFT) library that tries to Keep it Simple, Stupid" -HOMEPAGE="https://github.com/mborgerding/kissfft" - -LICENSE="BSD" -IUSE="test" -RESTRICT="!test? ( test )" -SLOT="0" - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/mborgerding/kissfft" - inherit git-r3 -else - SRC_URI="https://github.com/mborgerding/kissfft/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DEPEND="sci-libs/fftw:3.0" -RDEPEND="${DEPEND}" - -src_install() { - dolib.so libkissfft.so - doheader kiss_fft.h -} - -src_test() { - make testall || die -} diff --git a/sci-libs/kissfft/metadata.xml b/sci-libs/kissfft/metadata.xml deleted file mode 100644 index 01c1fc8487..0000000000 --- a/sci-libs/kissfft/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - davidroman96@gmail.com - David Roman - -