gentoo resync : 17.02.2018

4 files changed, 23 insertions, 135 deletions

diff --git a/sys-process/lsof/Manifest b/sys-process/lsof/Manifest
index d952b40d0ea7..90c3e4c4e097 100644
--- a/sys-process/lsof/Manifest
+++ b/sys-process/lsof/Manifest
@@ -1,10 +1,7 @@
 AUX lsof-4.85-cross.patch 1061 BLAKE2B 730a02dfcd433bb6d46d3fecd87aa0913800408d67302bd9a9580ab3fec6e4a88e453890dec348796258eccd4c5185cc8f06ab2029347d632037f24dd0aa066e SHA512 9326a2708910a39ba3b81253c21149f8e4fa44b207e4c2a88f86c9322d2b50e6360760fcb13e00f644aba57ad207106c280db00ebc2d1f3d49405b54681548e8
-AUX lsof-4.88-linux.dnode.c.patch 494 BLAKE2B ce4ed7fa4b1d0f3115156234b0669f86d14d0ebfa49e962f16bc179ce15dda07611742aadf4259d4d28e6501d59d165bc4f612ba80909155dc6437f7b4dd439c SHA512 253c0b3e3d50f805ffde21ba214e0a56fa554eb98fd126fd3edc4aa0401e24c2fbb72e30288fe8cc371a3f615f5365e6fc753e7dc2aa0a8367f132c7411b28f1
-DIST lsof_4.87.tar.bz2 773664 BLAKE2B 39ccc2ed9545c0e37ce21fae0330394110807f181bc2c35be3ca1e72062df8359163edec4a47f9f9edfeb2e87af27a40fe16d12436a10e521d595877d02786ed SHA512 5e811225dd65366e3ef49628d567864fadda1dbda2d66a5e473123e73c468f5a3a577ae4e1b701a55ac49c2a759dab5c413663121c260a2804fca10ece902766
-DIST lsof_4.88.tar.bz2 778563 BLAKE2B 376f4474a1a113b76fd40a542a2b2e797f1b181286935f66f10f37474a07f30b55feac4700789a923774be09f9ceded312e94e866e1156f7dee188adc5eb3fdd SHA512 acf3901ac08bac5acaa123af835de03fcf86c1cb851a2cba5bb6d08c53dff62570e4129c18ffa241ae84a83d5e6fc5207fb12e43b5ff5a21a0c1967ca117848b
 DIST lsof_4.89.tar.bz2 784560 BLAKE2B 375ad53fd5c26a79559295fc8bcb6c495c00bf546019001b498f064dbd111f3581d60a577c199ce2cbd49dac0c061cdaea99de56d6bf069dceb0dd8b2f836942 SHA512 cafb0209143c7863e5cebe7efc33a2520d36f9e26222350e4edfa18debbcfb5c81f42f71469e5913fb21f49a7562bbe761b72dfc8f297dadf75ac619cdcb318c
-EBUILD lsof-4.87-r1.ebuild 2749 BLAKE2B 187a739a3d500c566f052abf7b47769717344b3904779a2bfc39063d34bee72f53a3fb912bfeaaa3e0d0c75eea9dc092ddeed335abb3306621b634160e947c84 SHA512 13a86d48c4755a6aeedf170874f5c7181458ea15b89b3c4db7f467a3147a13d031cfa7660885242428c4a3347f4efb0d81075add39815da0de301a5b5b244ba4
-EBUILD lsof-4.88-r1.ebuild 2933 BLAKE2B fb6dc6046b708ef65a0de4f62b105fb1d8e563fc248e21d86ecebd4c2f942e4258664f3f0121d4bc7ec44b3e22c1c118b3d37ad4376f9fc1fa2718b05f5b278c SHA512 80737257fb08e8f41d76bb1c2f36cf190d2b08fa431174a607ee39632c749fecaba0662f8596e8ec3a85fb4a2d45af71dbd764498f21d7cbac2a6766676cf4cd
+DIST lsof_4.90.tar.bz2 791758 BLAKE2B 250025eb553ee4574cadadcc57fa52bd97d8ce4432e25e9e028d3eec4033be54d5cbab5f02e0a04365033b5d179ca50efa591efe4ac28077f63513edee131084 SHA512 8c1481ab72867488d800ad68c9de5c936f034f044c90eeed220fb5683f68ba8efa3dd0efe1e23b4d4968750255b475150ad08ae8627dd9aa0a5025498418351a
 EBUILD lsof-4.89-r1.ebuild 3252 BLAKE2B c06ea5f26ef03bc3ddd1712afb89a9bf5c7b37ee9fb553b6db65a50bc3cbf448c2f4be18a9c8453b09ff0e5d5b317e08506d7799b21000bb37d5df942efbb795 SHA512 f44b786019ecf0cf041f51725a8a5ee742b01723638ed215b60988b48a98c164aaee7beb4dcd906f836d383630edc6fe805910082f9782adf6734b2ee16e58e5
 EBUILD lsof-4.89.ebuild 2980 BLAKE2B 2d2229df4d2d952bffff94f3fe0066107e3a1ed93d410a043c6ac57221f3a4a65a5f1e63cc7614c8b34cb93a3bea6668938663d30c3ca8f10fee3a59e2af370c SHA512 3b3d5ce06f3123aca989c683d8c3ef165eafc488258e87e429c96159f5c402326cbfee8426594b89b3106c36d7c2c80e3a501c4d2f4dddd6c8fb2687017772b1
