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 F30071382C5 for ; Sun, 2 May 2021 15:25:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F2F54E08EF; Sun, 2 May 2021 15:25:03 +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 CBB51E08EF for ; Sun, 2 May 2021 15:25:03 +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 14EC1335D05 for ; Sun, 2 May 2021 15:25:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 58DD8753 for ; Sun, 2 May 2021 15:24:59 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1619969087.19eab8e2d4497e06e68d48281e161dc952688bc8.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/libX11/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-libs/libX11/libX11-1.7.0.ebuild X-VCS-Directories: x11-libs/libX11/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 19eab8e2d4497e06e68d48281e161dc952688bc8 X-VCS-Branch: master Date: Sun, 2 May 2021 15:24:59 +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: 4a44210b-d761-47fa-9bdd-db19f9eb2aba X-Archives-Hash: f288ec7c9364a82fb79b14619df3dcad commit: 19eab8e2d4497e06e68d48281e161dc952688bc8 Author: David Seifert gentoo org> AuthorDate: Sat May 1 23:55:06 2021 +0000 Commit: Matt Turner gentoo org> CommitDate: Sun May 2 15:24:47 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19eab8e2 x11-libs/libX11: Define XORG_CONFIGURE_OPTIONS in src_configure Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: David Seifert gentoo.org> Signed-off-by: Matt Turner gentoo.org> x11-libs/libX11/libX11-1.7.0.ebuild | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/x11-libs/libX11/libX11-1.7.0.ebuild b/x11-libs/libX11/libX11-1.7.0.ebuild index caba9f751d6..903e051b027 100644 --- a/x11-libs/libX11/libX11-1.7.0.ebuild +++ b/x11-libs/libX11/libX11-1.7.0.ebuild @@ -22,17 +22,18 @@ DEPEND="${RDEPEND} x11-libs/xtrans" BDEPEND="test? ( dev-lang/perl )" -pkg_setup() { - XORG_CONFIGURE_OPTIONS=( +src_configure() { + local XORG_CONFIGURE_OPTIONS=( $(use_with doc xmlto) $(use_enable doc specs) $(use_enable ipv6) --without-fop CPP="$(tc-getPROG CPP cpp)" ) + xorg-3_src_configure } src_install() { xorg-3_src_install - rm -Rf "${ED}/usr/share/X11/locale" + rm -rf "${ED}"/usr/share/X11/locale || die }