commit:     a5c72b43908238ae99bdf00a178434ed08be0c5c
Author:     Azat Bahawi <azahi <AT> teknik <DOT> io>
AuthorDate: Wed Mar  3 07:46:19 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Mar  7 02:02:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5c72b43

gnome-base/librsvg: Fix build error due to unset x11-libs/cairo[glib]

Packages starting v2.48 have `cairo-gobject` as a dependency.
x11-libs/cairo must be built with USE=glib for librsvg to merge.

Signed-off-by: Azat Bahawi <azahi <AT> teknik.io>
Closes: https://github.com/gentoo/gentoo/pull/19747
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 gnome-base/librsvg/librsvg-2.48.8.ebuild | 4 ++--
 gnome-base/librsvg/librsvg-2.48.9.ebuild | 4 ++--
 gnome-base/librsvg/librsvg-2.50.2.ebuild | 2 +-
 gnome-base/librsvg/librsvg-2.50.3.ebuild | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gnome-base/librsvg/librsvg-2.48.8.ebuild 
b/gnome-base/librsvg/librsvg-2.48.8.ebuild
index 5c9ac17f786..bf7a1854664 100644
--- a/gnome-base/librsvg/librsvg-2.48.8.ebuild
+++ b/gnome-base/librsvg/librsvg-2.48.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ IUSE="+introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
 RDEPEND="
-       >=x11-libs/cairo-1.16.0[${MULTILIB_USEDEP}]
+       >=x11-libs/cairo-1.16.0[glib,${MULTILIB_USEDEP}]
        >=media-libs/freetype-2.9:2[${MULTILIB_USEDEP}]
        >=x11-libs/gdk-pixbuf-2.20:2[introspection?,${MULTILIB_USEDEP}]
        >=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}]

diff --git a/gnome-base/librsvg/librsvg-2.48.9.ebuild 
b/gnome-base/librsvg/librsvg-2.48.9.ebuild
index c5ec2752fa9..44a8879352b 100644
--- a/gnome-base/librsvg/librsvg-2.48.9.ebuild
+++ b/gnome-base/librsvg/librsvg-2.48.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ IUSE="+introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
 RDEPEND="
-       >=x11-libs/cairo-1.16.0[${MULTILIB_USEDEP}]
+       >=x11-libs/cairo-1.16.0[glib,${MULTILIB_USEDEP}]
        >=media-libs/freetype-2.9:2[${MULTILIB_USEDEP}]
        >=x11-libs/gdk-pixbuf-2.20:2[introspection?,${MULTILIB_USEDEP}]
        >=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}]

diff --git a/gnome-base/librsvg/librsvg-2.50.2.ebuild 
b/gnome-base/librsvg/librsvg-2.50.2.ebuild
index 01b20ea0c5c..04ae4816f37 100644
--- a/gnome-base/librsvg/librsvg-2.50.2.ebuild
+++ b/gnome-base/librsvg/librsvg-2.50.2.ebuild
@@ -17,7 +17,7 @@ IUSE="+introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
 RDEPEND="
-       >=x11-libs/cairo-1.16.0[${MULTILIB_USEDEP}]
+       >=x11-libs/cairo-1.16.0[glib,${MULTILIB_USEDEP}]
        >=media-libs/freetype-2.9:2[${MULTILIB_USEDEP}]
        >=x11-libs/gdk-pixbuf-2.20:2[introspection?,${MULTILIB_USEDEP}]
        >=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}]

diff --git a/gnome-base/librsvg/librsvg-2.50.3.ebuild 
b/gnome-base/librsvg/librsvg-2.50.3.ebuild
index 01b20ea0c5c..04ae4816f37 100644
--- a/gnome-base/librsvg/librsvg-2.50.3.ebuild
+++ b/gnome-base/librsvg/librsvg-2.50.3.ebuild
@@ -17,7 +17,7 @@ IUSE="+introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
 RDEPEND="
-       >=x11-libs/cairo-1.16.0[${MULTILIB_USEDEP}]
+       >=x11-libs/cairo-1.16.0[glib,${MULTILIB_USEDEP}]
        >=media-libs/freetype-2.9:2[${MULTILIB_USEDEP}]
        >=x11-libs/gdk-pixbuf-2.20:2[introspection?,${MULTILIB_USEDEP}]
        >=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}]

Reply via email to