gentoo auto-resync : 18:07:2023 - 00:58:24

4 files changed, 148 insertions, 5 deletions

diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 56b866bfdb52..3a7a4e819ad1 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -1,5 +1,6 @@
 AUX less-608-CVE-2022-46663.patch 696 BLAKE2B 3f4ddff375321ec410b12b9dac457536c98a9a3f123e0715dc40cbd0fe85e4b59676767ea6819688338d6280158ae7f04f93bbf283d8616da5021816f4125fa3 SHA512 417c06b1dd7ff764b58b4cc4c93df2d44d224780b5799ecaad50348b4654bd26f181082539855203d9f1e6a928908cdf650269c9998dbd6dab31e5e912d41cfc
 AUX less-608-procfs.patch 1669 BLAKE2B b44ca75d76df10eb65e73230a68d3d8566121f60d0c60ef454bf96d0af9300b0a47aa633860802bfa548c014e2767c1f0cf14b29eff1719d81a6042b0255db28 SHA512 7a08a8935530326edc645ec2db5c089b7989a94cef2bba90da201173089621a1fcbdb333fd519e1ef49b6ebe82a8f725e361b33520bcd9efd3d55d4732d00668
+AUX less-633-tinfow.patch 1804 BLAKE2B fe590b454289e93278c70e479ced66bae59e83e2bb857a0eedb7011cd8133df327b7a4ff1deb7cdc3a32c2d02e9b091a37b0cbbb4d1ec4661cbce901ef95fae9 SHA512 3841d4568b290eebf9a3b1d6b8d6439b7b53c21efd7adf2c795b79c450b5e823436f9d6ddbe37b75a6fba64b72d5497adf9a006a9cb06fd8e44e5c86c8e0f946
 AUX less.envd 47 BLAKE2B 4ebc9242c96918c6942b05f67a9be541c6c535c23072e89e36c376e690cb7df9528e1734514092a6afdd3d4f47db45c6186a8cce5d9eb18ca7c73a01800f35fc SHA512 261b25887b08b3255e412b36130d014fc37ffc7de75dce3b5ba2521d94a1b0be4c584808b9698c30a8dafea70c62fae2cd0642d0983f96cdb418c3c501433674
 AUX lesspipe-r1.sh 8135 BLAKE2B f11727136a5235f07ad86c1811c5ef8489a48fc3d032b8840bc67eda70e1800f03505a534870a0ba73aa62e4df4315444c76fe8aa89ab47c8b2f1e08fab5b6e2 SHA512 e7820d0c925da4d217214e093c671d6c2da51da00dcec98bed80fe3e6d664cfd3baf1b850eb711e9ccf9a1d09f943e2fc2efc3e8061bbfa45724c5b623dafe94
 AUX lesspipe-r2.sh 8293 BLAKE2B 2c572cbb554ab229830090040a5cd523739b7ffbd41ff910170dc0865d573a946a9548a03a5dc661a272c4297c1501f4bca1d7642e0d5c2e499f9248e174d65d SHA512 d16850172c05c2d75a4c069af3b0d4556dd3da52ce008a7ebe37e421ac089a3174e0f16955ca6edfaa110925cd1bee7f61f11374c802ef5de8ed0a23a2c2b96b
@@ -10,6 +11,7 @@ EBUILD less-608-r1.ebuild 1587 BLAKE2B 68675bd30388ab95aa57d8fc90bcd98fc6b27f26e
 EBUILD less-608-r2.ebuild 1634 BLAKE2B 87c9824276ec63f523bef354cdc92a91f6771e43adcf141c8a8e0b6ae20eb2391a15bdd8c37d18527d04135c873fe4330207bcbd331fabf20f7c3e0cbfc03343 SHA512 5f97824ddd3760ddc995d2eff9d915f023e9162a803e1fcc098abc2cd56745b250df1b37646e7cb533c74bbd3436bc4784e70f3cd7cd76716dfe7a32acdc6279
 EBUILD less-632.ebuild 2188 BLAKE2B 3157e4c5b111b0f1b8e1ef9a9a437474f5380af2b6bbc7e1011d102b6d6cefd788fe2c60bb7d272f0fcdf69db0fd1692c66a42bb47b648f94dfe3281ecdebdc6 SHA512 299d40de3ac0c4d3a9321dca6efbc44aad50066fabe324c0e0cea407469adf374b26887cd4ca1347cec99eb6c2037d3fff2e8cbc764d44ee509759b27f588b1e
 EBUILD less-633-r1.ebuild 2145 BLAKE2B 75ae1bea2dbb05b4312e4eb965d8eed139cee5ee70c243452bbeda9711b582cea641871372e9cbaee0005e296291cd634a09175efe4acb7f68d2f6891e5ff3b4 SHA512 1353a46b9ccbab1fb3e58d171ae098da0a838ec37ca7b99ceec7585d927b2f6494d717890a55db7ce053e67bf010fddf7f293ad144e79275e965c0cf0efd5f3f
