gentoo auto-resync : 28:02:2023 - 10:03:37

4 files changed, 11 insertions, 76 deletions

diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 7ad93ec8190b..6ac9b5b73557 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -3,11 +3,9 @@ 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-618-beta.tar.gz 365786 BLAKE2B b1957ab49059a2df14d8ba5daf1d8543adc4546c44b537d86959e2e1fe2df93f99ceb8ef47097b6f84f75f7740e161269b4e1d5dd263b8171212c87e650a02fe SHA512 6197aa20c77a846e53b376aa63c2863242c40663e72213f66c3597bd8c38a9458163d0c9ba0ca7690574c07348bb7d3e108c3b50dbbedbc9e5707a14d946b280
-DIST less-623-beta.tar.gz 373094 BLAKE2B 661fdb129678a57ef2188b4cd89809b14eaae62b98bb8ec2394cb7b48faf10a3ccdb690f371178e9ed43548ebce1af840cb5042e9019fa747bcec2dca4158dc7 SHA512 60843c668f90ae47cdf4d10849a63481ab67af679b831cbe8955861ae9f238006322734ec3ae49d9aced7927018bf3e0d9fdab98077289b4ffc78f6075041667
+DIST less-629-beta.tar.gz 374918 BLAKE2B 0276006cf81f310a3d25add7cfaedfd678b03f99d48b75eb462fb6dda6e171c495fa6af170257fb286a35b0d6f380136c5d37b6d9a088ee08d42d4f32033afcb SHA512 5b5d7f86b0e2d00d65257b1d27511fdab21fda52f60102f7dd6c31d1314edcf75754dc9a268c03ebfe08ffc7b88f3b7cad0fa5a9504d66b11bc13f5f52cab558
 EBUILD less-608-r1.ebuild 1644 BLAKE2B a985faac14059e82275b36c1122bd91da98c9959e816b9f1e8c97e484ce10b3013c915eeff3ea3ce695983eabb0fa71c1a49d5ec59daaec0f982d5ebec8d17ad SHA512 d8022242942862ef1229138d6dc21a3f54e95395510d23f694fec442fe336f2cea583a3ce3d7b5303d1bede89502c260fed51d7f6ea7c2ec401d5af85ade897a
 EBUILD less-608-r2.ebuild 1691 BLAKE2B 593af00b711b73345589db31b3765ca2de723db667de297a61356c09b919919355f9661a58738e47c92aa94933ee498d55240cbe87997fa912a8d443982639e8 SHA512 e5b372119ee823b4af84f9f747d7cb72ba990a83b5f41d95da6ca512c54cc27585e3fa3c8c2d934c3cd5814c041667487804bde52c568cca002284786ac39782
-EBUILD less-618_beta.ebuild 2026 BLAKE2B 132ce781ae09efae4fe177b311cd4dd57cb1ddc37a21b167f02262d490d981f94918e3a9ff81670f8febea14395d56e6316c32a6236cdf84756553800e17bff6 SHA512 633e22513a82228e2b8770d20bc25c7cf4604bcae161a7c4030fa97605d2ac92d9cc7165c6d03f728f7dc7e6d6f10e61c183bda40e1761dab7ff39f6e3d673e2
-EBUILD less-623_beta.ebuild 2143 BLAKE2B 3b510f61126567ef6c924506a2f56284c3ff9e144a6dd00a8cf5ff66e25df5fdcde55f4871139564da3633fc90d3b5655b5c6212a401bdc2a00380301e99044f SHA512 345491d238f00b49e067fe3517ddf4b4f8bec30f5d049887684c6ac8ae9702b699cd0b3dd1b0112010d5206bf016a01807f4376abf4562bbbfb10348f158bbf5
-EBUILD less-9999.ebuild 2143 BLAKE2B 3b510f61126567ef6c924506a2f56284c3ff9e144a6dd00a8cf5ff66e25df5fdcde55f4871139564da3633fc90d3b5655b5c6212a401bdc2a00380301e99044f SHA512 345491d238f00b49e067fe3517ddf4b4f8bec30f5d049887684c6ac8ae9702b699cd0b3dd1b0112010d5206bf016a01807f4376abf4562bbbfb10348f158bbf5
+EBUILD less-629_beta.ebuild 2238 BLAKE2B 8dea235c74da1c89561f168eef3b020d754c70a9fe8a5f0bd10bf7670eb114ae2abcc13679c95fdf9c5c68da93d3777399a7e70e5249fd0ee77107df6183021c SHA512 37ee9e63fbc572699aaec8278153b0b8eee5afdc702b0fc56c8d6edbf5e1722984e61fb9e386f4abaea533262cb82e265c3f0132c7db9c9273741a382a86cebe
+EBUILD less-9999.ebuild 2238 BLAKE2B 8dea235c74da1c89561f168eef3b020d754c70a9fe8a5f0bd10bf7670eb114ae2abcc13679c95fdf9c5c68da93d3777399a7e70e5249fd0ee77107df6183021c SHA512 37ee9e63fbc572699aaec8278153b0b8eee5afdc702b0fc56c8d6edbf5e1722984e61fb9e386f4abaea533262cb82e265c3f0132c7db9c9273741a382a86cebe
 MISC metadata.xml 384 BLAKE2B ab69cbf4d7813bc4c96dc1c18ca35454dc9e9202bc95e3ff3b638c79b6cff4f9914fba1e7a35908aa305567a3874d3ead3a78f5faa83c9fbd3027afe12767eac SHA512 d799332d42f1c3115132216b3ba98a39f662d583aecb06fa2590e3da4c03b0ec07bab1eb0bbd397ef8249a5916ca9b457992c226899f66d4f4bef8bf1a20074f
diff --git a/sys-apps/less/less-618_beta.ebuild b/sys-apps/less/less-618_beta.ebuild
deleted file mode 100644
index afce93c3d215..000000000000
--- a/sys-apps/less/less-618_beta.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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
-
-# 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
-}
diff --git a/sys-apps/less/less-623_beta.ebuild b/sys-apps/less/less-629_beta.ebuild
index 84957e8eccd9..3dc457ca05ff 100644
--- a/sys-apps/less/less-623_beta.ebuild
+++ b/sys-apps/less/less-629_beta.ebuild
@@ -27,9 +27,12 @@ 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"
+if [[ ${PV} != 9999 && ${PV} != *_beta* ]] ; then
+	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"
+fi
 IUSE="pcre"
 # As of 623_beta, lesstest is not included in dist tarballs
+# https://github.com/gwsw/less/issues/344
 RESTRICT="test"
 
 DEPEND="
diff --git a/sys-apps/less/less-9999.ebuild b/sys-apps/less/less-9999.ebuild
index 84957e8eccd9..3dc457ca05ff 100644
--- a/sys-apps/less/less-9999.ebuild
+++ b/sys-apps/less/less-9999.ebuild
@@ -27,9 +27,12 @@ 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"
+if [[ ${PV} != 9999 && ${PV} != *_beta* ]] ; then
+	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"
+fi
 IUSE="pcre"
 # As of 623_beta, lesstest is not included in dist tarballs
+# https://github.com/gwsw/less/issues/344
 RESTRICT="test"
 
 DEPEND="