gentoo resync : 22.05.2021

5 files changed, 7 insertions, 127 deletions

diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index 4daef53a4f99..fd75f35b6bb9 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -1,8 +1,3 @@
-DIST lesspipe-1.83.tar.gz 115129 BLAKE2B 24d9e4a226537a44c01c316528e085c6d2d7889b2ae5166d70b85e12c5f0b34e825e039a70071d7e75947e1c63d527decb21973631e910de42c75ec3ee17436c SHA512 c6418ac2bfc2dee9d32d56b0ea4a94954b1431db54fef8b67a9cf7d961cf4a23d87b2f41b2a4560d2333029c6d4ed5c6f399cb635f857bd43f1603993b5cb55d
-DIST lesspipe-1.84.tar.gz 119657 BLAKE2B 671b504022bdba82eea03d7a83960d5ed148d851d0420f179967f46d38a88ab90c9928a462e01744134aedfe710dba741430e78743451b1b65e603e5d89ae139 SHA512 f11ef23610f722d62ddf7e084b03967ed59d21af6ac207d4456f625c93c3c58c87ec5907cf6bca00ae5550dcddfc9b7f0be5de51f9ff81044fcff1f1cde81267
 DIST lesspipe-1.85.tar.gz 120568 BLAKE2B d2c00f4121dc1bbed6b82220dac038068bbff87c732385399542cb212d4664c74d018db07829f90c38e938cb8623a443888c74b0d003fff725d0ddf207d8109e SHA512 420d087b9fc9783b9404855e4656b88c10852502bd2f1931978b7dc7ff15eba1a375b217184480f9b341322c12e7336d0861ba9c2f673f2b2a7fb340a381f5b2
-EBUILD lesspipe-1.83-r1.ebuild 1063 BLAKE2B a3bce9fa46ddeb453cab46d0b0db9d24069dbf365546fb039ec8adbea85945e22a4e380e162552151d6fec19203a7333c3d1299f35d6f59211ff64087e6d238e SHA512 be2b04bce7919507d8a62ec04623651f836470879295d65d79a5f98509a71f3e8ca29317cfe569389957ba3aceac7837ea68538275c73ea9cfd66da1721ffe5f
-EBUILD lesspipe-1.83.ebuild 1076 BLAKE2B 43e138721dbb29c653aaf5a0fb1ec65565f065eb6026056755a961ea0b7d7692f9957eb395120894c11453355daad1ad904e14f26bf41da125238bcac0b8eb75 SHA512 15a08ab8ffd2b0b111494b74a960f65bc7bac8dafd12d9017d69f42933ce34c766e9448ff85a469d65ee40c16c3b5bb2cc1b6db4385d491c71d2839f129eefb4
-EBUILD lesspipe-1.84.ebuild 1072 BLAKE2B 1b362a414ff398ec0d1e965cc6954aca215c43bdcfd5fdf360ab051989e3eb1694f38c96ba97cc252e113f0c65a144ca163e17cf1ec7d1cc09470cd3dc8808d7 SHA512 2ce9cf72e190a9456d3b593ae69af134595646e4120a551fa8713918e7f1917f9151ade81e7a68f70a84e21ccb78c000b55535fc61246733b17a31e0ac5fd27f
-EBUILD lesspipe-1.85.ebuild 1072 BLAKE2B 1b362a414ff398ec0d1e965cc6954aca215c43bdcfd5fdf360ab051989e3eb1694f38c96ba97cc252e113f0c65a144ca163e17cf1ec7d1cc09470cd3dc8808d7 SHA512 2ce9cf72e190a9456d3b593ae69af134595646e4120a551fa8713918e7f1917f9151ade81e7a68f70a84e21ccb78c000b55535fc61246733b17a31e0ac5fd27f
+EBUILD lesspipe-1.85.ebuild 1166 BLAKE2B b4f5ad06062203f195b36dc874c2d91f30f4222ecc94940687225b94a84129e142838c12938cb54ad35d248a3ea48bcc8ceddeda5aad0154b19ee8be6dfaad38 SHA512 7c7c0b9e6e95c1a6821338ba67f9869154b86ec9ab7d9f5e24e027a72c71ce6510da7f7d824dfea3e8e02bd9101111e1d75d45f1ae5518ef7aa50770904f3034
 MISC metadata.xml 303 BLAKE2B 994cf3fadfb22f368dc6f14707fd56a6a4dc019b335d0d241a5f5f6ccbc221bdd284a3544c3171cc10c107ca01248444c23ca5c0f1386bd0d344fa1c13618699 SHA512 079c0445d27021945507ccc075775236d1ddd6f60cfa669928d982ebbff394f8185de0f8e092c3cb3bf3a531d21b80db6c04af9c98a34f28c8d643b25fd00b10
diff --git a/app-text/lesspipe/lesspipe-1.83-r1.ebuild b/app-text/lesspipe/lesspipe-1.83-r1.ebuild
deleted file mode 100644
index 35049dffb23f..000000000000
--- a/app-text/lesspipe/lesspipe-1.83-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="a preprocessor for less"
-HOMEPAGE="https://github.com/wofr06/lesspipe"
-SRC_URI="https://www-zeuthen.desy.de/~friebel/unix/less/${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=""
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	!<sys-apps/less-483-r1"
-
-src_configure() {
-	# Not an autoconf script.
-	./configure --fixed || die
-}
-
-src_compile() {
-	# Nothing to build.
-	:
-}
-
-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
-}
diff --git a/app-text/lesspipe/lesspipe-1.83.ebuild b/app-text/lesspipe/lesspipe-1.83.ebuild
deleted file mode 100644
index 6f0b97d1b104..000000000000
--- a/app-text/lesspipe/lesspipe-1.83.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="a preprocessor for less"
-HOMEPAGE="https://github.com/wofr06/lesspipe"
-SRC_URI="https://www-zeuthen.desy.de/~friebel/unix/less/${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=""
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	!<sys-apps/less-483-r1"
-
-src_configure() {
-	# Not an autoconf script.
-	./configure --fixed || die
-}
-
-src_compile() {
-	# Nothing to build.
-	:
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
-	dodoc ChangeLog README TODO
-}
-
-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-1.84.ebuild b/app-text/lesspipe/lesspipe-1.84.ebuild
deleted file mode 100644
index 6629361ef00b..000000000000
--- a/app-text/lesspipe/lesspipe-1.84.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	!<sys-apps/less-483-r1"
-
-src_configure() {
-	# Not an autoconf script.
-	./configure --fixed || die
-}
-
-src_compile() {
-	# Nothing to build.
-	:
-}
-
-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
-}
diff --git a/app-text/lesspipe/lesspipe-1.85.ebuild b/app-text/lesspipe/lesspipe-1.85.ebuild
index 6629361ef00b..07996432881b 100644
--- a/app-text/lesspipe/lesspipe-1.85.ebuild
+++ b/app-text/lesspipe/lesspipe-1.85.ebuild
@@ -9,9 +9,14 @@ 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"
+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!
+# bug #734896
+RESTRICT="test"
+
 DEPEND="dev-lang/perl"
 RDEPEND="${DEPEND}
 	!<sys-apps/less-483-r1"