From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1118356-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 6D800138334
	for <garchives@archives.gentoo.org>; Tue, 22 Oct 2019 06:31:43 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 45946E0B33;
	Tue, 22 Oct 2019 06:31:41 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 2F4E1E0B33
	for <gentoo-commits@lists.gentoo.org>; Tue, 22 Oct 2019 06:31:41 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 1356834C1CC
	for <gentoo-commits@lists.gentoo.org>; Tue, 22 Oct 2019 06:31:40 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 1EA61778
	for <gentoo-commits@lists.gentoo.org>; Tue, 22 Oct 2019 06:31:38 +0000 (UTC)
From: "Mart Raudsepp" <leio@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" <leio@gentoo.org>
Message-ID: <1571725888.f34d22556e5419b8b85f5182c322266b13cf8b72.leio@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/dconf/
X-VCS-Repository: repo/gentoo
X-VCS-Files: gnome-base/dconf/dconf-0.30.1.ebuild gnome-base/dconf/dconf-0.32.0-r1.ebuild
X-VCS-Directories: gnome-base/dconf/
X-VCS-Committer: leio
X-VCS-Committer-Name: Mart Raudsepp
X-VCS-Revision: f34d22556e5419b8b85f5182c322266b13cf8b72
X-VCS-Branch: master
Date: Tue, 22 Oct 2019 06:31:38 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: b606969c-92b9-455b-b328-90a10b56264d
X-Archives-Hash: 85b0ea06f6c55b2a49d6c1c6ccc0cd6a

commit:     f34d22556e5419b8b85f5182c322266b13cf8b72
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 22 06:30:05 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Tue Oct 22 06:31:28 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f34d2255

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 <AT> gentoo.org>

 gnome-base/dconf/dconf-0.30.1.ebuild    | 3 ++-
 gnome-base/dconf/dconf-0.32.0-r1.ebuild | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnome-base/dconf/dconf-0.30.1.ebuild b/gnome-base/dconf/dconf-0.30.1.ebuild
index 86f125d97e9..e52bab8ebd0 100644
--- 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 9d82cd9e4fe..f4c1fa46b5c 100644
--- 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