gentoo resync : 14.04.2018

3 files changed, 197 insertions, 12 deletions

diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 27f6126f8cdb..5da9d6b3a239 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -32,6 +32,7 @@ EBUILD iputils-20121221-r2.ebuild 4051 BLAKE2B 05bb4832d99c0c065b5caffb695929c91
 EBUILD iputils-20151218.ebuild 3978 BLAKE2B 8807530ff225015572c8c7c058c47226f6f1071a5dd8e49b511681c7e75c225c4d8be72451c10ffeff1e19e03b368e92ebf3b4fb2bd17385886288ff9b4e6987 SHA512 615defa0483e9a35bf3abe67f332a3b24353ecd53bafbe8b7e45ddf1f72b7072af153deaecf636c9c735a479a98d54776c1cd085c44d5240f9b5fb92d43c8d7b
 EBUILD iputils-20160308.ebuild 3839 BLAKE2B 88fd40a916daa326e2251411b53c549a09e44f5bab8cd9953ab3d0620894297afdb8667173cd8fbcf86d4a52ee63ad96aebafc3d735e50bad0354d4978386be2 SHA512 79a29a57830234493dad8ecd7d9c84e0654ccae11731d1c7119751a5e2f3867fd60c787fee33b333b3b94e6f2bbe03c55852c1abdd13ef9c89a2c96ed3366cd1
 EBUILD iputils-20161105.ebuild 3871 BLAKE2B e6f89efa90125312d980687dda83694906dcdd22f31171ad29452ce706079faa9b383284634064e45ac15483b616cfdf8eeeb4b4b129f53e3f9c32d1c0d3b7f1 SHA512 6b4e5ec940b44759015cb2011330be1898bc3a5228e295958ac4529b28b376b047a065a36c8d52f61f91c3666fda60dd8ab603267e772c64b76c92d024779755
+EBUILD iputils-20171016_pre-r1.ebuild 4043 BLAKE2B 51bdb90db7da6ae5ad2115d042a73657328f3ba856f00fe6bcdfb07185442e630411dda02014635de95a0fff0f37a8b3bfe246685c1c942774e58182f27bbf63 SHA512 aefc58cde5cdb17fa7ffb7824395130c40d226a9c4b6e38b0baf58d0ad015d99f6eba99e9608d1bc3366636a0b6ef676730d348527e75ce2b5233c2853880775
 EBUILD iputils-20171016_pre.ebuild 4081 BLAKE2B a69c23852a6ace9986534da61288fee447d0b50e90ddf5bc05293ac8ebe1d4f97e409e7fdb7c8c2d7d8889a0a948f6f849d34665e13dd0b7c051d9bd0e7cfb76 SHA512 9df0e7c539f684643bddd441d90113caa877c1f7ab8113efd592178322b665b0142a409d4598b762c447956a15f0e0b47d651f5e7607817951d14629af3e023b
-EBUILD iputils-99999999.ebuild 3906 BLAKE2B 66717e31c585baeef10103195b123ab874b72b71f43d47abbc90c34c8e2794617281f1f70aaf2df0d224c87ba1acd24067ef8515069016d1332baf4c9f4f3a65 SHA512 d9a7f662644e65b8170fc8aa4642bee1f93d96772e011354054100f58b0d5b7d628d914ca136acdf5bd01728c2d532cef2b96d60f78bda66ae5aed14746396cd
+EBUILD iputils-99999999.ebuild 3859 BLAKE2B d8d17c0a69ce2547794b778ffa744e63e4ae688e42196d305211ef221981881fd2c2e6fcc2e48c6d9461efded6e307044196b180571712c5d1a6178673ac84a3 SHA512 32434ab695d31e99724208d70485fbec7d85a8b677a885047714a14da14631b5b3870a21fbe7de96202846afea19305e58e9de42d5830c4cf9032b2e672595b1
 MISC metadata.xml 1698 BLAKE2B 0351c77626f66e4a50d83072124088cc7195c4666f6a66f6a981fa66b16b3740da6a08d63da9db0b2a4d02f8a75a04f97142e5b78099525ee8ed4921738d0236 SHA512 f1d211dbe4212072614039c5aea1996270560a24dfa3734af86c4f1f4254cc3abf8440c03d8894b925b71b970e70fb60e79682753655a68b82203cdc401f6ebc