+EBUILD lsof-4.90.ebuild 3262 BLAKE2B d9d84cd4d4ad411fdebce92deb5fbee37d7ead230982fd5288670ba89d6679dac553870d5a83993cf2d48d742c6dec922f51192c8c433d92652e2757984b039b SHA512 ce0bc6ec9576656ab3bb6d79a45bb520bb054a62bc22236edeaa768bd32171e89387253822b283644a55d4a8c0d233a82efd797c1a780af0ecc0ea703b45fc0b
 MISC metadata.xml 327 BLAKE2B 4dec6763546c6f65ccd6a2483e6cc99203313a267ee5f18ca0e646f9af8774c8760e4f56711735f2c64880af8bc78e26b22e47774b36fb48ccd2d841647d274e SHA512 c8c0efc3b339063936d805d533cf3528e1a4e1a84829c0e0f993fd3268751f4d7d4713f45cc6fec2956101b611e6e344e0c0336eb8d1b769a47481d72088fb98
diff --git a/sys-process/lsof/files/lsof-4.88-linux.dnode.c.patch b/sys-process/lsof/files/lsof-4.88-linux.dnode.c.patch
deleted file mode 100644
index 28640a9e65ed..000000000000
--- a/sys-process/lsof/files/lsof-4.88-linux.dnode.c.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/patches/4.88/linux.dnode.c.patch
-
-*** dnode.c
---- lsof_4.88_src/dialects/linux/dnode.c
-***************
-*** 580,586 ****
-  	    Lf->inp_ty = 1;
-  
-  #if	defined(HASEPTOPTS)
-! 	    if (Lf->ntype == N_FIFO) {
-  	    	(void) enter_pinfo();
-  		Lf->sf |= SELPINFO;
-  	    }
---- 580,586 ----
-  	    Lf->inp_ty = 1;
-  
-  #if	defined(HASEPTOPTS)
-! 	    if ((Lf->ntype == N_FIFO) && FpipeE) {
-  	    	(void) enter_pinfo();
-  		Lf->sf |= SELPINFO;
-  	    }
diff --git a/sys-process/lsof/lsof-4.87-r1.ebuild b/sys-process/lsof/lsof-4.87-r1.ebuild
deleted file mode 100644
index 1ff04cdc9b14..000000000000
--- a/sys-process/lsof/lsof-4.87-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-MY_P=${P/-/_}
-DESCRIPTION="Lists open files for running Unix processes"
-HOMEPAGE="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/"
-SRC_URI="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
-	ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/OLD/${MY_P}.tar.bz2"
-
-LICENSE="lsof"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples ipv6 rpc selinux static"
-
-RDEPEND="rpc? ( net-libs/libtirpc )
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	rpc? ( virtual/pkgconfig )"
-
-S=${WORKDIR}/${MY_P}/${MY_P}_src
-
-src_unpack() {
-	unpack ${A}
-	cd ${MY_P}
-	unpack ./${MY_P}_src.tar
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.85-cross.patch #432120
-	# convert `test -r header.h` into a compile test
-	sed -i -r \
-		-e 's:test -r \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\1>" | ${LSOF_CC} ${LSOF_CFGF} -E - >/dev/null 2>\&1:' \
-		-e 's:grep (.*) \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\2>" | ${LSOF_CC} ${LSOF_CFGF} -E -P -dD - 2>/dev/null | grep \1:' \
-		Configure || die
-}
-
-target() {
-	case ${CHOST} in
-	*-darwin*)  echo darwin  ;;
-	*-freebsd*) echo freebsd ;;
-	*-solaris*) echo solaris ;;
-	*-aix*)     echo aixgcc  ;;
-	*)          echo linux   ;;
-	esac
-}
-
-src_configure() {
-	use static && append-ldflags -static
-
-	append-cppflags $(use rpc && $(tc-getPKG_CONFIG) libtirpc --cflags || echo "-DHASNOTRPC -DHASNORPC_H")
-	append-cppflags $(usex ipv6 -{D,U}HASIPv6)
-
-	export LSOF_CFGL="${CFLAGS} ${LDFLAGS} \
-		$(use rpc && $(tc-getPKG_CONFIG) libtirpc --libs)"
-
-	# Set LSOF_INCLUDE to a dummy location so the script doesn't poke
-	# around in it and mix /usr/include paths with cross-compile/etc.
-	touch .neverInv
-	LINUX_HASSELINUX=$(usex selinux y n) \
-	LSOF_INCLUDE=${T} \
-	LSOF_CC=$(tc-getCC) \
-	LSOF_AR="$(tc-getAR) rc" \
-	LSOF_RANLIB=$(tc-getRANLIB) \
-	LSOF_CFGF="${CFLAGS} ${CPPFLAGS}" \
-	./Configure -n $(target) || die
-}
-
-src_compile() {
-	emake DEBUG="" all
-}
-
-src_install() {
-	dobin lsof
-
-	if use examples ; then
-		insinto /usr/share/lsof/scripts
-		doins scripts/*
-	fi
-
-	doman lsof.8
-	dodoc 00*
-}
-
-pkg_postinst() {
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		einfo "Note: to use lsof on Solaris you need read permissions on"
-		einfo "/dev/kmem, i.e. you need to be root, or to be in the group sys"
-	elif [[ ${CHOST} == *-aix* ]] ; then
-		einfo "Note: to use lsof on AIX you need read permissions on /dev/mem and"
-		einfo "/dev/kmem, i.e. you need to be root, or to be in the group system"
-	fi
-}
diff --git a/sys-process/lsof/lsof-4.88-r1.ebuild b/sys-process/lsof/lsof-4.90.ebuild
index f9371208a23a..f22dd0eaae84 100644
--- a/sys-process/lsof/lsof-4.88-r1.ebuild
+++ b/sys-process/lsof/lsof-4.90.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=6
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
-MY_P=${P/-/_}
+MY_P="${P/-/_}"
 DESCRIPTION="Lists open files for running Unix processes"
 HOMEPAGE="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/"
 SRC_URI="ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2
-	ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/OLD/${MY_P}.tar.bz2"
+	ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/OLD/${MY_P}.tar.bz2
+	http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/${MY_P}.tar.bz2"
 
 LICENSE="lsof"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples ipv6 rpc selinux static"
 
 RDEPEND="rpc? ( net-libs/libtirpc )
@@ -21,24 +22,30 @@ RDEPEND="rpc? ( net-libs/libtirpc )
 DEPEND="${RDEPEND}
 	rpc? ( virtual/pkgconfig )"
 
-S=${WORKDIR}/${MY_P}/${MY_P}_src
+S="${WORKDIR}/${MY_P}/${MY_P}_src"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.85-cross.patch #432120
+)
 
 src_unpack() {
 	unpack ${A}
-	cd ${MY_P}
+	cd ${MY_P} || die
 	unpack ./${MY_P}_src.tar
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.85-cross.patch #432120
-	epatch "${FILESDIR}"/${P}-linux.dnode.c.patch
+	default
 	# fix POSIX compliance with `echo`
 	sed -i \
 		-e 's:echo -n:printf:' \
 		AFSConfig Configure Customize Inventory tests/CkTestDB || die
-	# convert `test -r header.h` into a compile test
-	sed -i -r \
-		-e 's:test -r \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\1>" | ${LSOF_CC} ${LSOF_CFGF} -E - >/dev/null 2>\&1:' \
+	# Convert `test -r header.h` into a compile test.
+	# Make sure we convert `test ... -a ...` into two `test` commands
+	# so we can then convert both over into a compile test. #601432
+	sed -i -E \
+		-e '/if test .* -a /s: -a : \&\& test :g' \
+		-e '/test -r/s:test -r \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\1>" | ${LSOF_CC} ${LSOF_CFGF} -E - >/dev/null 2>\&1:g' \
 		-e 's:grep (.*) \$\{LSOF_INCLUDE\}/([[:alnum:]/._]*):echo "#include <\2>" | ${LSOF_CC} ${LSOF_CFGF} -E -P -dD - 2>/dev/null | grep \1:' \
 		Configure || die
 }
@@ -58,6 +65,7 @@ src_configure() {
 
 	append-cppflags $(use rpc && $(tc-getPKG_CONFIG) libtirpc --cflags || echo "-DHASNOTRPC -DHASNORPC_H")
 	append-cppflags $(usex ipv6 -{D,U}HASIPv6)
+	[[ ${CHOST} == *-solaris2.11 ]] && append-cppflags -DHAS_PAD_MUTEX
 
 	export LSOF_CFGL="${CFLAGS} ${LDFLAGS} \
 		$(use rpc && $(tc-getPKG_CONFIG) libtirpc --libs)"