mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-09 05:56:58 +02:00
sys-apps/less: Sync with Gentoo
It's from Gentoo commit 7f4e49459603ed0b21c1368802a8cbbd04f86e21.
This commit is contained in:
parent
c5faf1c980
commit
151fe74ede
52
sdk_container/src/third_party/portage-stable/sys-apps/less/files/less-633-tinfow.patch
vendored
Normal file
52
sdk_container/src/third_party/portage-stable/sys-apps/less/files/less-633-tinfow.patch
vendored
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
https://github.com/gwsw/less/pull/403
|
||||||
|
|
||||||
|
From 23000c286773af153a5743bc923465707b87613b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Sam James <sam@gentoo.org>
|
||||||
|
Date: Mon, 17 Jul 2023 22:58:27 +0100
|
||||||
|
Subject: [PATCH] configure.ac: Check for tinfow before tinfo
|
||||||
|
|
||||||
|
We currently check for ncursesw > ncurses and then tinfo > tinfow. This means
|
||||||
|
we can get a mismatch of ncursesw + tinfo, instead of the correct ncursesw + tinfow.
|
||||||
|
|
||||||
|
Swap the order so we check for ncursesw first (before other ncurses variants)
|
||||||
|
and then tinfow first (before other tinfo variants).
|
||||||
|
|
||||||
|
This is needed anyway for correctness, but also needed for certain terminfos
|
||||||
|
to work correctly with recent ncurses.
|
||||||
|
|
||||||
|
A better fix would be to use pkg-config first which handles this correctly
|
||||||
|
and would include the appropriate -ltinfo* in the libraries list for -lncurses*,
|
||||||
|
but not doing that for now.
|
||||||
|
|
||||||
|
Bug: https://bugs.gentoo.org/910430
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -63,10 +63,10 @@ fi
|
||||||
|
|
||||||
|
if test $curses_broken = 0; then
|
||||||
|
|
||||||
|
-# -- Try tinfo.
|
||||||
|
+# -- Try tinfow.
|
||||||
|
if test "x$TERMLIBS" = x; then
|
||||||
|
- if test $have_tinfo = yes; then
|
||||||
|
- TERMLIBS="-ltinfo"
|
||||||
|
+ if test $have_tinfow = yes; then
|
||||||
|
+ TERMLIBS="-ltinfow"
|
||||||
|
SAVE_LIBS=$LIBS
|
||||||
|
LIBS="$LIBS $TERMLIBS"
|
||||||
|
AC_LINK_IFELSE([AC_LANG_PROGRAM([[$include_termcap_h]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no])
|
||||||
|
@@ -75,10 +75,10 @@ if test "x$TERMLIBS" = x; then
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
-# -- Try tinfow.
|
||||||
|
+# -- Try tinfo.
|
||||||
|
if test "x$TERMLIBS" = x; then
|
||||||
|
- if test $have_tinfow = yes; then
|
||||||
|
- TERMLIBS="-ltinfow"
|
||||||
|
+ if test $have_tinfo = yes; then
|
||||||
|
+ TERMLIBS="-ltinfo"
|
||||||
|
SAVE_LIBS=$LIBS
|
||||||
|
LIBS="$LIBS $TERMLIBS"
|
||||||
|
AC_LINK_IFELSE([AC_LANG_PROGRAM([[$include_termcap_h]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no])
|
||||||
|
|
86
sdk_container/src/third_party/portage-stable/sys-apps/less/less-633-r2.ebuild
vendored
Normal file
86
sdk_container/src/third_party/portage-stable/sys-apps/less/less-633-r2.ebuild
vendored
Normal file
@ -0,0 +1,86 @@
|
|||||||
|
# Copyright 1999-2023 Gentoo Authors
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=8
|
||||||
|
|
||||||
|
WANT_AUTOMAKE=none
|
||||||
|
WANT_LIBTOOL=none
|
||||||
|
|
||||||
|
if [[ ${PV} == 9999 ]]; then
|
||||||
|
EGIT_REPO_URI="https://github.com/gwsw/less"
|
||||||
|
inherit git-r3
|
||||||
|
fi
|
||||||
|
|
||||||
|
inherit autotools flag-o-matic optfeature
|
||||||
|
|
||||||
|
# Releases are usually first a beta then promoted to stable if no
|
||||||
|
# issues were found. Upstream explicitly ask "to not generally distribute"
|
||||||
|
# the beta versions. It's okay to keyword beta versions if they fix
|
||||||
|
# a serious bug, but otherwise try to avoid it.
|
||||||
|
|
||||||
|
MY_PV=${PV/_beta/-beta}
|
||||||
|
MY_P=${PN}-${MY_PV}
|
||||||
|
DESCRIPTION="Excellent text file viewer"
|
||||||
|
HOMEPAGE="https://www.greenwoodsoftware.com/less/"
|
||||||
|
[[ ${PV} != 9999 ]] && SRC_URI="https://www.greenwoodsoftware.com/less/${MY_P}.tar.gz"
|
||||||
|
S="${WORKDIR}"/${MY_P/?beta}
|
||||||
|
|
||||||
|
LICENSE="|| ( GPL-3 BSD-2 )"
|
||||||
|
SLOT="0"
|
||||||
|
if [[ ${PV} != 9999 && ${PV} != *_beta* ]] ; then
|
||||||
|
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||||
|
fi
|
||||||
|
IUSE="pcre"
|
||||||
|
# As of 623_beta, lesstest is not included in dist tarballs
|
||||||
|
# https://github.com/gwsw/less/issues/344
|
||||||
|
RESTRICT="test"
|
||||||
|
|
||||||
|
DEPEND="
|
||||||
|
>=app-misc/editor-wrapper-3
|
||||||
|
>=sys-libs/ncurses-5.2:=
|
||||||
|
pcre? ( dev-libs/libpcre2 )
|
||||||
|
"
|
||||||
|
RDEPEND="${DEPEND}"
|
||||||
|
|
||||||
|
PATCHES=(
|
||||||
|
"${FILESDIR}"/${PN}-633-tinfow.patch
|
||||||
|
)
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
default
|
||||||
|
# Per upstream README to prepare live build
|
||||||
|
[[ ${PV} == 9999 ]] && emake -f Makefile.aut distfiles
|
||||||
|
# Upstream uses unpatched autoconf-2.69, which breaks with clang-16.
|
||||||
|
# https://bugs.gentoo.org/870412
|
||||||
|
eautoreconf
|
||||||
|
}
|
||||||
|
|
||||||
|
src_configure() {
|
||||||
|
append-lfs-flags # bug #896316
|
||||||
|
|
||||||
|
local myeconfargs=(
|
||||||
|
--with-regex=$(usex pcre pcre2 posix)
|
||||||
|
--with-editor="${EPREFIX}"/usr/libexec/editor
|
||||||
|
)
|
||||||
|
econf "${myeconfargs[@]}"
|
||||||
|
}
|
||||||
|
|
||||||
|
src_test() {
|
||||||
|
emake check VERBOSE=1
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
default
|
||||||
|
|
||||||
|
newbin "${FILESDIR}"/lesspipe-r2.sh lesspipe
|
||||||
|
newenvd "${FILESDIR}"/less.envd 70less
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_preinst() {
|
||||||
|
optfeature "Colorized output supprt" dev-python/pygments
|
||||||
|
|
||||||
|
if has_version "<${CATEGORY}/${PN}-483-r1" ; then
|
||||||
|
elog "The lesspipe.sh symlink has been dropped. If you are still setting"
|
||||||
|
elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'."
|
||||||
|
fi
|
||||||
|
}
|
@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
|
|||||||
inherit git-r3
|
inherit git-r3
|
||||||
fi
|
fi
|
||||||
|
|
||||||
inherit autotools optfeature
|
inherit autotools flag-o-matic optfeature
|
||||||
|
|
||||||
# Releases are usually first a beta then promoted to stable if no
|
# Releases are usually first a beta then promoted to stable if no
|
||||||
# issues were found. Upstream explicitly ask "to not generally distribute"
|
# issues were found. Upstream explicitly ask "to not generally distribute"
|
||||||
@ -31,9 +31,6 @@ if [[ ${PV} != 9999 && ${PV} != *_beta* ]] ; then
|
|||||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||||
fi
|
fi
|
||||||
IUSE="pcre"
|
IUSE="pcre"
|
||||||
# As of 623_beta, lesstest is not included in dist tarballs
|
|
||||||
# https://github.com/gwsw/less/issues/344
|
|
||||||
RESTRICT="test"
|
|
||||||
|
|
||||||
DEPEND="
|
DEPEND="
|
||||||
>=app-misc/editor-wrapper-3
|
>=app-misc/editor-wrapper-3
|
||||||
@ -42,6 +39,10 @@ DEPEND="
|
|||||||
"
|
"
|
||||||
RDEPEND="${DEPEND}"
|
RDEPEND="${DEPEND}"
|
||||||
|
|
||||||
|
PATCHES=(
|
||||||
|
"${FILESDIR}"/${PN}-633-tinfow.patch
|
||||||
|
)
|
||||||
|
|
||||||
src_prepare() {
|
src_prepare() {
|
||||||
default
|
default
|
||||||
# Per upstream README to prepare live build
|
# Per upstream README to prepare live build
|
||||||
@ -52,6 +53,8 @@ src_prepare() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
src_configure() {
|
src_configure() {
|
||||||
|
append-lfs-flags # bug #896316
|
||||||
|
|
||||||
local myeconfargs=(
|
local myeconfargs=(
|
||||||
--with-regex=$(usex pcre pcre2 posix)
|
--with-regex=$(usex pcre pcre2 posix)
|
||||||
--with-editor="${EPREFIX}"/usr/libexec/editor
|
--with-editor="${EPREFIX}"/usr/libexec/editor
|
||||||
|
Loading…
Reference in New Issue
Block a user