gnome-base/dconf: require <meson-0.52 to workaround build bug

meson-0.52 changes link_whole behaviour and dconf fails to build
due to that. Until we have a dconf patch, require older meson to
succeed build of this crucial package meanwhile.
Fix lack of BDEPEND in EAPI-7 dconf-0.32 ebuild while at it.

Bug: https://bugs.gentoo.org/698144
Package-Manager: Portage-2.3.69, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio@gentoo.org>

diff --git a/gnome-base/dconf/dconf-0.30.1.ebuild b/gnome-base/dconf/dconf-0.30.1.ebuild
index 86f125d97e9414f88512adec3a50f678c761c3a5..e52bab8ebd0ab9f06bfe41b420c80ab84c1a30e2 100644 (file)
--- a/gnome-base/dconf/dconf-0.30.1.ebuild
+++ b/gnome-base/dconf/dconf-0.30.1.ebuild
@@ -25,7 +25,8 @@ DEPEND="${RDEPEND}
        gtk-doc? ( >=dev-util/gtk-doc-1.15 )
        >=sys-devel/gettext-0.19.8
        virtual/pkgconfig
-"
+       <dev-util/meson-0.52
+" # problem with meson-0.52+ https://gitlab.gnome.org/GNOME/dconf/issues/59
 
 PATCHES=(
        "${FILESDIR}"/${PV}-bash-completion-dir.patch

diff --git a/gnome-base/dconf/dconf-0.32.0-r1.ebuild b/gnome-base/dconf/dconf-0.32.0-r1.ebuild
index 9d82cd9e4fe64cfe9f8c1ec5c533d4c4f6982f39..f4c1fa46b5c938604f1b49bf703d3842cd3abcf1 100644 (file)
--- a/gnome-base/dconf/dconf-0.32.0-r1.ebuild
+++ b/gnome-base/dconf/dconf-0.32.0-r1.ebuild
@@ -17,7 +17,8 @@ RDEPEND="
        >=dev-libs/glib-2.44.0:2
        sys-apps/dbus
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
        app-text/docbook-xml-dtd:4.2
        app-text/docbook-xsl-stylesheets
        dev-libs/libxslt
@@ -25,7 +26,8 @@ DEPEND="${RDEPEND}
        gtk-doc? ( >=dev-util/gtk-doc-1.15 )
        >=sys-devel/gettext-0.19.8
        virtual/pkgconfig
-"
+       <dev-util/meson-0.52
+" # problem with meson-0.52+ https://gitlab.gnome.org/GNOME/dconf/issues/59
 
 PATCHES=(
        "${FILESDIR}"/0.30.1-bash-completion-dir.patch