+EBUILD less-633-r2.ebuild 2242 BLAKE2B fd789264823a69c63b959d72e425db69b232ee8af9eb051a99ca4210a422de7997880867c8cd9a0955182a9f81d56e2c61430fff3dbc4075ae9261eaf92c62b9 SHA512 f7c256e5ba0652476bb3d0f94e62dc14987c8547c53153682d877fe1428b80861cb8dffd2a613959a8b4727fb7f88e9ec8f9ca2a32e58e0e3649c3a4b9b9a74e
 EBUILD less-633.ebuild 2188 BLAKE2B 3157e4c5b111b0f1b8e1ef9a9a437474f5380af2b6bbc7e1011d102b6d6cefd788fe2c60bb7d272f0fcdf69db0fd1692c66a42bb47b648f94dfe3281ecdebdc6 SHA512 299d40de3ac0c4d3a9321dca6efbc44aad50066fabe324c0e0cea407469adf374b26887cd4ca1347cec99eb6c2037d3fff2e8cbc764d44ee509759b27f588b1e
-EBUILD less-9999.ebuild 2145 BLAKE2B 75ae1bea2dbb05b4312e4eb965d8eed139cee5ee70c243452bbeda9711b582cea641871372e9cbaee0005e296291cd634a09175efe4acb7f68d2f6891e5ff3b4 SHA512 1353a46b9ccbab1fb3e58d171ae098da0a838ec37ca7b99ceec7585d927b2f6494d717890a55db7ce053e67bf010fddf7f293ad144e79275e965c0cf0efd5f3f
+EBUILD less-9999.ebuild 2124 BLAKE2B 345d0f8258332cd65eca9a57f438415e69805d15a9e03b46db1267448f1c6720bb4aff6f5faf67cd44030a7337a725ab829225e9bdff348bfd06922558b56af4 SHA512 77ea066f0243f89e36f1947dd07cf0ce49294dd49cea5369b990ec294ecaccc7e18cd5ccba89d1bb7f2234cb5cf48c63b5cd12e410ba176d90e20ff15a4af54d
 MISC metadata.xml 384 BLAKE2B ab69cbf4d7813bc4c96dc1c18ca35454dc9e9202bc95e3ff3b638c79b6cff4f9914fba1e7a35908aa305567a3874d3ead3a78f5faa83c9fbd3027afe12767eac SHA512 d799332d42f1c3115132216b3ba98a39f662d583aecb06fa2590e3da4c03b0ec07bab1eb0bbd397ef8249a5916ca9b457992c226899f66d4f4bef8bf1a20074f
diff --git a/sys-apps/less/files/less-633-tinfow.patch b/sys-apps/less/files/less-633-tinfow.patch
new file mode 100644
index 000000000000..82ea458cd008
--- /dev/null
+++ b/sys-apps/less/files/less-633-tinfow.patch
@@ -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])
+
diff --git a/sys-apps/less/less-633-r2.ebuild b/sys-apps/less/less-633-r2.ebuild
new file mode 100644
index 000000000000..5d22949f4f80
--- /dev/null
+++ b/sys-apps/less/less-633-r2.ebuild
@@ -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
+}
diff --git a/sys-apps/less/less-9999.ebuild b/sys-apps/less/less-9999.ebuild
index c6edffba45d8..cbd0aff28900 100644
--- a/sys-apps/less/less-9999.ebuild
+++ b/sys-apps/less/less-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 fi
 
-inherit autotools optfeature
+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"
@@ -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"
 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
@@ -42,6 +39,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-633-tinfow.patch
+)
+
 src_prepare() {
 	default
 	# Per upstream README to prepare live build
@@ -52,6 +53,8 @@ src_prepare() {
 }
 
 src_configure() {
+	append-lfs-flags # bug #896316
+
 	local myeconfargs=(
 		--with-regex=$(usex pcre pcre2 posix)
 		--with-editor="${EPREFIX}"/usr/libexec/editor