From 068424b26532f3551a81421a9be67ed206e5c11a Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 11 Aug 2021 07:02:28 +0100
Subject: gentoo resync : 11.08.2021

---
 app-text/lesspipe/Manifest                         |  5 +-
 .../lesspipe/files/lesspipe-1.87-fix-tests.patch   | 76 ++++++++++++++++++++++
 app-text/lesspipe/lesspipe-1.86.ebuild             |  5 +-
 app-text/lesspipe/lesspipe-1.87.ebuild             | 64 ++++++++++++++++++
 4 files changed, 146 insertions(+), 4 deletions(-)
 create mode 100644 app-text/lesspipe/files/lesspipe-1.87-fix-tests.patch
 create mode 100644 app-text/lesspipe/lesspipe-1.87.ebuild

(limited to 'app-text/lesspipe')

diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index 825daa0927f0..e3aac4b646cc 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -1,5 +1,8 @@
+AUX lesspipe-1.87-fix-tests.patch 3235 BLAKE2B feceffc77cfd62ea3c183d352abe0664db18c7f9765beba6d094a7fc15188e9f6cac255c824b0a42a70faeee7f9b44d77a77094aaadc54fc976a44db27dfb8a4 SHA512 c09a2a65b26ce1f08c559895fcd501dbcf51798547970c7f09b8c24494ea899e0801da47e57dc84fffa595f53cdcdae6233342db08be02db47e01f3c28d9b592
 DIST lesspipe-1.85.tar.gz 120568 BLAKE2B d2c00f4121dc1bbed6b82220dac038068bbff87c732385399542cb212d4664c74d018db07829f90c38e938cb8623a443888c74b0d003fff725d0ddf207d8109e SHA512 420d087b9fc9783b9404855e4656b88c10852502bd2f1931978b7dc7ff15eba1a375b217184480f9b341322c12e7336d0861ba9c2f673f2b2a7fb340a381f5b2
 DIST lesspipe-1.86.tar.gz 120910 BLAKE2B 1065bd95707991380cee8b1be917ae66a6537fdd721e9ec0c326b1ce3358ae518dd28902505967fc086e57e9d3e603e27a328f38c79ae38fe70e5e2a8306b59a SHA512 88a890b91ff3d889f32f23d85d76ef96947e8f1175d54d4301e8891587e87bf1c0a147f1fd5391e52badf4ee31229d337b97c5d5e5f74f4dde966eb93294cfb2
+DIST lesspipe-1.87.tar.gz 120935 BLAKE2B 3c6348c4a00cddfdf11832fda58582483e07e94a1834d6128329e2902356990f1c590300508127a365179a43b0d5c0c82bafd5b0a3a5945270084c8a94e1e3a2 SHA512 774168c6cbb7b13f2efaf7d19a1bba378e51c25553b8ea0bd9783de3a6d0bf7a3f7abf79332b40180eaa1f67274edebf51cb90c13a0fbd4051f33cecc20124b2
 EBUILD lesspipe-1.85.ebuild 1166 BLAKE2B b4f5ad06062203f195b36dc874c2d91f30f4222ecc94940687225b94a84129e142838c12938cb54ad35d248a3ea48bcc8ceddeda5aad0154b19ee8be6dfaad38 SHA512 7c7c0b9e6e95c1a6821338ba67f9869154b86ec9ab7d9f5e24e027a72c71ce6510da7f7d824dfea3e8e02bd9101111e1d75d45f1ae5518ef7aa50770904f3034
