gentoo auto-resync : 15:04:2024 - 12:04:02

3 files changed, 19 insertions, 60 deletions

diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index 4a7d42769f50..f595ddc3a28c 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -1,7 +1,6 @@
 AUX all-completions.patch 2037 BLAKE2B 92a706e0dce6a6dd316b168fd4a93a8d6e52f80ceb5bdd5e762399125aea7cf9bbe3a36df519ceb97391309776c832cd0e5ddf414e144c17e79eb70109d3ef2d SHA512 11ee08eb7cccdc6f1470354dae28ebf20c083b9ff96899694ba67d21306a169768a2e50bb6a0a41939d2770f5962217edea5ef3afe9bf3bfa38e9f9abe55d48f
-DIST lesspipe-2.10.tar.gz 170918 BLAKE2B 156fe53975252ac6c59a637ffe0ee9862be0699f325a0b328e5c0f2cb5e6f7d8324481f3d3211cbb15a585a5dabde45adf87ac4e0af91cd34540359331684264 SHA512 3fe122cf0adf8dd3e0782ae65132c58d76f7131a2e8c30d9a10eb426c6f63e50b4b5e02b6792524a37b27ca572bd3e2661a6c82118e9c4ed5ecbccaf2c5a42e2
 DIST lesspipe-2.11.tar.gz 171212 BLAKE2B aa7cf35f00d9db4ad7cb48ae89089a4d0c5d6c6e41ec902bc7ba6d4fd218f8ea90e1fdf3d6fcbac1dd1f86eb841a0daa6838b0086905fd4b0535d91040ef85aa SHA512 ed75d8529bd24876b11a50d0ada476299569d0fe716c390de84a0630ae475594f96370ffbed64fc5d9e2417dcbaa7b2f68630e32f665dff799667c2653b0265f
-EBUILD lesspipe-2.10.ebuild 1306 BLAKE2B de9328c85649a107f7b0290d6d6b3b6e03c31825988fbf278c48aebe2af988992fe43c8e999483162f3c61f8ea1dd8a4a37aa36087e7e3d6ed22c19124dd2bd1 SHA512 c2214069bb84cf5d30e129f629ca0ef4d0e0e6c8d1bf50e0d9a102b3a81ee47e51c62cbf60fe3c7479a04271af0b35c680ef1921a790c562d2907675302821b9
+DIST lesspipe-2.12.tar.gz 171915 BLAKE2B b1181cc5ca6ec8ca918bff31def6d6fde5f6bcfde9d48e0a23a088ee9ff178e3e9ff330b1c27a3d74b63d227c94292141414bec8c25d0035f9fec01c6760b8b9 SHA512 9c6945b0f5a5672e3b9b0035ebc63ab3197c1b3d1dfc3d4a2280c1f11421d98ccc5c016273a308a96f61a47f4da6d6658502534284fff81fd75365a4ba91c27e
 EBUILD lesspipe-2.11-r1.ebuild 1925 BLAKE2B e63508fc246a9848ccdb92429790c6bf6dce42b3325815f33e771ab3040bfd0510ed64b3fe8b2efe65d8bf1d3c4fa775eaffa636805fab8704be4bdace3e5450 SHA512 afe904b57613c25d56b5d2632341da27b45fee8a38637d0ccbd66b4a26c3091588ae0e367d6faa23f80f97a490912eceb3021269eedfd7d3ac7bc4e5046fb8e9
