From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1267511-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 0789D1382C5
for <garchives@archives.gentoo.org>; Mon, 5 Apr 2021 02:04:28 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 03F13E041F;
Mon, 5 Apr 2021 02:04:27 +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 D3188E041F
for <gentoo-commits@lists.gentoo.org>; Mon, 5 Apr 2021 02:04:26 +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 A0B7233BE2E
for <gentoo-commits@lists.gentoo.org>; Mon, 5 Apr 2021 02:04:25 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 0CB5D63B
for <gentoo-commits@lists.gentoo.org>; Mon, 5 Apr 2021 02:04:24 +0000 (UTC)
From: "Mike Gilbert" <floppym@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, "Mike Gilbert" <floppym@gentoo.org>
Message-ID: <1617588181.754e286bf1a5fdd6cf9d6be4cbbb3779dbd7559b.floppym@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-apps/xdm/
X-VCS-Repository: repo/gentoo
X-VCS-Files: x11-apps/xdm/xdm-1.1.12.ebuild
X-VCS-Directories: x11-apps/xdm/
X-VCS-Committer: floppym
X-VCS-Committer-Name: Mike Gilbert
X-VCS-Revision: 754e286bf1a5fdd6cf9d6be4cbbb3779dbd7559b
X-VCS-Branch: master
Date: Mon, 5 Apr 2021 02:04:24 +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: 92d75080-0af7-4c59-94c6-5662b4640f3c
X-Archives-Hash: 9fb5c038538049abe2f2ccefbbacf631
commit: 754e286bf1a5fdd6cf9d6be4cbbb3779dbd7559b
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 5 02:03:01 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Apr 5 02:03:01 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=754e286b
x11-apps/xdm: avoid using FILESDIR in pkg_setup
Defining PATCHES and configure flags in pkg_setup is weird.
Move them to src_prepare and src_configure, respectively.
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
x11-apps/xdm/xdm-1.1.12.ebuild | 33 +++++++++++++++++----------------
1 file changed, 17 insertions(+), 16 deletions(-)
diff --git a/x11-apps/xdm/xdm-1.1.12.ebuild b/x11-apps/xdm/xdm-1.1.12.ebuild
index 5f1478118b5..1199ae27622 100644
--- a/x11-apps/xdm/xdm-1.1.12.ebuild
+++ b/x11-apps/xdm/xdm-1.1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -37,13 +37,25 @@ RDEPEND="
DEPEND="${RDEPEND}
x11-base/xorg-proto"
-pkg_setup() {
- PATCHES=(
+src_prepare() {
+ local PATCHES=(
"${FILESDIR}"/${P}-consolekit.patch # bug 747124
"${FILESDIR}"/${P}-make-xinerama-optional.patch
)
- XORG_CONFIGURE_OPTIONS=(
+ sed -i -e 's:^Alias=.*$:Alias=display-manager.service:' \
+ xdm.service.in || die
+
+ # Disable XDM-AUTHORIZATION-1 (bug #445662).
+ # it causes issue with libreoffice and SDL games (bug #306223).
+ sed -i -e '/authorize/a DisplayManager*authName: MIT-MAGIC-COOKIE-1' \
+ config/xdm-config.in || die
+
+ xorg-3_src_prepare
+}
+
+src_configure() {
+ local XORG_CONFIGURE_OPTIONS=(
$(use_enable ipv6)
$(use_with pam)
$(use_with systemd systemd-daemon)
@@ -54,18 +66,7 @@ pkg_setup() {
--with-default-vt=${DEFAULTVT}
--with-xdmconfigdir=/etc/X11/xdm
)
-}
-
-src_prepare() {
- sed -i -e 's:^Alias=.*$:Alias=display-manager.service:' \
- xdm.service.in || die
-
- # Disable XDM-AUTHORIZATION-1 (bug #445662).
- # it causes issue with libreoffice and SDL games (bug #306223).
- sed -i -e '/authorize/a DisplayManager*authName: MIT-MAGIC-COOKIE-1' \
- config/xdm-config.in || die
-
- xorg-3_src_prepare
+ xorg-3_src_configure
}
src_install() {