-EBUILD lesspipe-1.86.ebuild 1166 BLAKE2B 80ddf411639e4d6acb5e903ffab5a7c0d5cb1ac9d579eb900f543f145701f0c1ae66c58292501a373b7d2d83cb0f2ba4c59ee324c253221aea0d5e316af60ecd SHA512 4f0ea8a65ab014a91779884f47f4b8538af9fb4a9b55a4522f005f0fbaa91e1b3f85c59c683f84bef3a6cb54ac09d354cc9e1157a63c49e7039afb68e15b9266
+EBUILD lesspipe-1.86.ebuild 1158 BLAKE2B 72f7b238b32c6bd159f3651a6921256cf034a92deced6c9208c6199735838bf1af481761b32a5e563ce03e75a82c1fe41c3b1970fe3d1d77fec2e3a0af7ff411 SHA512 fe415ed609fdfd64569dd2e1831869c85f550192f2c1521f8fa1a32049587951de2cd2cf483a57935e9572bbcd3fe39fcf284c14fbeb8385fce06caf0053de15
+EBUILD lesspipe-1.87.ebuild 1748 BLAKE2B 736cc316232aa30f193f803e4bb8978478f9ce98644d7596d151508b0ccf3c35ce86a91da796fe4a738fdb644e8edbc96ace07cc0d55db82ac0679877b975114 SHA512 c3fce911b2a9a13123f379a2bcc5ec52a839363a3b0989ae30392aef0bb7fd7f7f6397c7ef169b4a752446aca184a9848c4bbd53447dd79183438d88d8affd70
 MISC metadata.xml 303 BLAKE2B 994cf3fadfb22f368dc6f14707fd56a6a4dc019b335d0d241a5f5f6ccbc221bdd284a3544c3171cc10c107ca01248444c23ca5c0f1386bd0d344fa1c13618699 SHA512 079c0445d27021945507ccc075775236d1ddd6f60cfa669928d982ebbff394f8185de0f8e092c3cb3bf3a531d21b80db6c04af9c98a34f28c8d643b25fd00b10
