gentoo resync : 22.05.2021

4 files changed, 2 insertions, 96 deletions

diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest
index 58ac8c28e9d8..cc271959b251 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -1,7 +1,4 @@
 AUX psmisc-23.4-fuser_regression_revert.patch 1577 BLAKE2B 89f346146ca2fb71bc5bee87f880abcc6e2e9c6b5c3e911fb806ced2a89ba096de6ce052bf238f1c8df948ec1fba5b979763fd2baa6e0a7b46ba977482f82501 SHA512 b129d3355a022b0bd743a06a4912b1ddea386af0d1551fadbe8155e1733ac03df3c795a4997759c4db6299196af3b49dfb2c9e6840dc33174ee1f4afe4ef9df7
-DIST psmisc-23.3.tar.xz 311896 BLAKE2B f38360dfb037a758633a8ff25af1de70be83ae5b2f2afe856ce237ade7bd2720f7c270c5af884313177022aa70f408dfce0c39e5d847057a6fdba98e3363561c SHA512 791ffef78d87b092d653da98710b338017466a9e1e1935968b9f0194ccef8da941317aa0c39d821d46b20d95d6539ccf78e5ebb71ad1032ae62337a397180d58
 DIST psmisc-23.4.tar.xz 370000 BLAKE2B e762171c4d3252421a49b352fadb3e892f66862f003a313a0cc692f973364b06d2652a51d331314462784d94ad55189e74c4d7a023d5d7c917c5e5c05009f46b SHA512 b05781fdb283a6f132bd385d64437f8080e6bc0e11cd2e3e02227678682bb67b3c89edec34a6d067d77312811d072dc60b47ebb32b168c4c69bbc36df643a471
-EBUILD psmisc-23.3-r1.ebuild 1151 BLAKE2B 0224c0973dc047577a81253cd5fe1721364a6023397eb935291dc9dac659c8a1cfc5491b3c9e28190ce41bf958f8bd383b79513de38d80a657fa937f376ca5d2 SHA512 ef50d37e9ba05845efec64cee08737b3df263f2cbb0e30a70b62d4eccca4101de0c9d68d64f51e259603f1435e0ed3dd87500a27a4b97a193f84cb7843d372f6
-EBUILD psmisc-23.4-r1.ebuild 1312 BLAKE2B 16ee0fd4d8e9359134efc632f888e1da7eaf32755d889e69440ea7b12de46949fb56f3016bba453ce8fd452104c6d238e7f7b7d5c48b879f6adbcc059846b5b2 SHA512 4774a5fbbaf16ac60c5b8ad5459883c50082200d04710424c52ae1203f2635bfd879ee689bf05aea09e14fbb02c80678075bbb3e4367b2d9cc9e2d30a6a3ed2e
-EBUILD psmisc-23.4.ebuild 1195 BLAKE2B 5924989ee1655fb9439e4718847c9171a8e011c0707db01519215f7c919d0c241a3e0e887d0fc6f5ecebfece77ae748430fd9379315ad02c6115ecd866fa33a1 SHA512 71f721429c81332cac93cd1ee5f3c7d0abc7bed54cd47c031056aff302f3eeee2ae937aa894bea76aa8da96409bf5d3a8cf79d9e9974598ff6bc8d668b087453
+EBUILD psmisc-23.4-r1.ebuild 1304 BLAKE2B 466b11d75bec320b9a6253c8517c99ddc51f64ed0e841080722d23edcba9576ca8d3b462e7c4b7eef84a307388e14adba63edf23f7815f670b12097de84b3a29 SHA512 0a4893e53ba75acf59fbebeaed4909667b3332a01445021e53adea7b0962d7506324e9ce239dce6a058d64aaec034d6d241024a5e5b63bb25a3b6e4778e21e54
 MISC metadata.xml 326 BLAKE2B 899a2f3fa295d2e0e8d6114542a149db37c730b845d7ba720127ca2b9b85044c53ff7aa107f866a6e2ece895a8159e25350b17d9665fc9ff915aed3640ac22cf SHA512 580a0e66078b7304d0bf76e3c990e61ee4c073b49381b60c5f3f01e2b64d5f0c318eb5596f7da09a70fa52dc93769b25f37f531038e5d7ce6278dda10e18117c
diff --git a/sys-process/psmisc/psmisc-23.3-r1.ebuild b/sys-process/psmisc/psmisc-23.3-r1.ebuild
deleted file mode 100644
index ea42dd495511..000000000000
--- a/sys-process/psmisc/psmisc-23.3-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A set of tools that use the proc filesystem"
-HOMEPAGE="http://psmisc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="ipv6 nls selinux X"
-
-RDEPEND=">=sys-libs/ncurses-5.7-r7:0=
-	nls? ( virtual/libintl )
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=sys-devel/libtool-2.2.6b
-	nls? ( sys-devel/gettext )"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_configure() {
-	local myeconfargs=(
-		--disable-harden-flags
-		$(use_enable ipv6)
-		$(use_enable nls)
-		$(use_enable selinux)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	use X || rm -f "${ED}"/usr/bin/pstree.x11
-
-	[[ -s ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/bin/peekfd
-	[[ -e ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/share/man/man1/peekfd.1
-
-	# fuser is needed by init.d scripts; use * wildcard for #458250
-	dodir /bin
-	mv "${ED}"/usr/bin/*fuser "${ED}"/bin || die
-}
diff --git a/sys-process/psmisc/psmisc-23.4-r1.ebuild b/sys-process/psmisc/psmisc-23.4-r1.ebuild
index 7f5ad69fee46..513db3dbf38b 100644
--- a/sys-process/psmisc/psmisc-23.4-r1.ebuild
+++ b/sys-process/psmisc/psmisc-23.4-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="ipv6 nls selinux X"
 
 RDEPEND="!=app-i18n/man-pages-l10n-4.0.0-r0
diff --git a/sys-process/psmisc/psmisc-23.4.ebuild b/sys-process/psmisc/psmisc-23.4.ebuild
deleted file mode 100644
index 70bf7153aa56..000000000000
--- a/sys-process/psmisc/psmisc-23.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A set of tools that use the proc filesystem"
-HOMEPAGE="http://psmisc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="ipv6 nls selinux X"
-
-RDEPEND="!=app-i18n/man-pages-l10n-4.0.0-r0
-	>=sys-libs/ncurses-5.7-r7:0=
-	nls? ( virtual/libintl )
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}"
-BDEPEND=">=sys-devel/libtool-2.2.6b
-	nls? ( sys-devel/gettext )"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_configure() {
-	local myeconfargs=(
-		--disable-harden-flags
-		$(use_enable ipv6)
-		$(use_enable nls)
-		$(use_enable selinux)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	use X || rm -f "${ED}"/usr/bin/pstree.x11
-
-	[[ -s ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/bin/peekfd
-	[[ -e ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/share/man/man1/peekfd.1
-
-	# fuser is needed by init.d scripts; use * wildcard for #458250
-	dodir /bin
-	mv "${ED}"/usr/bin/*fuser "${ED}"/bin || die
-}