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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D1994158095 for ; Fri, 9 Sep 2022 06:21:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DFB90E08C3; Fri, 9 Sep 2022 06:20:59 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C560BE08C3 for ; Fri, 9 Sep 2022 06:20:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D1503341175 for ; Fri, 9 Sep 2022 06:20:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 470955D0 for ; Fri, 9 Sep 2022 06:20:57 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1662704448.2f0963023339fa175e780f9a1797f75731a67d54.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/vis/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/vis/vis-9999.ebuild X-VCS-Directories: app-editors/vis/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 2f0963023339fa175e780f9a1797f75731a67d54 X-VCS-Branch: master Date: Fri, 9 Sep 2022 06:20:57 +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: 0babc54d-b7cf-4016-a76b-b3f4ec1486f0 X-Archives-Hash: c7baf9c205c04ca3e00405374552cd79 commit: 2f0963023339fa175e780f9a1797f75731a67d54 Author: Haelwenn (lanodan) Monnier hacktivis me> AuthorDate: Sat Aug 6 22:25:11 2022 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Fri Sep 9 06:20:48 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f096302 app-editors/vis: Sync live with stable Signed-off-by: Haelwenn (lanodan) Monnier hacktivis.me> Signed-off-by: Joonas Niilola gentoo.org> app-editors/vis/vis-9999.ebuild | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/app-editors/vis/vis-9999.ebuild b/app-editors/vis/vis-9999.ebuild index 9f919a60fc33..5a59b6cd9f88 100644 --- a/app-editors/vis/vis-9999.ebuild +++ b/app-editors/vis/vis-9999.ebuild @@ -1,17 +1,26 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + +MY_PTV=0.5 LUA_COMPAT=( lua5-2 lua5-3 ) -inherit lua-single git-r3 optfeature +inherit lua-single optfeature + +if [ "${PV}" == "9999" ]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/martanne/vis.git" +else + SRC_URI="https://github.com/martanne/vis/releases/download/v${PV}/${P}.tar.gz + test? ( https://github.com/martanne/vis-test/releases/download/v${MY_PTV}/vis-test-${MY_PTV}.tar.gz )" + KEYWORDS="~amd64 ~arm ~riscv ~x86" +fi DESCRIPTION="modern, legacy free, simple yet efficient vim-like editor" HOMEPAGE="https://github.com/martanne/vis" -EGIT_REPO_URI="https://github.com/martanne/vis.git" LICENSE="ISC" SLOT="0" -KEYWORDS="" IUSE="+ncurses +lua selinux test tre" REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" RESTRICT="!test? ( test )" @@ -31,6 +40,19 @@ pkg_setup() { } src_prepare() { + if use test; then + if [ ! "${PV}" == "9999" ]; then + rm -r test || die + mv "${WORKDIR}/vis-test-${MY_PTV}" test || die + fi + + # https://bugs.gentoo.org/722014 https://github.com/martanne/vis-test/pull/22 + sed -i 's;./ccan-config > config.h;./ccan-config "${CC}" ${CFLAGS} > config.h;' test/core/Makefile || die + + # https://github.com/martanne/vis-test/issues/27 a Werror clone + sed -i 's;|| strstr(output, "warning");;' test/core/ccan-config.c || die + fi + sed -i 's|STRIP?=.*|STRIP=true|' Makefile || die sed -i 's|${DOCPREFIX}/vis|${DOCPREFIX}|' Makefile || die sed -i 's|DOCUMENTATION = LICENSE|DOCUMENTATION =|' Makefile || die