diff --git a/app-text/lesspipe/files/lesspipe-1.87-fix-tests.patch b/app-text/lesspipe/files/lesspipe-1.87-fix-tests.patch
new file mode 100644
index 000000000000..c52e4c0957ef
--- /dev/null
+++ b/app-text/lesspipe/files/lesspipe-1.87-fix-tests.patch
@@ -0,0 +1,76 @@
+https://github.com/wofr06/lesspipe/commit/428062937e99f5a5da5c5f94fecba5b13557d973.patch
+
+Dropped ChangeLog + README hunks, but not weeded out the tiny MP4 change.
+
+From 428062937e99f5a5da5c5f94fecba5b13557d973 Mon Sep 17 00:00:00 2001
+From: wf <wp.friebelgmail.com>
+Date: Sun, 8 Aug 2021 21:26:17 +0200
+Subject: [PATCH] make all tests in the test suite work
+
+---
+ lesspipe.sh    | 6 +++---
+ lesspipe.sh.in | 6 +++---
+ 4 files changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/lesspipe.sh b/lesspipe.sh
+index 0bf3cb9..22c10b2 100755
+--- a/lesspipe.sh
++++ b/lesspipe.sh
+@@ -54,7 +54,7 @@ filecmd() {
+ TMPDIR=${TMPDIR:-/tmp}
+ sep=:						# file name separator
+ altsep==					# alternate separator character
+-if [[ -e "$1" && "$1" = *$sep* || "$1" = *$sep*$altsep* ]]; then
++if [[ -e "$1" && "$1" = *$sep* ]]; then
+   sep=$altsep
+   xxx="${1%=}"
+   set "$xxx"
+@@ -773,7 +773,7 @@ isfinal() {
+   elif [[ "$PARSEHTML" = yes && "$1" = *HTML$NOL_A_P* ]]; then
+     msg "append $sep to filename to view the HTML source"
+     parsehtml "$2"
+-  elif [[ "$1" = *pdf* ]] && cmd_exist pdftotext; then
++  elif [[ "$1" = *pdf* || "$1" = *PDF* ]] && cmd_exist pdftotext; then
+     if [[ "$PARSEHTML" = yes ]]; then
+       msg "append $sep to filename to view the PDF source"
+       istemp "pdftotext -htmlmeta -nopgbrk -q --" "$2" - | parsehtml -
+@@ -952,7 +952,7 @@ isfinal() {
+   elif [[ "$1" = *mp3* ]] && cmd_exist id3v2; then
+       msg "append $sep to filename to view the raw data"
+       istemp "id3v2 --list" "$2"
+-  elif [[ "$1" = *image* || "$1" = *mp3* || "$1" = *audio* || "$1" = *video* ]] && cmd_exist mediainfo; then
++  elif [[ "$1" = *image* || "$1" = *mp3* || "$1" = *MP4* || "$1" = *audio* || "$1" = *video* ]] && cmd_exist mediainfo; then
+     msg "append $sep to filename to view the raw data"
+     mediainfo --Full "$2"
+   elif [[ "$1" = *image* || "$1" = *mp3* || "$1" = *audio* || "$1" = *video* ]] && cmd_exist exiftool; then
+diff --git a/lesspipe.sh.in b/lesspipe.sh.in
+index 8819dad..a099a84 100755
+--- a/lesspipe.sh.in
++++ b/lesspipe.sh.in
+@@ -56,7 +56,7 @@ TMPDIR=${TMPDIR:-/tmp}
+ sep=:						# file name separator
+ altsep==					# alternate separator character
+ # if the separator is part of the file name then altsep is used
+-if [[ -e "$1" && "$1" = *$sep* || "$1" = *$sep*$altsep* ]]; then
++if [[ -e "$1" && "$1" = *$sep* ]]; then
+   sep=$altsep
+   xxx="${1%=}"
+   set "$xxx"
+@@ -942,7 +942,7 @@ isfinal() {
+     msg "append $sep to filename to view the HTML source"
+     parsehtml "$2"
+ #ifdef pdftotext
+-  elif [[ "$1" = *pdf* ]] && cmd_exist pdftotext; then
++  elif [[ "$1" = *pdf* || "$1" = *PDF* ]] && cmd_exist pdftotext; then
+     if [[ "$PARSEHTML" = yes ]]; then
+       msg "append $sep to filename to view the PDF source"
+       istemp "pdftotext -htmlmeta -nopgbrk -q --" "$2" - | parsehtml -
+@@ -1202,7 +1202,7 @@ isfinal() {
+     mp3info "$2"
+ #endif
+ #ifdef mediainfo
+-  elif [[ "$1" = *image* || "$1" = *mp3* || "$1" = *audio* || "$1" = *video* ]] && cmd_exist mediainfo; then
++  elif [[ "$1" = *image* || "$1" = *mp3* || "$1" = *MP4* || "$1" = *audio* || "$1" = *video* ]] && cmd_exist mediainfo; then
+     msg "append $sep to filename to view the raw data"
+     mediainfo --Full "$2"
+ #ifdef exiftool
diff --git a/app-text/lesspipe/lesspipe-1.86.ebuild b/app-text/lesspipe/lesspipe-1.86.ebuild
index 6ebe2f17d7a8..172222094252 100644
--- a/app-text/lesspipe/lesspipe-1.86.ebuild
+++ b/app-text/lesspipe/lesspipe-1.86.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=8
+EAPI=7
 
-DESCRIPTION="a preprocessor for less"
+DESCRIPTION="A preprocessor for less"
 HOMEPAGE="https://github.com/wofr06/lesspipe"
 SRC_URI="https://github.com/wofr06/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
 
 # Tests are broken in 1.84, 1.85.
 # Please check again on bumps!
diff --git a/app-text/lesspipe/lesspipe-1.87.ebuild b/app-text/lesspipe/lesspipe-1.87.ebuild
new file mode 100644
index 000000000000..cd3b3f826f89
--- /dev/null
+++ b/app-text/lesspipe/lesspipe-1.87.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A preprocessor for less"
+HOMEPAGE="https://github.com/wofr06/lesspipe"
+SRC_URI="https://github.com/wofr06/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# Tests are broken in 1.84, 1.85.
+# Still fragile in 1.87. Passes when lesspipe is not installed.
+# Please check again on bumps!
+# bug #734896
+RESTRICT="test"
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	!<sys-apps/less-483-r1"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-tests.patch
+)
+
+src_prepare() {
+	default
+
+	# Drop a failing test. Not ideal, however:
+	# The test suite for this package is pretty fragile; it's more valuable
+	# to have _something_ failing/passing overall, than relying on a single
+	# test which seems to fail due to an unpredictable external command.
+	sed -i -e '/#needs pstotext ps2ascii/d' TESTCMDS || die
+}
+
+src_configure() {
+	# Not an autoconf script.
+	./configure --fixed || die
+}
+
+src_compile() {
+	# Nothing to build (avoids the "all" target)
+	:
+}
+
+src_test() {
+	# LC_ALL=C manages to fix one test failure
+	LC_ALL=C ./test.pl -d || die "Tests failed!"
+}
+
+src_install() {
+	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
+	einstalldocs
+}
+
+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
+}
-- 
cgit v1.2.3