From b9c031254706cc23db10ef74c32b0c1aa05470f9 Mon Sep 17 00:00:00 2001 From: David Roman Date: Wed, 23 Dec 2020 00:06:49 +0100 Subject: [PATCH 01/14] sci-libs/kissfft-131: fix tests Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: David Roman --- sci-libs/kissfft/kissfft-131.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sci-libs/kissfft/kissfft-131.ebuild b/sci-libs/kissfft/kissfft-131.ebuild index 5151bf5569..5237f4112c 100644 --- a/sci-libs/kissfft/kissfft-131.ebuild +++ b/sci-libs/kissfft/kissfft-131.ebuild @@ -29,5 +29,6 @@ src_install() { } src_test() { - make testall || die + make -C test testcpp && test/testcpp || die + make -C test DATATYPE=simd CFLAGADD="$(CFLAGADD)" test || die } From 47df2dceb1d0e6f7a92d899e9a499ee8e60d39c6 Mon Sep 17 00:00:00 2001 From: Theo Anderson Date: Wed, 23 Dec 2020 17:39:59 +1300 Subject: [PATCH 02/14] dev-libs/octetos-coreutils: bdepend dev-util/check Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Theo Anderson --- .../octetos-coreutils-0.12.0_alpha.ebuild | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dev-libs/octetos-coreutils/octetos-coreutils-0.12.0_alpha.ebuild b/dev-libs/octetos-coreutils/octetos-coreutils-0.12.0_alpha.ebuild index 95353f5c95..b7be74a869 100644 --- a/dev-libs/octetos-coreutils/octetos-coreutils-0.12.0_alpha.ebuild +++ b/dev-libs/octetos-coreutils/octetos-coreutils-0.12.0_alpha.ebuild @@ -16,11 +16,12 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" -IUSE="" - DEPEND="dev-libs/octetos-core" RDEPEND="${DEPEND}" -BDEPEND="dev-util/cunit" +BDEPEND=" + dev-libs/check + dev-util/cunit +" S="${WORKDIR}/${MYP}" From 360389d093fa2721d39fbd5f18f427a9b804a1a2 Mon Sep 17 00:00:00 2001 From: Theo Anderson Date: Wed, 23 Dec 2020 18:54:49 +1300 Subject: [PATCH 03/14] dev-libs/libcloudproviders: bdepend dev-util/glib-utils Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Theo Anderson --- .../libcloudproviders-0.3.1.ebuild | 15 +++++++++------ dev-libs/libcloudproviders/metadata.xml | 5 ++++- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dev-libs/libcloudproviders/libcloudproviders-0.3.1.ebuild b/dev-libs/libcloudproviders/libcloudproviders-0.3.1.ebuild index 09e24d99ef..81534f476e 100644 --- a/dev-libs/libcloudproviders/libcloudproviders-0.3.1.ebuild +++ b/dev-libs/libcloudproviders/libcloudproviders-0.3.1.ebuild @@ -17,13 +17,14 @@ KEYWORDS="~amd64" IUSE="doc introspection vala" REQUIRED_USE="vala? ( introspection )" -RDEPEND=" - >=dev-libs/glib-2.58.0:2 -" -DEPEND="${RDEPEND} +RDEPEND=">=dev-libs/glib-2.58.0:2" +DEPEND=" + ${RDEPEND} introspection? ( dev-libs/gobject-introspection:= ) " -BDEPEND="$(vala_depend) +BDEPEND=" + $(vala_depend) + dev-util/glib-utils doc? ( dev-util/gdbus-codegen dev-util/gtk-doc @@ -32,9 +33,10 @@ BDEPEND="$(vala_depend) " src_prepare() { - vala_src_prepare default + vala_src_prepare } + src_configure() { local emesonargs=( $(meson_use vala vapigen) @@ -42,5 +44,6 @@ src_configure() { $(meson_use doc enable-gtk-doc) -Dinstalled-tests=false ) + meson_src_configure } diff --git a/dev-libs/libcloudproviders/metadata.xml b/dev-libs/libcloudproviders/metadata.xml index 8f5e68aea0..519e18c6c5 100644 --- a/dev-libs/libcloudproviders/metadata.xml +++ b/dev-libs/libcloudproviders/metadata.xml @@ -1,7 +1,10 @@ - + + telans@posteo.de + Theo Anderson + libcloudproviders is a DBus API that allows cloud storage sync clients to expose their services. Clients such as file managers and desktop environments can then provide integrated access to the cloud providers services. From f014db2c079312f4dc3063ce62176663d009de24 Mon Sep 17 00:00:00 2001 From: Theo Anderson Date: Wed, 23 Dec 2020 20:15:11 +1300 Subject: [PATCH 04/14] media-libs/skia: depend media-libs/libglvnd[X] Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Theo Anderson --- media-libs/skia/skia-80_p20191220-r1.ebuild | 2 +- media-libs/skia/skia-80_p20191220.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/media-libs/skia/skia-80_p20191220-r1.ebuild b/media-libs/skia/skia-80_p20191220-r1.ebuild index 7f224415a6..520dfec8de 100644 --- a/media-libs/skia/skia-80_p20191220-r1.ebuild +++ b/media-libs/skia/skia-80_p20191220-r1.ebuild @@ -39,7 +39,7 @@ RDEPEND=" media-libs/fontconfig media-libs/freetype media-libs/harfbuzz - media-libs/libglvnd + media-libs/libglvnd[X] media-libs/libjpeg-turbo media-libs/libpng media-libs/libwebp diff --git a/media-libs/skia/skia-80_p20191220.ebuild b/media-libs/skia/skia-80_p20191220.ebuild index 938bcfe251..05b6b96348 100644 --- a/media-libs/skia/skia-80_p20191220.ebuild +++ b/media-libs/skia/skia-80_p20191220.ebuild @@ -39,7 +39,7 @@ RDEPEND=" media-libs/fontconfig media-libs/freetype media-libs/harfbuzz - media-libs/libglvnd + media-libs/libglvnd[X] media-libs/libjpeg-turbo media-libs/libpng media-libs/libwebp From e868dc778360cd3da9fa31ca1915f2401d8e8a41 Mon Sep 17 00:00:00 2001 From: Theo Anderson Date: Wed, 23 Dec 2020 21:07:14 +1300 Subject: [PATCH 05/14] games-action/ATLauncher: bdepend media-gfx/imagemagick[png] Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Theo Anderson --- games-action/ATLauncher/ATLauncher-3.4.1.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-action/ATLauncher/ATLauncher-3.4.1.1.ebuild b/games-action/ATLauncher/ATLauncher-3.4.1.1.ebuild index c8c1763c06..0f459487ec 100644 --- a/games-action/ATLauncher/ATLauncher-3.4.1.1.ebuild +++ b/games-action/ATLauncher/ATLauncher-3.4.1.1.ebuild @@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86" LICENSE="GPL-3" SLOT="0" -BDEPEND="media-gfx/imagemagick" +BDEPEND="media-gfx/imagemagick[png]" RDEPEND="virtual/jre:1.8" From 8a00ca408fd26b062a7c3961a09c5d00bf10145c Mon Sep 17 00:00:00 2001 From: Theo Anderson Date: Wed, 23 Dec 2020 21:22:24 +1300 Subject: [PATCH 06/14] dev-python/libusb1: bdepend dev-python/{pip,wheel} Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Theo Anderson --- dev-python/libusb1/libusb1-1.9.1.ebuild | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dev-python/libusb1/libusb1-1.9.1.ebuild b/dev-python/libusb1/libusb1-1.9.1.ebuild index ccaaf8a41c..7eb10df108 100644 --- a/dev-python/libusb1/libusb1-1.9.1.ebuild +++ b/dev-python/libusb1/libusb1-1.9.1.ebuild @@ -16,5 +16,9 @@ SLOT="0" KEYWORDS="~amd64 ~x86" RDEPEND="virtual/libusb" +BDEPEND=" + dev-python/pip[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] +" distutils_enable_tests setup.py From 8df34eaef31967d02fbe917bbb5ebe9f2f429b1a Mon Sep 17 00:00:00 2001 From: "Haelwenn (lanodan) Monnier" Date: Wed, 23 Dec 2020 09:46:44 +0100 Subject: [PATCH 07/14] media-gfx/azpainter: Give CC to configure Signed-off-by: Haelwenn (lanodan) Monnier --- media-gfx/azpainter/azpainter-2.1.6.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/media-gfx/azpainter/azpainter-2.1.6.ebuild b/media-gfx/azpainter/azpainter-2.1.6.ebuild index 9ce319e192..2775db142a 100644 --- a/media-gfx/azpainter/azpainter-2.1.6.ebuild +++ b/media-gfx/azpainter/azpainter-2.1.6.ebuild @@ -3,6 +3,8 @@ EAPI=7 +inherit toolchain-funcs + DESCRIPTION="Full color painting software for Linux for illustration drawing" HOMEPAGE="http://azsky2.html.xdomain.jp/soft/azpainter.html https://github.com/Symbian9/azpainter" SRC_URI="https://github.com/Symbian9/azpainter/releases/download/v${PV}/${P}.tar.xz" @@ -30,5 +32,5 @@ PATCHES=( ) src_configure() { - sh ./configure --prefix=/usr CFLAGS="${CFLAGS:-02}" LDFLAGS="${LDFLAGS}" + sh ./configure --prefix=/usr CC="$(tc-getCC)" CFLAGS="${CFLAGS:-02}" LDFLAGS="${LDFLAGS}" } From e7b88bffd58718332014108f7cdd513041e32e8a Mon Sep 17 00:00:00 2001 From: Theo Anderson Date: Wed, 23 Dec 2020 22:25:40 +1300 Subject: [PATCH 08/14] x11-misc/i3lock-color: depend x11-libs/libxkbcommon[X] Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Theo Anderson --- x11-misc/i3lock-color/i3lock-color-2.13.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/i3lock-color/i3lock-color-2.13.1.ebuild b/x11-misc/i3lock-color/i3lock-color-2.13.1.ebuild index 4a9e1e32c4..0a70af4c50 100644 --- a/x11-misc/i3lock-color/i3lock-color-2.13.1.ebuild +++ b/x11-misc/i3lock-color/i3lock-color-2.13.1.ebuild @@ -24,7 +24,7 @@ DEPEND=" x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-xrm - x11-libs/libxkbcommon + x11-libs/libxkbcommon[X] " RDEPEND=" ${DEPEND} From 6bbc784eb1163ef0e10277d8259149db68199a17 Mon Sep 17 00:00:00 2001 From: Theo Anderson Date: Wed, 23 Dec 2020 22:41:28 +1300 Subject: [PATCH 09/14] net-fs/hubicfuse: append-cflags -fcommon Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Theo Anderson --- net-fs/hubicfuse/hubicfuse-3.0.1.ebuild | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/net-fs/hubicfuse/hubicfuse-3.0.1.ebuild b/net-fs/hubicfuse/hubicfuse-3.0.1.ebuild index d1fd3fa868..f20d9e52ae 100644 --- a/net-fs/hubicfuse/hubicfuse-3.0.1.ebuild +++ b/net-fs/hubicfuse/hubicfuse-3.0.1.ebuild @@ -3,6 +3,8 @@ EAPI=7 +inherit flag-o-matic + DESCRIPTION="Support for mounting HubiC drive in GNU/Linux" HOMEPAGE="https://github.com/TurboGit/hubicfuse" SRC_URI="https://github.com/TurboGit/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" @@ -25,6 +27,11 @@ RDEPEND="${DEPEND}" DOCS=( README.md ) +src_configure() { + append-cflags -fcommon + default +} + src_install() { default From 6e02079682e9489e8b83fbaaaf521cbba35f2442 Mon Sep 17 00:00:00 2001 From: Theo Anderson Date: Wed, 23 Dec 2020 22:51:19 +1300 Subject: [PATCH 10/14] dev-libs/octetos-db-maria: depend dev-db/mariadb Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Theo Anderson --- .../octetos-db-maria/octetos-db-maria-1.2.2_beta.ebuild | 9 +++++---- .../octetos-db-maria/octetos-db-maria-1.3.2_alpha.ebuild | 9 +++++---- .../octetos-db-maria/octetos-db-maria-1.4.2_alpha.ebuild | 9 +++++---- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dev-libs/octetos-db-maria/octetos-db-maria-1.2.2_beta.ebuild b/dev-libs/octetos-db-maria/octetos-db-maria-1.2.2_beta.ebuild index 7b40960636..e175581f87 100644 --- a/dev-libs/octetos-db-maria/octetos-db-maria-1.2.2_beta.ebuild +++ b/dev-libs/octetos-db-maria/octetos-db-maria-1.2.2_beta.ebuild @@ -17,11 +17,12 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" -IUSE="" - -DEPEND="dev-libs/octetos-core dev-db/mariadb-connector-c" +DEPEND=" + dev-libs/octetos-core + dev-db/mariadb-connector-c + dev-db/mariadb:= +" RDEPEND="${DEPEND}" -BDEPEND="" S="${WORKDIR}/${MYP}" diff --git a/dev-libs/octetos-db-maria/octetos-db-maria-1.3.2_alpha.ebuild b/dev-libs/octetos-db-maria/octetos-db-maria-1.3.2_alpha.ebuild index 74a4905ad6..271a074263 100644 --- a/dev-libs/octetos-db-maria/octetos-db-maria-1.3.2_alpha.ebuild +++ b/dev-libs/octetos-db-maria/octetos-db-maria-1.3.2_alpha.ebuild @@ -17,11 +17,12 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" -IUSE="" - -DEPEND="dev-libs/octetos-db dev-db/mariadb-connector-c" +DEPEND=" + dev-libs/octetos-db + dev-db/mariadb-connector-c + dev-db/mariadb:= +" RDEPEND="${DEPEND}" -BDEPEND="" S="${WORKDIR}/${MYP}" diff --git a/dev-libs/octetos-db-maria/octetos-db-maria-1.4.2_alpha.ebuild b/dev-libs/octetos-db-maria/octetos-db-maria-1.4.2_alpha.ebuild index 51290a5dea..7918b3a660 100644 --- a/dev-libs/octetos-db-maria/octetos-db-maria-1.4.2_alpha.ebuild +++ b/dev-libs/octetos-db-maria/octetos-db-maria-1.4.2_alpha.ebuild @@ -17,11 +17,12 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" -IUSE="" - -DEPEND="dev-libs/octetos-db-abstract dev-db/mariadb-connector-c" +DEPEND=" + dev-libs/octetos-db-abstract + dev-db/mariadb-connector-c + dev-db/mariadb:= +" RDEPEND="${DEPEND}" -BDEPEND="" S="${WORKDIR}/${MYP}" From 1a13dc120923ba7391043ecda0c2af348bbcb8c7 Mon Sep 17 00:00:00 2001 From: Theo Anderson Date: Wed, 23 Dec 2020 23:10:21 +1300 Subject: [PATCH 11/14] net-misc/openbgpd: append-cflags -fcommon Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Theo Anderson --- net-misc/openbgpd/openbgpd-6.8_p0.ebuild | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/net-misc/openbgpd/openbgpd-6.8_p0.ebuild b/net-misc/openbgpd/openbgpd-6.8_p0.ebuild index ccd7a6baf9..fc029efd14 100644 --- a/net-misc/openbgpd/openbgpd-6.8_p0.ebuild +++ b/net-misc/openbgpd/openbgpd-6.8_p0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit systemd +inherit flag-o-matic systemd MY_PV="${PV/_p/p}" MY_P="${PN}-${MY_PV}" @@ -38,6 +38,11 @@ src_install() { systemd_newunit "${FILESDIR}/${PN}.service" bgpd.service } +src_configure() { + append-cflags -fcommon + default +} + pkg_postinst() { if [ -z "${REPLACING_VERSIONS}" ]; then ewarn "" From d50a5f203c7c3aa18985cc9c506278d06813992f Mon Sep 17 00:00:00 2001 From: Theo Anderson Date: Wed, 23 Dec 2020 23:12:54 +1300 Subject: [PATCH 12/14] dev-libs/octetos-db-abstract: hard block dev-libs/octetos-db (file collisions) Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Theo Anderson --- .../octetos-db-abstract-0.1.2_alpha.ebuild | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dev-libs/octetos-db-abstract/octetos-db-abstract-0.1.2_alpha.ebuild b/dev-libs/octetos-db-abstract/octetos-db-abstract-0.1.2_alpha.ebuild index aa9eaab7ea..9cc2ea5e60 100644 --- a/dev-libs/octetos-db-abstract/octetos-db-abstract-0.1.2_alpha.ebuild +++ b/dev-libs/octetos-db-abstract/octetos-db-abstract-0.1.2_alpha.ebuild @@ -20,7 +20,10 @@ KEYWORDS="~amd64" IUSE="" DEPEND="dev-libs/octetos-core" -RDEPEND="${DEPEND}" +RDEPEND=" + ${DEPEND} + !!dev-libs/octetos-db +" BDEPEND="" S="${WORKDIR}/${MYP}" From 8bfc9b6ee4113fdb25e5454b320187afbc33e777 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Wed, 23 Dec 2020 11:16:27 +0100 Subject: [PATCH 13/14] games-action/technic-launcher: dep on imagemagick[png] Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan --- games-action/technic-launcher/technic-launcher-4.608.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-action/technic-launcher/technic-launcher-4.608.ebuild b/games-action/technic-launcher/technic-launcher-4.608.ebuild index d4c9bc9be6..f177b1ceab 100644 --- a/games-action/technic-launcher/technic-launcher-4.608.ebuild +++ b/games-action/technic-launcher/technic-launcher-4.608.ebuild @@ -16,7 +16,7 @@ SLOT="0" RESTRICT="bindist mirror" -BDEPEND="media-gfx/imagemagick" +BDEPEND="media-gfx/imagemagick[png]" RDEPEND="virtual/jre:1.8" From 2f0b38c21094d85f3447aec8c4de4cab16099bce Mon Sep 17 00:00:00 2001 From: Theo Anderson Date: Wed, 23 Dec 2020 23:26:06 +1300 Subject: [PATCH 14/14] sys-block/systemd-swap: fix sandbox violation Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Theo Anderson --- sys-block/systemd-swap/systemd-swap-4.0.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-block/systemd-swap/systemd-swap-4.0.1.ebuild b/sys-block/systemd-swap/systemd-swap-4.0.1.ebuild index be4ee14943..7a10e49e6c 100644 --- a/sys-block/systemd-swap/systemd-swap-4.0.1.ebuild +++ b/sys-block/systemd-swap/systemd-swap-4.0.1.ebuild @@ -22,6 +22,6 @@ SLOT="0" CONFIG_CHECK="~ZRAM ~ZSWAP" src_install() { - default + emake PREFIX="${ED}" install keepdir /var/lib/systemd-swap }