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 2BE36138336 for ; Thu, 28 Feb 2019 05:47:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D0FA1E0903; Thu, 28 Feb 2019 05:47:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 93F87E0903 for ; Thu, 28 Feb 2019 05:47:46 +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 9453B335CEF for ; Thu, 28 Feb 2019 05:47:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 963CC555 for ; Thu, 28 Feb 2019 05:47:42 +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: <1551332686.f4d9d7a5278621e1af50506533344577a8e66626.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-base/xorg-server/xorg-server-9999.ebuild X-VCS-Directories: x11-base/xorg-server/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: f4d9d7a5278621e1af50506533344577a8e66626 X-VCS-Branch: master Date: Thu, 28 Feb 2019 05:47:42 +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: ef1aa8df-6ecf-4940-bc59-20535ea2793f X-Archives-Hash: b59883e2f130f4848c500b9bb9b004be commit: f4d9d7a5278621e1af50506533344577a8e66626 Author: Matt Turner gentoo org> AuthorDate: Thu Feb 28 04:36:38 2019 +0000 Commit: Matt Turner gentoo org> CommitDate: Thu Feb 28 05:44:46 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4d9d7a5 x11-base/xorg-server: Port to EAPI 7 Signed-off-by: Matt Turner gentoo.org> x11-base/xorg-server/xorg-server-9999.ebuild | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index d1cbe013ded..f9f7d582799 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 XORG_DOC=doc -inherit xorg-2 multilib versionator flag-o-matic +inherit xorg-3 multilib flag-o-matic EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git" DESCRIPTION="X.Org X servers" @@ -101,7 +101,7 @@ RDEPEND="${CDEPEND} " PDEPEND=" - xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" + xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" REQUIRED_USE="!minimal? ( || ( ${IUSE_SERVERS} ) @@ -109,9 +109,8 @@ REQUIRED_USE="!minimal? ( minimal? ( !glamor !wayland ) xephyr? ( kdrive )" -#UPSTREAMED_PATCHES=( -# "${WORKDIR}/patches/" -#) +UPSTREAMED_PATCHES=( +) PATCHES=( "${UPSTREAMED_PATCHES[@]}" @@ -120,20 +119,12 @@ PATCHES=( "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch ) -pkg_pretend() { - # older gcc is not supported - [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ - die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." -} - pkg_setup() { if use wayland && ! use glamor; then ewarn "glamor is necessary for acceleration under Xwayland." ewarn "Performance may be unacceptable without it." fi -} -src_configure() { # localstatedir is used for the log location; we need to override the default # from ebuild.sh # sysconfdir is used for the xorg.conf location; same applies @@ -176,18 +167,16 @@ src_configure() { --without-fop --with-sha1=libcrypto ) - - xorg-2_src_configure } src_install() { - xorg-2_src_install + default server_based_install if ! use minimal && use xorg; then # Install xorg.conf.example into docs - dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example + dodoc "${S}"/hw/xfree86/xorg.conf.example fi newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup