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 CF7D21382C5 for ; Mon, 28 Dec 2020 17:35:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 20DADE0C14; Mon, 28 Dec 2020 17:35:54 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 0C47CE0C14 for ; Mon, 28 Dec 2020 17:35:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 081A43411CA for ; Mon, 28 Dec 2020 17:35:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6AB1A47E for ; Mon, 28 Dec 2020 17:35:51 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1609176947.4fefa42e5cf3283a1eb79880cb33c9245aaefad0.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xdg-user-dirs-gtk/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild X-VCS-Directories: x11-misc/xdg-user-dirs-gtk/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 4fefa42e5cf3283a1eb79880cb33c9245aaefad0 X-VCS-Branch: master Date: Mon, 28 Dec 2020 17:35:51 +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: d5d7fa1f-2bdd-4121-8266-6c38b84f0a23 X-Archives-Hash: c3a1c1a27964cc7fc810169f98995b67 commit: 4fefa42e5cf3283a1eb79880cb33c9245aaefad0 Author: David Michael gmail com> AuthorDate: Sat Dec 26 03:01:31 2020 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Mon Dec 28 17:35:47 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fefa42e x11-misc/xdg-user-dirs-gtk: EAPI 7, support cross-compiling The build system prevented the CHOST pkg-config from being found, so this specifies it as the cache variable to work around it. It also wants to know the path of a runtime dependency, so that is specified with EPREFIX so it isn't required at build time. Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: David Michael gmail.com> Signed-off-by: Mike Gilbert gentoo.org> .../xdg-user-dirs-gtk-0.10-r1.ebuild | 24 +++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild index d433d5e80ce..2d9acf66e61 100644 --- a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild +++ b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit gnome.org readme.gentoo-r1 +EAPI=7 +inherit gnome.org readme.gentoo-r1 toolchain-funcs DESCRIPTION="Integrates xdg-user-dirs into the Gnome desktop and Gtk+ applications" HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-user-dirs" @@ -10,14 +10,14 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-user-dirs" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="" RDEPEND=" dev-libs/glib - >=x11-misc/xdg-user-dirs-0.14 >=x11-libs/gtk+-3.5.1:3 + >=x11-misc/xdg-user-dirs-0.14 " -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" dev-util/intltool virtual/pkgconfig " @@ -30,15 +30,25 @@ DOC_CONTENTS=" " src_prepare() { - default_src_prepare + default sed -i \ -e '/Encoding/d' \ -e 's:OnlyShowIn=GNOME;LXDE;Unity;:NotShowIn=KDE;:' \ user-dirs-update-gtk.desktop.in || die } +src_configure() { + local -a myeconfargs=( + # Skip configure.ac disabling the cross-compiling pkg-config. + ac_cv_path_PKG_CONFIG="$(tc-getPKG_CONFIG)" + # Skip searching for this program in the CBUILD root. + XDG_USER_DIRS_UPDATE="${EPREFIX}/usr/bin/xdg-user-dirs-update" + ) + econf "${myeconfargs[@]}" +} + src_install() { - default_src_install + default readme.gentoo_create_doc }