-EBUILD lesspipe-2.11.ebuild 1306 BLAKE2B 0d781de9be7bbd4fd0417363db0e40282638982fb806d4a8169984c541b68a414f937479e00ca0939820901994f8235b5e1078ec80b94fab78c14f37c02318b8 SHA512 e44ece8c07479e2ada2213a1d1ab44a8ae14db4976ee28125b2ceccb80762fc2438cd4bb71f3fa6f6c5c746159df6066f6e4799ca8052323241b482e2fabcb41
+EBUILD lesspipe-2.12.ebuild 1752 BLAKE2B 840da476a00f967a73b6d847da6f52d1eb6b352427a2ee236386dd19a5549b140af1547f97085bbfa1b20851ca05a13020e4087df6fbb8d45bc8f40309364131 SHA512 12779152e92fe440834a397ea4830ad2863ade93ef09804a752e3019aa22600118ec74ae8ca5c21f22b9842952aa2cb4ec76bf5f412a7179ecd089463a0ee368
 MISC metadata.xml 304 BLAKE2B bb5be96b5fd22ce82d800f6bd5ed3ceb04b955182eaadc1f34b6f4b633c21efd6148013fc29b5567f7ada4da5de6efd7e0e420fa63a2976a5cf6bcf719c34f2e SHA512 2c217e67c6c487f7f7f98588a50086daf434bc25ad229b68d37bc12f7ecc4f904b5bc4a3b7b6db4a1daa0267c7e13fde8538de1c16d11e95be6b8071ee675105
diff --git a/app-text/lesspipe/lesspipe-2.10.ebuild b/app-text/lesspipe/lesspipe-2.10.ebuild
deleted file mode 100644
index 0de86580aa4d..000000000000
--- a/app-text/lesspipe/lesspipe-2.10.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo bash-completion-r1
-
-DESCRIPTION="Preprocessor for less"
-HOMEPAGE="https://github.com/wofr06/lesspipe"
-SRC_URI="https://github.com/wofr06/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-
-# Please check again on bumps!
-# bug #734896
-RESTRICT="!test? ( test ) test"
-
-RDEPEND="dev-lang/perl"
-BDEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	test? ( app-editors/vim )
-"
-
-src_configure() {
-	# Not an autoconf script.
-	edo ./configure --prefix="${EPREFIX}"/usr
-}
-
-src_compile() {
-	# Nothing to build (avoids the "all" target)
-	:
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
-	einstalldocs
-
-	rm "${ED}"/usr/share/bash-completion/less_completion || die
-	newbashcomp less_completion less
-}
-
-pkg_preinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "This package installs 'lesspipe.sh' which is distinct from 'lesspipe'."
-		elog "The latter is the Gentoo-specific version.  Make sure to update your"
-		elog "LESSOPEN environment variable if you wish to use this copy."
-	fi
-}
diff --git a/app-text/lesspipe/lesspipe-2.11.ebuild b/app-text/lesspipe/lesspipe-2.12.ebuild
index 8ff84655c3ba..9e0fa293f993 100644
--- a/app-text/lesspipe/lesspipe-2.11.ebuild
+++ b/app-text/lesspipe/lesspipe-2.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit edo bash-completion-r1
+inherit edo
 
 DESCRIPTION="Preprocessor for less"
 HOMEPAGE="https://github.com/wofr06/lesspipe"
@@ -11,13 +11,16 @@ SRC_URI="https://github.com/wofr06/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="test"
 
 # Please check again on bumps! (bug #734896)
 RESTRICT="!test? ( test ) test"
 
-RDEPEND="dev-lang/perl"
+RDEPEND="
+	dev-lang/perl
+	dev-perl/Text-CSV
+"
 BDEPEND="
 	${RDEPEND}
 	virtual/pkgconfig
@@ -26,7 +29,11 @@ BDEPEND="
 
 src_configure() {
 	# Not an autoconf script.
-	edo ./configure --prefix="${EPREFIX}"/usr
+	#
+	# PG0301
+	# By default, only completions for installed shells are installed.
+	# Unconditionally install zsh too.
+	edo ./configure --prefix="${EPREFIX}"/usr --all-completions
 }
 
 src_compile() {
@@ -38,8 +45,13 @@ src_install() {
 	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
 	einstalldocs
 
+	# The upstream Makefile intentionally installs to the wrong directory, then prints:
+	#   In bash, please preload the completion, dynamic invocation does not work
+	#   . /usr/share/bash-completion/less_completion
+	#   Or consider installing the file less_completion in /etc/bashcompletion.d
 	rm "${ED}"/usr/share/bash-completion/less_completion || die
-	newbashcomp less_completion less
+	insinto /etc/bash_completion.d
+	doins less_completion
 }
 
 pkg_preinst() {