public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Joonas Niilola" <juippis@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/vis/
Date: Sun,  5 Jul 2020 06:49:15 +0000 (UTC)	[thread overview]
Message-ID: <1593931683.769b44ae14f8ec95ed66730dfdc132631f59e3fb.juippis@gentoo> (raw)

commit:     769b44ae14f8ec95ed66730dfdc132631f59e3fb
Author:     Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Sun Jul  5 06:45:22 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Jul  5 06:48:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=769b44ae

app-editors/vis: Version bump, 0.6

Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-editors/vis/Manifest                           |  2 ++
 .../vis/{vis-9999.ebuild => vis-0.6.ebuild}        | 23 ++++++++++++++--------
 app-editors/vis/vis-9999.ebuild                    | 11 ++++-------
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/app-editors/vis/Manifest b/app-editors/vis/Manifest
index 54cce819aac..6258f1a7c75 100644
--- a/app-editors/vis/Manifest
+++ b/app-editors/vis/Manifest
@@ -1,2 +1,4 @@
 DIST vis-0.5.tar.gz 390461 BLAKE2B e628891c48dbbd11ed706768a3c625ffe9edf4fea3cd77452b4b41ae0d50194a31647e4cc945b69fb3af8fe7fd76ebf5f7afd8c2baa356f5f9fd3cc04be129ca SHA512 fe6b0394006562177efdf06713d7b95cd12fabf90b171c262eb2620d2b0944e73d3d8bb61f4f0d43d32154f0490c338bbc161a89455b14bb8a9d22cd75097780
+DIST vis-0.6.tar.gz 397707 BLAKE2B 9768f3d5586afd261f3e82721c08bdfddcd1c51a4f76d45c2f75eb954feed49d1ebeb1ee2cb31675cf68b356a0d32bcc33454aa2fbf0fd5c77afeea0a73465cd SHA512 3809b40f75816e03e47e0c2c16d2681cc1c01ad50a3d051285d5f1e9ff0a333160e668228a129a1596109aa079dc8364d3ad060b88e9dba33bb1d60a15eaf4e2
 DIST vis-test-0.3.tar.gz 97814 BLAKE2B f62b216df3d846bb8bfdb14f6092309b55f6571cbc980e7a9aed46b1672fbaa65c007ac4617266dff3d5ad0293e3f5e7bd8390252817ebcdd6f64edb350f82ee SHA512 5f68a70cf6f1fb64f9b50c1a56940c966f205e51240c7dd1175bc15f3e42b475fb6842a53e36547113955c2efa359de0cc71e0800305b0e45881c319a14564e5
+DIST vis-test-0.4.tar.gz 98703 BLAKE2B dc9df00ae97ecd58022f885b25cb8163dd8b86f93d95cf93bbe1bd1efcc7690393efc4d47e3dccedc5f0ac6c33519136e6f13e6b9b9707f870b421aa3101537e SHA512 446eea2fdb7b15fd4962901e2076649964981217b9cf47112f16d1404da7cc024ba4b13164df0afa763363cef4f82db4ad9d7283a7554aead2165f29ca0bc9a5

diff --git a/app-editors/vis/vis-9999.ebuild b/app-editors/vis/vis-0.6.ebuild
similarity index 60%
copy from app-editors/vis/vis-9999.ebuild
copy to app-editors/vis/vis-0.6.ebuild
index 72ff783c840..7a2ce6eaaa6 100644
--- a/app-editors/vis/vis-9999.ebuild
+++ b/app-editors/vis/vis-0.6.ebuild
@@ -1,20 +1,23 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit git-r3
+EAPI=7
+
+MY_PTV=0.4
 
 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"
+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 )"
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="+ncurses selinux test tre"
 RESTRICT="!test? ( test )"
 
-#Note: vis is reported to also work with NetBSD curses
-#TODO: >=dev-lang/lua-5.2 (needed for syntax highlighting and settings)
+# - Known to also work with NetBSD curses
+# - ::lua package done for using >=dev-lang/lua-5.2
+# which is needed for syntax highlighting and settings but masked in ::gentoo
 DEPEND="dev-libs/libtermkey
 	ncurses? ( sys-libs/ncurses:0= )
 	tre? ( dev-libs/tre:= )"
