gentoo resync : 25.08.2018

5 files changed, 9 insertions, 144 deletions

diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest
index 7644c0a2bf73..f1ac898e6e70 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -1,8 +1,5 @@
-AUX psmisc-22.21-fuser_typo_fix.patch 1226 BLAKE2B abe01eb821e6d2796c50387e4e6b2d26bcf220b576355978a96929569e85bb0690f7e79c7b9acf7a614442b6c79cdb356586d28bdb95855112f6c159c5cf491c SHA512 c2e46a19959f368935462bc93bde8bf5ee4a3b5530a66255cd9a83be04acbc6246e0a3900efeb1cb9f1bbaf5a1435c0c65d677f643664be25f87662e6048c930
-AUX psmisc-22.21-sysmacros.patch 693 BLAKE2B f5e346821af0ae418431d8585a6f7f6150d5c28240a2d48c299b9e172f5d7ee27c3dbf8bb0136be03293dd62d4b0d44c83c3832a33177b44082c6f72ab74ad98 SHA512 febac721daad0046eb8367015657904eafaa934dc4b314f19ec487c1953ea2f4ff70e79e7c94473a20e5a69e7ed1eb17a4cfbbac6b102622b12322bb9cc76a09
-DIST psmisc-22.21.tar.gz 457702 BLAKE2B 7e81b695546c3dca6e1ade47bd1cd736ad434eb964608ead3e7d5a3b97f6d3d6c927e8e13ee525e716b66067e5a1573c4f0b8434540b9c66aac6e6b8f15bcfde SHA512 766aeb45687090b88b17176c5117a603e83fe92a13c013aea72c8ee80048adf02e18c7daa52ddfb8b2135f7c9a1bcae38896cdfb8d0158728d85a446c5e0d5ae
 DIST psmisc-23.1.tar.xz 296136 BLAKE2B e53f7b80f1106622d652dad772d4236a62a1eb58e277f078cf0392d5a0bd7963c66805e28f6d1300999f2e2e5dcb692b1ecb3f6d39cefa77ebbc87302cd730be SHA512 f678869ea555986a2538ada9630b74ce79304f3ee85cc9d69a3912d8d30ad491829eac0dcb69aae7003ee9b5de9645d2135b80a9e0b77824e60c417dc0be5f95
-EBUILD psmisc-22.21-r3.ebuild 1381 BLAKE2B 0ab006290c79539f4bcf949f0e6cbbbca2c55236f5068856f5b53aeb6444908138fc1f0dd15040c596ae34fb6f8a5eeda31ad0483d85154a91804eff7dee9e1e SHA512 e909d68ebb9b81959c8c4126bf511337450c19fdc66dac38db2fa66bf580e88d42a070e9fc602f9b68bbf0d96044ff57ae7b7655095e48aec5e8dab37bd1a483
+DIST psmisc-23.2.tar.xz 298784 BLAKE2B 61d1ad385f176cbe3ca0edcdd41ed026ab52aca4190c31551392cf83d0bf293de22899b13238d7ebeb1627013a2dc734ca91ad7a0a313c9d92b7af662728bf21 SHA512 114dc4d9a4d66374ee75cd6c845230c24540aa1d7562253c6fd5695552698afcf3e2ad2d7e9675addc63201f7e6d9e697287c72a638705194155bec508211dc3
 EBUILD psmisc-23.1-r1.ebuild 1284 BLAKE2B 13109642c6810f9e98d7cedeee15c829e5191b61ce52763c6443af447f57b1c9dc385ee6c44579b6c9c3bd8ae85bfc7b8b5c75cc003303c7c4a6ffb82487018f SHA512 baddd89816a428f51ad059b0e5dba6a880d784156d7f600a5191949f0f5dc0094289b969b209d17ade453c64f5f48642640654281321edda0c316b16405f01f7
-EBUILD psmisc-23.1.ebuild 1299 BLAKE2B c7cf0bf50d0f3b718c419668ef2314282f4ca9628886584ecad78cd8b60f10c3a0335286e56554965b70796d00e7a7ccb2d56e59083a64ccb19ccac4e5803ba5 SHA512 0387c7623dd36e04f74e7a83d948d1ff0a064a8b5108267b9d5ab1024a72f9225e4ae1e7bdee014b2ae69e2c609528810484e0e22708f7a17f6ea349fe634ece
+EBUILD psmisc-23.2.ebuild 1297 BLAKE2B fd32750fcdf94b0b25cac1c1fa340acd7b1dc4804cbe06abf1ce4bfb3a6a99580877c58d3f3f0650c0354b63d563a32c5712459bc55bfaf0ceb3031929c61d34 SHA512 9d685a0207384ea90ff6b38b39a4e0b9a58bae6d158b5f5972b52bb061bdd93ae5dec92c174992171e1b296399953909d505185dfa1b7771807dc36247b52839
 MISC metadata.xml 326 BLAKE2B 899a2f3fa295d2e0e8d6114542a149db37c730b845d7ba720127ca2b9b85044c53ff7aa107f866a6e2ece895a8159e25350b17d9665fc9ff915aed3640ac22cf SHA512 580a0e66078b7304d0bf76e3c990e61ee4c073b49381b60c5f3f01e2b64d5f0c318eb5596f7da09a70fa52dc93769b25f37f531038e5d7ce6278dda10e18117c