diff --git a/net-misc/iputils/iputils-20171016_pre-r1.ebuild b/net-misc/iputils/iputils-20171016_pre-r1.ebuild
new file mode 100644
index 000000000000..db580f8ee157
--- /dev/null
+++ b/net-misc/iputils/iputils-20171016_pre-r1.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# For released versions, we precompile the man/html pages and store
+# them in a tarball on our mirrors.  This avoids ugly issues while
+# building stages, and reduces depedencies.
+# To regenerate man/html pages emerge iputils-99999999[doc] with
+# EGIT_COMMIT set to release tag and tar ${S}/doc folder.
+
+EAPI="6"
+
+inherit flag-o-matic toolchain-funcs fcaps
+
+MY_COMMIT="67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-99999999-tracepath46.patch
+	"${FILESDIR}"/${PN}-99999999-musl.patch
+)
+
+if [[ ${PV} == "99999999" ]] ; then
+	EGIT_REPO_URI="https://github.com/iputils/iputils.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/iputils/iputils/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Network monitoring tools including ping and ping6"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
+
+LICENSE="BSD GPL-2+ rdisc"
+SLOT="0"
+IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
+
+LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
+	idn? ( net-dns/libidn[static-libs(+)] )
+	ipv6? (
+		ssl? (
+			gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
+			!gcrypt? (
+				nettle? ( dev-libs/nettle[static-libs(+)] )
+				!nettle? (
+					libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+					!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+				)
+			)
+		)
+	)
+"
+RDEPEND="arping? ( !net-misc/arping )
+	rarpd? ( !net-misc/rarpd )
+	traceroute? ( !net-analyzer/traceroute )
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	virtual/os-headers
+"
+if [[ ${PV} == "99999999" ]] ; then
+	DEPEND+="app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt:0
+	"
+fi
+
+[ "${PV}" = "99999999" ] || S="${WORKDIR}/${PN}-s${PV}"
+
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+src_prepare() {
+	use SECURITY_HAZARD && PATCHES+=( "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch )
+
+	default
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	TARGETS=(
+		ping
+		$(for v in arping clockdiff rarpd rdisc tftpd tracepath ; do usev ${v} ; done)
+	)
+	if use ipv6 ; then
+		TARGETS+=(
+			$(usex traceroute 'traceroute6' '')
+		)
+	fi
+
+	myconf=(
+		USE_CRYPTO=no
+		USE_GCRYPT=no
+		USE_NETTLE=no
+	)
+
+	if use ipv6 && use ssl ; then
+		myconf=(
+			USE_CRYPTO=yes
+			USE_GCRYPT=$(usex gcrypt)
+			USE_NETTLE=$(usex nettle)
+		)
+	fi
+}
+
+src_compile() {
+	tc-export CC
+	emake \
+		USE_CAP=$(usex caps) \
+		USE_IDN=$(usex idn) \
+		IPV4_DEFAULT=$(usex ipv6 'no' 'yes') \
+		TARGETS="${TARGETS[*]}" \
+		${myconf[@]}
+
+	if [[ ${PV} == "99999999" ]] ; then
+		emake man
+
+		use doc && emake html
+	fi
+}
+
+src_install() {
+	into /
+	dobin ping
+	dosym ping /bin/ping4
+	if use ipv6 ; then
+		dosym ping /bin/ping6
+		dosym ping.8 /usr/share/man/man8/ping6.8
+	fi
+	doman doc/ping.8
+
+	if use arping ; then
+		dobin arping
+		doman doc/arping.8
+	fi
+
+	into /usr
+
+	if use tracepath ; then
+		dosbin tracepath
+		doman doc/tracepath.8
+		dosym tracepath /usr/sbin/tracepath4
+	fi
+
+	local u
+	for u in clockdiff rarpd rdisc tftpd ; do
+		if use ${u} ; then
+			case ${u} in
+			clockdiff) dobin ${u};;
+			*) dosbin ${u};;
+			esac
+			doman doc/${u}.8
+		fi
+	done
+
+	if use tracepath && use ipv6 ; then
+		dosym tracepath /usr/sbin/tracepath6
+		dosym tracepath.8 /usr/share/man/man8/tracepath6.8
+	fi
+
+	if use traceroute && use ipv6 ; then
+		dosbin traceroute6
+		doman doc/traceroute6.8
+	fi
+
+	if use rarpd ; then
+		newinitd "${FILESDIR}"/rarpd.init.d rarpd
+		newconfd "${FILESDIR}"/rarpd.conf.d rarpd
+	fi
+
+	dodoc INSTALL.md
+
+	use doc && dodoc doc/*.html
+}
+
+pkg_postinst() {
+	fcaps cap_net_raw \
+		bin/ping \
+		$(usex arping 'bin/arping' '') \
+		$(usex clockdiff 'usr/bin/clockdiff' '')
+}
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index e56a7e5363f9..e935561bb1f5 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -27,18 +27,23 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
 
 LICENSE="BSD GPL-2+ rdisc"
 SLOT="0"
-IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle +openssl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
+IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
 
 LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
 	idn? ( net-dns/libidn2[static-libs(+)] )
-	ipv6? ( ssl? (
-		gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
-		nettle? ( dev-libs/nettle[static-libs(+)] )
-		openssl? (
-			!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-			libressl? ( dev-libs/libressl[static-libs(+)] )
+	ipv6? (
+		ssl? (
+			gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
+			!gcrypt? (
+				nettle? ( dev-libs/nettle[static-libs(+)] )
+				!nettle? (
+					libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+					!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+				)
+			)
 		)
-	) )"
+	)
+"
 RDEPEND="arping? ( !net-misc/arping )
 	rarpd? ( !net-misc/rarpd )
 	traceroute? ( !net-analyzer/traceroute )
@@ -55,8 +60,6 @@ if [[ ${PV} == "99999999" ]] ; then
 	"
 fi
 
-REQUIRED_USE="ipv6? ( ssl? ( ^^ ( gcrypt nettle openssl ) ) )"
-
 [ "${PV}" = "99999999" ] || S="${WORKDIR}/${PN}-s${PV}"
 
 src_prepare() {
@@ -86,7 +89,7 @@ src_configure() {
 
 	if use ipv6 && use ssl ; then
 		myconf=(
-			USE_CRYPTO=$(usex openssl)
+			USE_CRYPTO=yes
 			USE_GCRYPT=$(usex gcrypt)
 			USE_NETTLE=$(usex nettle)
 		)