@@ -22,8 +25,12 @@ RDEPEND="${DEPEND}
 	app-eselect/eselect-vi"
 
 src_prepare() {
-	if use test && ! type -P vim &>/dev/null; then
-		sed -i 's/.*vim.*//' "${S}/test/Makefile" || die
+	if use test; then
+		rm -r test || die
+		mv "${WORKDIR}/vis-test-${MY_PTV}" test || die
+
+		# 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
 	fi
 
 	sed -i 's|STRIP?=.*|STRIP=true|' Makefile || die

diff --git a/app-editors/vis/vis-9999.ebuild b/app-editors/vis/vis-9999.ebuild
index 72ff783c840..600b5efb057 100644
--- a/app-editors/vis/vis-9999.ebuild
+++ b/app-editors/vis/vis-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit git-r3
 
 DESCRIPTION="modern, legacy free, simple yet efficient vim-like editor"
@@ -13,8 +13,9 @@ KEYWORDS=""
 IUSE="+ncurses selinux test tre"
 RESTRICT="!test? ( test )"
 
-#Note: vis is reported to also work with NetBSD curses
-#TODO: >=dev-lang/lua-5.2 (needed for syntax highlighting and settings)
+# - Known to also work with NetBSD curses
+# - ::lua package done for using >=dev-lang/lua-5.2
+# which is needed for syntax highlighting and settings but masked in ::gentoo
 DEPEND="dev-libs/libtermkey
 	ncurses? ( sys-libs/ncurses:0= )
 	tre? ( dev-libs/tre:= )"
@@ -22,10 +23,6 @@ RDEPEND="${DEPEND}
 	app-eselect/eselect-vi"
 
 src_prepare() {
-	if use test && ! type -P vim &>/dev/null; then
-		sed -i 's/.*vim.*//' "${S}/test/Makefile" || 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


             reply	other threads:[~2020-07-05  6:49 UTC|newest]

Thread overview: 63+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-05  6:49 Joonas Niilola [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-03-12 23:07 [gentoo-commits] repo/gentoo:master commit in: app-editors/vis/ Sam James
2025-03-12 23:07 Sam James
2025-03-12 23:07 Sam James
2025-01-21 13:53 Joonas Niilola
2025-01-21 13:53 Joonas Niilola
2025-01-21 13:53 Joonas Niilola
2025-01-21 13:53 Joonas Niilola
2025-01-21 13:53 Joonas Niilola
2025-01-21 13:53 Joonas Niilola
2025-01-21 13:53 Joonas Niilola
2024-09-19 18:34 Sam James
2024-09-19 18:34 Sam James
2024-09-19 18:34 Sam James
2024-06-02  8:44 Joonas Niilola
2024-06-02  8:44 Joonas Niilola
2024-04-04 15:05 Arthur Zamarin
2024-02-24 13:31 Joonas Niilola
2024-02-24  6:42 Joonas Niilola
2024-02-24  6:42 Joonas Niilola
2024-02-23  6:50 Sam James
2023-12-04  8:37 Sam James
2023-07-26  3:13 Sam James
2023-07-26  3:13 Sam James
2023-02-25  7:16 Arthur Zamarin
2023-02-25  5:56 Joonas Niilola
2023-02-25  5:56 Joonas Niilola
2022-11-18  8:17 Joonas Niilola
2022-11-18  8:17 Joonas Niilola
2022-09-09  6:20 Joonas Niilola
2022-09-09  6:20 Joonas Niilola
2022-09-09  6:20 Joonas Niilola
2022-09-09  6:20 Joonas Niilola
2022-09-09  6:20 Joonas Niilola
2022-08-20 11:40 Andreas Sturmlechner
2021-10-29 13:31 Yixun Lan
2021-05-16 18:56 Sam James
2021-05-15 19:20 Sam James
2021-03-02 14:54 Thomas Deutschmann
2021-02-12 16:20 Sam James
2020-12-15  7:18 Joonas Niilola
2020-12-15  7:18 Joonas Niilola
2020-12-03 13:21 Marek Szuba
2020-12-03 12:18 Marek Szuba
2020-12-03  7:59 Joonas Niilola
2020-06-07  6:34 Joonas Niilola
2020-06-06 16:36 Joonas Niilola
2020-06-06 16:36 Joonas Niilola
2020-02-11 11:56 Agostino Sarubbo
2020-02-10  8:18 Agostino Sarubbo
2020-02-10  8:16 Agostino Sarubbo
2020-01-09  5:09 Michał Górny
2018-03-26 19:22 Aaron Bauman
2018-03-26 19:22 Aaron Bauman
2018-02-09 16:37 Michał Górny
2018-02-09 16:37 Michał Górny
2018-02-09 16:37 Michał Górny
2018-02-09 16:37 Michał Górny
2018-02-09 16:37 Michał Górny
2018-02-09 16:37 Michał Górny
2018-02-09 16:37 Michał Górny
2018-02-09 16:37 Michał Górny
2017-05-07 18:33 Michał Górny

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1593931683.769b44ae14f8ec95ed66730dfdc132631f59e3fb.juippis@gentoo \
    --to=juippis@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox