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 167EB13835A for ; Sun, 2 May 2021 15:25:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9DFB2E0857; Sun, 2 May 2021 15:25:04 +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 73C03E075F for ; Sun, 2 May 2021 15:25:04 +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 6D250335D3E for ; Sun, 2 May 2021 15:25:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C980A787 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: <1619969088.555523ed86e5e3eecb035af5b27a156dcd01fa79.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/libXfont2/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-libs/libXfont2/libXfont2-2.0.4.ebuild x11-libs/libXfont2/libXfont2-9999.ebuild X-VCS-Directories: x11-libs/libXfont2/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 555523ed86e5e3eecb035af5b27a156dcd01fa79 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: 2e7ef7db-63fc-407a-b8c6-b883fa6079a4 X-Archives-Hash: f8904dfeeb038c1b174b6b01b8c45fd0 commit: 555523ed86e5e3eecb035af5b27a156dcd01fa79 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:48 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=555523ed x11-libs/libXfont2: 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/libXfont2/libXfont2-2.0.4.ebuild | 5 +++-- x11-libs/libXfont2/libXfont2-9999.ebuild | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/x11-libs/libXfont2/libXfont2-2.0.4.ebuild b/x11-libs/libXfont2/libXfont2-2.0.4.ebuild index 22ade10fa26..7a77ae02471 100644 --- a/x11-libs/libXfont2/libXfont2-2.0.4.ebuild +++ b/x11-libs/libXfont2/libXfont2-2.0.4.ebuild @@ -21,8 +21,8 @@ DEPEND="${RDEPEND} x11-base/xorg-proto x11-libs/xtrans" -pkg_setup() { - XORG_CONFIGURE_OPTIONS=( +src_configure() { + local XORG_CONFIGURE_OPTIONS=( $(use_enable ipv6) $(use_enable doc devel-docs) $(use_with doc xmlto) @@ -30,4 +30,5 @@ pkg_setup() { $(use_enable truetype freetype) --without-fop ) + xorg-3_src_configure } diff --git a/x11-libs/libXfont2/libXfont2-9999.ebuild b/x11-libs/libXfont2/libXfont2-9999.ebuild index cfd74911baa..cc2376f181c 100644 --- a/x11-libs/libXfont2/libXfont2-9999.ebuild +++ b/x11-libs/libXfont2/libXfont2-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,8 +21,8 @@ DEPEND="${RDEPEND} x11-base/xorg-proto x11-libs/xtrans" -pkg_setup() { - XORG_CONFIGURE_OPTIONS=( +src_configure() { + local XORG_CONFIGURE_OPTIONS=( $(use_enable ipv6) $(use_enable doc devel-docs) $(use_with doc xmlto) @@ -30,4 +30,5 @@ pkg_setup() { $(use_enable truetype freetype) --without-fop ) + xorg-3_src_configure }