From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 46CB5138334 for ; Fri, 17 May 2019 13:03:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9F039E08AC; Fri, 17 May 2019 13:03:37 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 879C3E08AC for ; Fri, 17 May 2019 13:03:37 +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 A7750344951 for ; Fri, 17 May 2019 13:03:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A7CBF5D9 for ; Fri, 17 May 2019 13:03:32 +0000 (UTC) From: "Michael Haubenwallner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Haubenwallner" Message-ID: <1558098206.be444da99d70735ce2c735e97e5f840401e6a303.haubi@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: dev-libs/glib/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: dev-libs/glib/glib-2.56.2.ebuild X-VCS-Directories: dev-libs/glib/ X-VCS-Committer: haubi X-VCS-Committer-Name: Michael Haubenwallner X-VCS-Revision: be444da99d70735ce2c735e97e5f840401e6a303 X-VCS-Branch: master Date: Fri, 17 May 2019 13:03:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 425014c5-8994-46cc-aa3d-ad531bf918d8 X-Archives-Hash: 2d5fb805d2fbf73162c61c843a435b9a commit: be444da99d70735ce2c735e97e5f840401e6a303 Author: Michael Haubenwallner gentoo org> AuthorDate: Tue May 14 13:51:37 2019 +0000 Commit: Michael Haubenwallner gentoo org> CommitDate: Fri May 17 13:03:26 2019 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=be444da9 dev-libs/glib: adjust for prefix-stack Package-Manager: Portage-2.3.62-prefix, Repoman-2.3.12 Signed-off-by: Michael Haubenwallner gentoo.org> dev-libs/glib/glib-2.56.2.ebuild | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dev-libs/glib/glib-2.56.2.ebuild b/dev-libs/glib/glib-2.56.2.ebuild index 31cbe3d8a8..9b685289c1 100644 --- a/dev-libs/glib/glib-2.56.2.ebuild +++ b/dev-libs/glib/glib-2.56.2.ebuild @@ -40,7 +40,7 @@ RDEPEND=" >=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}] >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] ) + !prefix-stack? ( kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] ) ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) @@ -66,7 +66,7 @@ DEPEND="${RDEPEND} # python depending package, which can be buildtime depended in packages that # need these tools, without pulling in python at runtime. RDEPEND="${RDEPEND} - >=dev-util/glib-utils-${PV}" + !prefix-stack? ( >=dev-util/glib-utils-${PV} )" PDEPEND=" dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info ) @@ -205,6 +205,11 @@ multilib_src_configure() { append-libs "-L${EPREFIX}/usr/$(get_libdir)" fi + local xmlcatalog="${EPREFIX}/etc/xml/catalog" + grep -q catalog= "${xmlcatalog}" || + grep -q catalog= "${BROOT-${PORTAGE_OVERRIDE_EPREFIX}}/etc/xml/catalog" && + xmlcatalog="${BROOT-${PORTAGE_OVERRIDE_EPREFIX}}/etc/xml/catalog" + # libelf used only by the gresource bin ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \ $(usex debug --enable-debug=yes ' ') \ @@ -220,7 +225,7 @@ multilib_src_configure() { --disable-compile-warnings \ --enable-man \ --with-pcre=system \ - --with-xml-catalog="${EPREFIX}/etc/xml/catalog" + --with-xml-catalog="${xmlcatalog}" if multilib_is_native_abi; then local d