gentoo auto-resync : 24:11:2022 - 19:11:10

4 files changed, 74 insertions, 3 deletions

diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 2dc0209893ab..ae974f51eac0 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -1,7 +1,8 @@
+AUX less-608-procfs.patch 1669 BLAKE2B b44ca75d76df10eb65e73230a68d3d8566121f60d0c60ef454bf96d0af9300b0a47aa633860802bfa548c014e2767c1f0cf14b29eff1719d81a6042b0255db28 SHA512 7a08a8935530326edc645ec2db5c089b7989a94cef2bba90da201173089621a1fcbdb333fd519e1ef49b6ebe82a8f725e361b33520bcd9efd3d55d4732d00668
 AUX less.envd 47 BLAKE2B 4ebc9242c96918c6942b05f67a9be541c6c535c23072e89e36c376e690cb7df9528e1734514092a6afdd3d4f47db45c6186a8cce5d9eb18ca7c73a01800f35fc SHA512 261b25887b08b3255e412b36130d014fc37ffc7de75dce3b5ba2521d94a1b0be4c584808b9698c30a8dafea70c62fae2cd0642d0983f96cdb418c3c501433674
 AUX lesspipe-r1.sh 8135 BLAKE2B f11727136a5235f07ad86c1811c5ef8489a48fc3d032b8840bc67eda70e1800f03505a534870a0ba73aa62e4df4315444c76fe8aa89ab47c8b2f1e08fab5b6e2 SHA512 e7820d0c925da4d217214e093c671d6c2da51da00dcec98bed80fe3e6d664cfd3baf1b850eb711e9ccf9a1d09f943e2fc2efc3e8061bbfa45724c5b623dafe94
 DIST less-608.tar.gz 362346 BLAKE2B 988940745fef1222c43b0bf4edec7cc7206ded0ac5d89d3faf4dab706a249913581c2fe7aa6063cf3d717176ed07b69299d3e791ba8a60358483fe9d1bf7f7c6 SHA512 7945b7f88921832ebb1b45fba8cbb449ee0133342796b654a52c146dfff3d84db18724ee84e53349eeea6017a0ebe2d8eb5366210275981dde7bb7190118fa66
 DIST less-612-beta.tar.gz 365379 BLAKE2B 85c391992a95edfa263804444ae935925dc1e31a632c981410b943fccce1062125aeae7d7a192f82f4257280cb4f21022dcbb1b5851908f4425d3b9a241b1892 SHA512 d359ff0de223da3181f31db865a12497cd8481aa0fcf0ca736736f9af0bac7d573a57fc77ada24c8aa8556696e8e52f0fef972828284639815854a0d57602be3
-EBUILD less-608.ebuild 1372 BLAKE2B 9e6ca781c599b023ac69f2f50efe2d67fd2240dd1377c0b01d03e5fa2dde68be1f64d28d118fcf96e25ac96e5ddaf4c85c3e531214f251cabe26ff75a2fb1b50 SHA512 4f1365280ed6c95546ccba75535592edc299a1e2facb1b34ea21c04e03754c05387bcf1a4543533dc1047ef78b762deb16c1cc13d0b5e111c3b6368647ce89df
-EBUILD less-612.ebuild 1533 BLAKE2B 68286de5509189b23fb5eff09313f887442de262b50c6004774e7306d6e014f2f60fdf18456dce7936a3b74901d71885b23ed18d9ba11f2c525779321e49b127 SHA512 31a3a49317e96a6925c3c979f57ffde08a8f2a5b00d3e981e28705fb8cabdabf0a3333012b55eb4fd507e361b70ae2b9f811f3f3540f705febaaeb1c98a73044
+EBUILD less-608-r1.ebuild 1631 BLAKE2B 3c0bcfb98082e497b3ff75bf44c5bc39882d34f9852aacf410e0802aa8eb65bde5242bf70055a7a1726678ba6971dc01508e9c86ff74597cf2160fbafd2844bd SHA512 c82f4ea7446b40acc3aeb9b33796dc4a55db2e90b3b83e18f7dadc0c4c8a9a88f473ef6cfad524ac0921cd5dce7c4f202bafc06a0f8a269762e0ae046cca7b35
+EBUILD less-612.ebuild 1735 BLAKE2B d64a969f79c4581f40fce12e6b66764021798ab683efb4e3048b99c82896da06fa604481a3ef1e96e6409905a2aee9753d35edd7593397e2daff8c2bd8c9cd43 SHA512 7d3c4b44a7cda7bf5865595a1f9f815fe4ed66870a1374f0b4808cabb8137c198a353c618692bc5912fccc63ae720445603edf4af57621c2310abc35c32e0cc9
 MISC metadata.xml 384 BLAKE2B ab69cbf4d7813bc4c96dc1c18ca35454dc9e9202bc95e3ff3b638c79b6cff4f9914fba1e7a35908aa305567a3874d3ead3a78f5faa83c9fbd3027afe12767eac SHA512 d799332d42f1c3115132216b3ba98a39f662d583aecb06fa2590e3da4c03b0ec07bab1eb0bbd397ef8249a5916ca9b457992c226899f66d4f4bef8bf1a20074f
