gentoo auto-resync : 30:12:2022 - 02:16:21

3 files changed, 82 insertions, 3 deletions

diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 4954da2c7a4a..43e3da04c191 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -2,7 +2,8 @@ AUX less-608-procfs.patch 1669 BLAKE2B b44ca75d76df10eb65e73230a68d3d8566121f60d
 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-617-beta.tar.gz 366906 BLAKE2B ccadbdefc33b2df416058cb065afc5e4f8278d49615bf1b25c47180539d080f29f574c4871d0424cc6413b70e7fab99799d4a2661ab8bbc1894526603b94dbff SHA512 16365e79d0fa1e5c70a182e209a1ecc8c33242dcc973680f036ed09054dfd6910d63d79cb080cb1b2cffc5b7d8850666116ad7ee6de1db6140f2fd58ad00ad19
+DIST less-618-beta.tar.gz 365786 BLAKE2B b1957ab49059a2df14d8ba5daf1d8543adc4546c44b537d86959e2e1fe2df93f99ceb8ef47097b6f84f75f7740e161269b4e1d5dd263b8171212c87e650a02fe SHA512 6197aa20c77a846e53b376aa63c2863242c40663e72213f66c3597bd8c38a9458163d0c9ba0ca7690574c07348bb7d3e108c3b50dbbedbc9e5707a14d946b280
 EBUILD less-608-r1.ebuild 1631 BLAKE2B 3c0bcfb98082e497b3ff75bf44c5bc39882d34f9852aacf410e0802aa8eb65bde5242bf70055a7a1726678ba6971dc01508e9c86ff74597cf2160fbafd2844bd SHA512 c82f4ea7446b40acc3aeb9b33796dc4a55db2e90b3b83e18f7dadc0c4c8a9a88f473ef6cfad524ac0921cd5dce7c4f202bafc06a0f8a269762e0ae046cca7b35
-EBUILD less-617.ebuild 1735 BLAKE2B d64a969f79c4581f40fce12e6b66764021798ab683efb4e3048b99c82896da06fa604481a3ef1e96e6409905a2aee9753d35edd7593397e2daff8c2bd8c9cd43 SHA512 7d3c4b44a7cda7bf5865595a1f9f815fe4ed66870a1374f0b4808cabb8137c198a353c618692bc5912fccc63ae720445603edf4af57621c2310abc35c32e0cc9
+EBUILD less-618_beta.ebuild 2013 BLAKE2B 8aa048b9c09c30c741b7d1d97f9a6c126947b8f03cf47f3155e08755b834c62996eff9a27bacc0fdbf92e5067b5aeb765ca5b409723abb800d154b2de506bcc7 SHA512 a22bd3359e171ca4c97e2de3ed45273284a5b27f8c16251d9c983077b31606a79bcbfb8f83f7234c4387cc616eaf826b9be10961d4271234dd36dacb7649524c
+EBUILD less-9999.ebuild 2013 BLAKE2B 8aa048b9c09c30c741b7d1d97f9a6c126947b8f03cf47f3155e08755b834c62996eff9a27bacc0fdbf92e5067b5aeb765ca5b409723abb800d154b2de506bcc7 SHA512 a22bd3359e171ca4c97e2de3ed45273284a5b27f8c16251d9c983077b31606a79bcbfb8f83f7234c4387cc616eaf826b9be10961d4271234dd36dacb7649524c
 MISC metadata.xml 384 BLAKE2B ab69cbf4d7813bc4c96dc1c18ca35454dc9e9202bc95e3ff3b638c79b6cff4f9914fba1e7a35908aa305567a3874d3ead3a78f5faa83c9fbd3027afe12767eac SHA512 d799332d42f1c3115132216b3ba98a39f662d583aecb06fa2590e3da4c03b0ec07bab1eb0bbd397ef8249a5916ca9b457992c226899f66d4f4bef8bf1a20074f
diff --git a/sys-apps/less/less-617.ebuild b/sys-apps/less/less-618_beta.ebuild
index cb210766d048..9add6f6c1d52 100644
--- a/sys-apps/less/less-617.ebuild
+++ b/sys-apps/less/less-618_beta.ebuild
@@ -5,6 +5,11 @@ 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
 
 # Releases are usually first a beta then promoted to stable if no
@@ -12,9 +17,12 @@ inherit autotools
 # 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="http://www.greenwoodsoftware.com/less/"
-SRC_URI="http://www.greenwoodsoftware.com/less/${P}-beta.tar.gz"
+[ $PV != 9999 ] && SRC_URI="http://www.greenwoodsoftware.com/less/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P/?beta}
 
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
@@ -28,6 +36,8 @@ RDEPEND="${DEPEND}"
 
 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
diff --git a/sys-apps/less/less-9999.ebuild b/sys-apps/less/less-9999.ebuild
new file mode 100644
index 000000000000..9add6f6c1d52
--- /dev/null
+++ b/sys-apps/less/less-9999.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 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
+
+# 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="http://www.greenwoodsoftware.com/less/"
+[ $PV != 9999 ] && SRC_URI="http://www.greenwoodsoftware.com/less/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P/?beta}
+
+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"
+IUSE="pcre"
+
+DEPEND=">=app-misc/editor-wrapper-3
+	>=sys-libs/ncurses-5.2:0=
+	pcre? ( dev-libs/libpcre2 )"
+RDEPEND="${DEPEND}"
+
+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() {
+	local myeconfargs=(
+		--with-regex=$(usex pcre pcre2 posix)
+		--with-editor="${EPREFIX}"/usr/libexec/editor
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	newbin "${FILESDIR}"/lesspipe-r1.sh lesspipe
+	newenvd "${FILESDIR}"/less.envd 70less
+}
+
+pkg_preinst() {
+	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'."
+		elog "Colorization support has been dropped.  If you want that, check out"
+		elog "the new app-text/lesspipe package."
+	fi
+}