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 87F62138359 for ; Mon, 9 Nov 2020 22:18:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C8E43E07F9; Mon, 9 Nov 2020 22:18:29 +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 9E4FBE07F9 for ; Mon, 9 Nov 2020 22:18:29 +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 22B32340B54 for ; Mon, 9 Nov 2020 22:18:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8DA2843B for ; Mon, 9 Nov 2020 22:18:26 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1604960303.0f071c5212df523bee53b10e55b163471353638a.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/i3/i3-9999.ebuild X-VCS-Directories: x11-wm/i3/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 0f071c5212df523bee53b10e55b163471353638a X-VCS-Branch: master Date: Mon, 9 Nov 2020 22:18:26 +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: b80e2b4e-f4fc-423d-92a0-a64465648200 X-Archives-Hash: ed4e11df5046736261030a5d9b6cc27b commit: 0f071c5212df523bee53b10e55b163471353638a Author: Nelo-T. Wallus wallus de> AuthorDate: Wed Jul 1 15:36:34 2020 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon Nov 9 22:18:23 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f071c52 x11-wm/i3: Switch build system to meson in the live ebuild Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Nelo-T. Wallus wallus.de> Closes: https://github.com/gentoo/gentoo/pull/18207 Signed-off-by: Lars Wendler gentoo.org> x11-wm/i3/i3-9999.ebuild | 69 ++++++++++++++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 25 deletions(-) diff --git a/x11-wm/i3/i3-9999.ebuild b/x11-wm/i3/i3-9999.ebuild index f87cfbc0063..01355605396 100644 --- a/x11-wm/i3/i3-9999.ebuild +++ b/x11-wm/i3/i3-9999.ebuild @@ -1,24 +1,30 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit autotools git-r3 +inherit meson virtualx +if [[ "${PV}" = *9999 ]]; then + inherit git-r3 +fi DESCRIPTION="An improved dynamic tiling window manager" HOMEPAGE="https://i3wm.org/" -SRC_URI="" -EGIT_REPO_URI="https://github.com/i3/i3" -EGIT_BRANCH="next" +if [[ "${PV}" = *9999 ]]; then + EGIT_REPO_URI="https://github.com/i3/i3" + EGIT_BRANCH="next" +else + SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi LICENSE="BSD" SLOT="0" -KEYWORDS="" -IUSE="doc" +IUSE="doc test" CDEPEND="dev-libs/libev dev-libs/libpcre - >=dev-libs/yajl-2.0.3 + dev-libs/yajl x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/startup-notification @@ -28,15 +34,31 @@ CDEPEND="dev-libs/libev x11-libs/xcb-util-wm x11-libs/xcb-util-xrm x11-misc/xkeyboard-config - >=x11-libs/cairo-1.14.4[X,xcb(+)] - >=x11-libs/pango-1.30.0[X]" + x11-libs/cairo[X,xcb(+)] + x11-libs/pango[X]" DEPEND="${CDEPEND} - doc? ( app-text/asciidoc app-text/xmlto dev-lang/perl ) - virtual/pkgconfig" + test? ( + dev-perl/AnyEvent + dev-perl/X11-XCB + dev-perl/Inline + dev-perl/Inline-C + dev-perl/IPC-Run + dev-perl/ExtUtils-PkgConfig + dev-perl/local-lib + virtual/perl-Test-Simple + x11-base/xorg-server[xephyr] + x11-misc/xvfb-run + ) + doc? ( + app-text/asciidoc + app-text/xmlto + dev-lang/perl + )" RDEPEND="${CDEPEND} dev-lang/perl dev-perl/AnyEvent-I3 dev-perl/JSON-XS" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}/${PN}-4.16-musl-GLOB_TILDE.patch" @@ -45,11 +67,6 @@ PATCHES=( src_prepare() { default - if ! use doc ; then - sed -e '/AC_PATH_PROG(\[PATH_ASCIIDOC/d' -i configure.ac || die - fi - eautoreconf - cat <<- EOF > "${T}"/i3wm #!/bin/sh exec /usr/bin/i3 @@ -57,24 +74,26 @@ src_prepare() { } src_configure() { - local myeconfargs=( --enable-debug=no ) # otherwise injects -O0 -g - econf "${myeconfargs[@]}" -} + local emesonargs=( + $(meson_use doc docs) + $(meson_use doc mans) + ) -src_compile() { - emake -C "${CBUILD}" + meson_src_configure } src_install() { - emake -C "${CBUILD}" DESTDIR="${D}" install - einstalldocs + default exeinto /etc/X11/Sessions doexe "${T}"/i3wm } -pkg_postinst() { +src_test() { + virtx meson_src_test +} +pkg_postinst() { # Only show the elog information on a new install if [[ ! ${REPLACING_VERSIONS} ]]; then elog "There are several packages that you may find useful with ${PN} and"