diff --git a/sys-apps/less/files/less-608-procfs.patch b/sys-apps/less/files/less-608-procfs.patch
new file mode 100644
index 000000000000..4f66322b8123
--- /dev/null
+++ b/sys-apps/less/files/less-608-procfs.patch
@@ -0,0 +1,45 @@
+From 03f011f219a6d6068c4ccd07dbd8dcd50641ff10 Mon Sep 17 00:00:00 2001
+From: Mark Nudelman <markn@greenwoodsoftware.com>
+Date: Tue, 20 Sep 2022 12:32:30 -0700
+Subject: [PATCH] Fix reading procfs files on Linux: bad detection of
+ HAVE_PROCFS.
+
+diff --git a/ch.c b/ch.c
+index bfad09c7..fcf136b9 100644
+--- a/ch.c
++++ b/ch.c
+@@ -28,6 +28,9 @@ extern ino_t curr_ino;
+ 
+ #if HAVE_PROCFS
+ #include <sys/statfs.h>
++#if HAVE_LINUX_MAGIC_H
++#include <linux/magic.h>
++#endif
+ #endif
+ 
+ typedef POSITION BLOCKNUM;
+diff --git a/configure.ac b/configure.ac
+index f7c64814..b10adce9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -37,7 +37,7 @@ AC_SEARCH_LIBS([regcmp], [gen intl PW])
+ 
+ # Checks for header files.
+ AC_HEADER_STDC
+-AC_CHECK_HEADERS([ctype.h errno.h fcntl.h limits.h stdio.h stdlib.h string.h termcap.h termio.h termios.h time.h unistd.h values.h sys/ioctl.h sys/stream.h wctype.h])
++AC_CHECK_HEADERS([ctype.h errno.h fcntl.h limits.h stdio.h stdlib.h string.h termcap.h termio.h termios.h time.h unistd.h values.h linux/magic.h sys/ioctl.h sys/stream.h wctype.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STAT
+@@ -271,7 +271,10 @@ AC_TRY_COMPILE([#include <sys/types.h>
+   [struct stat s; dev_t dev = s.st_dev; ino_t ino = s.st_ino;],
+   [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_STAT_INO)], [AC_MSG_RESULT(no)])
+ AC_MSG_CHECKING(for procfs)
+-AC_TRY_COMPILE([#include <sys/statfs.h>],
++AC_TRY_COMPILE([#include <sys/statfs.h>
++#if HAVE_LINUX_MAGIC_H
++#include <linux/magic.h>
++#endif],
+   [struct statfs s; s.f_type = PROC_SUPER_MAGIC; (void) fstatfs(0,&s); ],
+   [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_PROCFS)], [AC_MSG_RESULT(no)])
+ 
diff --git a/sys-apps/less/less-608.ebuild b/sys-apps/less/less-608-r1.ebuild
index a10cea4792b3..0ad903424e2c 100644
--- a/sys-apps/less/less-608.ebuild
+++ b/sys-apps/less/less-608-r1.ebuild
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+WANT_AUTOMAKE=none
+WANT_LIBTOOL=none
+
+inherit autotools
 
 DESCRIPTION="Excellent text file viewer"
 HOMEPAGE="http://www.greenwoodsoftware.com/less/"
@@ -17,6 +21,16 @@ DEPEND=">=app-misc/editor-wrapper-3
 	pcre? ( dev-libs/libpcre2 )"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/less-608-procfs.patch"
+	)
+	default
+	# Upstream uses unpatched autoconf-2.69, which breaks with clang-16.
+	# https://bugs.gentoo.org/870412
+	eautoreconf
+}
+
 src_configure() {
 	export ac_cv_lib_ncursesw_initscr=$(usex unicode)
 	export ac_cv_lib_ncurses_initscr=$(usex !unicode)
diff --git a/sys-apps/less/less-612.ebuild b/sys-apps/less/less-612.ebuild
index 2c90aadd3c31..cb210766d048 100644
--- a/sys-apps/less/less-612.ebuild
+++ b/sys-apps/less/less-612.ebuild
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+WANT_AUTOMAKE=none
+WANT_LIBTOOL=none
+
+inherit autotools
 
 # Releases are usually first a beta then promoted to stable if no
 # issues were found. Upstream explicitly ask "to not generally distribute"
@@ -14,7 +18,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}-beta.tar.gz"
 
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pcre"
 
 DEPEND=">=app-misc/editor-wrapper-3
@@ -22,6 +26,13 @@ DEPEND=">=app-misc/editor-wrapper-3
 	pcre? ( dev-libs/libpcre2 )"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	default
+	# Upstream uses unpatched autoconf-2.69, which breaks with clang-16.
+	# https://bugs.gentoo.org/870412
+	eautoreconf
+}
+
 src_configure() {
 	local myeconfargs=(
 		--with-regex=$(usex pcre pcre2 posix)