gentoo resync : 09.07.2022

3 files changed, 48 insertions, 42 deletions

diff --git a/app-shells/psh/Manifest b/app-shells/psh/Manifest
index 73cb1bcee804..6be6b1a4862b 100644
--- a/app-shells/psh/Manifest
+++ b/app-shells/psh/Manifest
@@ -1,5 +1,5 @@
 AUX psh-1.8.1-r3-array-ref-deprecated.patch 1175 BLAKE2B 42c6b1ea5b9db6d58fcabcbaad8746dd25978bd411a938619db46599870d324d9a70ee51ea3eb26163b370946fa20b94822c9ec27df1e067c1182ad9e23949e3 SHA512 52a03f5d5b9716bc28c11ea4726295f7e45d80694a6091fc21bfc32ca6220ebeabd009f96754e4a0c9389087424882d8ea0365f2ad749a9a9fda6e2f6f9ec633
 AUX psh-1.8.1-r3-defined-array.patch 295 BLAKE2B fef59139a5258b02638c2039187e672d1ffddaf69682ce1555964007ab4ed5a27182051a658258ab32148ca31176bbb4ca62f9bddaadc2c956830fc996ce2510 SHA512 69edf4cc81483ec6f9675d1f14b6a9d63a055691dc1f41a08e26b721d3b6081b881db5183df23ebc52459e849ee1ca0f6f5c64c01231c305eef8183145f520c9
-DIST psh-1.8.1-r3.tar.gz 120552 BLAKE2B 68ada33507a780e60e478362406c778ea6f0a68228807c1677371052ef1d40be64c730fc0bf0d1cdd4a915739ecbffcfcd3a16de931c28c3e5ec11a3116920ff SHA512 01e9def98fa89f347ad540cbb0584773de4b7e11595432d7b8e1f1a563725004b898a5fd30f39b01de661ac6ec3274b6cfecdbd7f0bec3fe175119493163ca9a
-EBUILD psh-1.8.1-r3.ebuild 838 BLAKE2B 45668b5ac14ae2bfa0092f2611fca6105ebadb157b30467b9af0184b18124ddc0dfde96e50e13e90464a661932953cd7d5fcffca997c3ffb3db473a357172ab5 SHA512 a3e15fdaeec4947b4653d739955d04b67892008b280e436e289083f990ea199192a544e3039c317558a476e306d9e079f3477714d68703ec0d3709fe1f882b4b
+DIST psh-1.8.1.tar.gz 120552 BLAKE2B 68ada33507a780e60e478362406c778ea6f0a68228807c1677371052ef1d40be64c730fc0bf0d1cdd4a915739ecbffcfcd3a16de931c28c3e5ec11a3116920ff SHA512 01e9def98fa89f347ad540cbb0584773de4b7e11595432d7b8e1f1a563725004b898a5fd30f39b01de661ac6ec3274b6cfecdbd7f0bec3fe175119493163ca9a
+EBUILD psh-1.8.1-r4.ebuild 910 BLAKE2B 52d663643398f242d47e3664b8eaaa7d2551d065d282efc54141067415262b11064effd0d8cddf39b2525bd7813a7413dc4dd59b756e6849e2a0d8108e93e9e0 SHA512 89df5096e6f2fba035b936feb3905fc2e5a6df339807751fa6a339c302f7885b995554494fa3c5e3fef05921be1da5453924e00ea9b0e12fb4acf8675b7f0cb2
 MISC metadata.xml 354 BLAKE2B ff44a76d58c21182a661d9ddf5247903f47cbcef9df703630d602c654ed6fb5bbb14af7f3058937c206976f30de88b239bda7b366d6f8ec155028371d1e511e9 SHA512 0c776b70970a8bb23d144688dd813ecbb182378ee1d98ba080dde9ce20950f025756fc650a5a983b022b0a900c32e5339c4407ec2f5efa6840fd89556ba92a75
diff --git a/app-shells/psh/psh-1.8.1-r3.ebuild b/app-shells/psh/psh-1.8.1-r3.ebuild
deleted file mode 100644
index 00fa615132c7..000000000000
--- a/app-shells/psh/psh-1.8.1-r3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-DIST_EXAMPLES=( "examples/*" )
-
-inherit perl-module
-
-DESCRIPTION="Combines the interactive nature of a Unix shell with the power of Perl"
-HOMEPAGE="https://gnp.github.io/psh/"
-SRC_URI="https://github.com/gnp/psh/archive/${P}.tar.gz -> ${PF}.tar.gz"
-S="${WORKDIR}/${PN}-${P}" # github--
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="readline"
-
-RDEPEND="
-	readline? (
-		dev-perl/Term-ReadLine-Gnu
-		dev-perl/TermReadKey
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
-
-myinst="SITEPREFIX=${D}/usr"
-
-PATCHES=(
-	"${FILESDIR}/${PF}-defined-array.patch"
-	"${FILESDIR}/${PF}-array-ref-deprecated.patch"
-)
-
-src_install() {
-	perl-module_src_install
-	docompress -x "/usr/share/doc/${PF}/pod"
-	docinto pod/
-	dodoc -r doc/*
-}
diff --git a/app-shells/psh/psh-1.8.1-r4.ebuild b/app-shells/psh/psh-1.8.1-r4.ebuild
new file mode 100644
index 000000000000..9e7a280fb0c5
--- /dev/null
+++ b/app-shells/psh/psh-1.8.1-r4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_EXAMPLES=( "examples/*" )
+
+inherit optfeature perl-module
+
+DESCRIPTION="Combines the interactive nature of a Unix shell with the power of Perl"
+HOMEPAGE="https://gnp.github.io/psh/"
+SRC_URI="https://github.com/gnp/psh/archive/${P}.tar.gz"
+S="${WORKDIR}"/${PN}-${P}
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="readline"
+
+RDEPEND="
+	readline? (
+		dev-perl/Term-ReadLine-Gnu
+		dev-perl/TermReadKey
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/perl-ExtUtils-MakeMaker"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-r3-defined-array.patch
+	"${FILESDIR}"/${P}-r3-array-ref-deprecated.patch
+)
+
+src_install() {
+	myinst="SITEPREFIX=${D}/usr"
+
+	perl-module_src_install
+
+	docompress -x /usr/share/doc/${PF}/pod
+
+	docinto pod/
+	dodoc -r doc/*
+}
+
+pkg_postinst() {
+	optfeature "ulimit functionality" dev-perl/BSD-Resource
+}