diff --git a/sys-process/psmisc/files/psmisc-22.21-fuser_typo_fix.patch b/sys-process/psmisc/files/psmisc-22.21-fuser_typo_fix.patch
deleted file mode 100644
index 5c5fd990f9ca..000000000000
--- a/sys-process/psmisc/files/psmisc-22.21-fuser_typo_fix.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 3638cc55b4d08851faba46635d737b24d016665b Mon Sep 17 00:00:00 2001
-From: Brad Jorsch <anomie@users.sourceforge.net>
-Date: Fri, 28 Feb 2014 21:55:02 +1100
-Subject: [PATCH] Typo in fuser makes -M on all the time
-
-Brad found that fuser had the -M option on all the time.
-A simple but significant typo caused this, thanks the the patch.
-
-Bug-Debian: http://bugs.debian.org/740275
-
-Signed-off-by: Craig Small <csmall@enc.com.au>
----
- ChangeLog   | 4 ++++
- src/fuser.c | 2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index fd1cccf..e5f784c 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,7 @@
-+Changes in 22.22
-+================
-+	* Fixed typo in fuser which has -M on Debian #740275
-+
- Changes in 22.21
- ================
- 	* Missing comma in fuser(1) added Debian #702391
-diff --git a/src/fuser.c b/src/fuser.c
-index b485f65..389b302 100644
---- a/src/fuser.c
-+++ b/src/fuser.c
-@@ -1174,7 +1174,7 @@ int main(int argc, char *argv[])
- 		usage(_("No process specification given"));
- 
- 	/* Check if -M flag was used and if so check mounts */
--	if (opts * OPT_ISMOUNTPOINT) {
-+	if (opts & OPT_ISMOUNTPOINT) {
- 	    check_mountpoints(&mounts, &names_head, &names_tail);
- 	}
- 
--- 
-2.2.2
-
diff --git a/sys-process/psmisc/files/psmisc-22.21-sysmacros.patch b/sys-process/psmisc/files/psmisc-22.21-sysmacros.patch
deleted file mode 100644
index 440c5e62e7ed..000000000000
--- a/sys-process/psmisc/files/psmisc-22.21-sysmacros.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 367886e1c49238d1a02721f849564d77a163465b Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 7 Mar 2016 14:52:22 -0500
-Subject: [PATCH] fuser: include sysmacros.h for makedev
-
-BSD/Linux define makedev in the sysmacros.h header.  Include it directly
-instead of relying on types.h pulling it in for us.
----
- src/fuser.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/fuser.c b/src/fuser.c
-index da94d22..380046f 100644
---- a/src/fuser.c
-+++ b/src/fuser.c
-@@ -36,6 +36,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/socket.h>
-+#include <sys/sysmacros.h>
- #include <sys/wait.h>
- #include <arpa/inet.h>
- #include <netinet/in.h>
--- 
-2.6.2
-
diff --git a/sys-process/psmisc/psmisc-22.21-r3.ebuild b/sys-process/psmisc/psmisc-22.21-r3.ebuild
deleted file mode 100644
index 1414df7d9b49..000000000000
--- a/sys-process/psmisc/psmisc-22.21-r3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="A set of tools that use the proc filesystem"
-HOMEPAGE="http://psmisc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-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}
-	>=sys-devel/libtool-2.2.6b
-	nls? ( sys-devel/gettext )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fuser_typo_fix.patch"
-	"${FILESDIR}/${P}-sysmacros.patch"
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-}
-
-src_configure() {
-	econf \
-		$(use_enable selinux) \
-		--disable-harden-flags \
-		$(use_enable ipv6) \
-		$(use_enable nls)
-}
-
-src_compile() {
-	# peekfd is a fragile crap hack #330631
-	nonfatal emake -C src peekfd || touch src/peekfd{.o,}
-	emake
-}
-
-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.1.ebuild b/sys-process/psmisc/psmisc-23.2.ebuild
index e25d09501c93..b30a176a38e0 100644
--- a/sys-process/psmisc/psmisc-23.1.ebuild
+++ b/sys-process/psmisc/psmisc-23.2.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils
+EAPI=6
 
 DESCRIPTION="A set of tools that use the proc filesystem"
 HOMEPAGE="http://psmisc.sourceforge.net/"
@@ -25,10 +23,10 @@ DOCS=( AUTHORS ChangeLog NEWS README )
 
 src_configure() {
 	local myeconfargs=(
-		$(use_enable selinux)
 		--disable-harden-flags
 		$(use_enable ipv6)
 		$(use_enable nls)
+		$(use_enable selinux)
 	)
 	econf "${myeconfargs[@]}"
 }
@@ -42,12 +40,12 @@ src_compile() {
 src_install() {
 	default
 
-	use X || rm -f "${ED}"/usr/bin/pstree.x11
+	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
+	[[ -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
+	mv "${ED%/}"/usr/bin/*fuser "${ED%/}"/bin || die
 }