Merge updates from master

2026-07-17 19:13:13 -04:00 · 2020-12-23 11:13:43 +00:00
parent 6d3afe1b57 2f0b38c210
commit 5e1e621f86
18 changed files with 64 additions and 32 deletions
--- 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
 }
--- a/dev-libs/libcloudproviders/metadata.xml
+++ b/dev-libs/libcloudproviders/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>telans@posteo.de</email>
+		<name>Theo Anderson</name>
+	</maintainer>
 	<longdescription>
 		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.

--- 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}"

--- 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}"
--- 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}"

--- 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}"

--- 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}"

--- 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
--- 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"

--- 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"

--- 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}"
 }
--- 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
--- 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
--- 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

--- 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 ""
--- 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
 }
--- 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
 }
--- 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}