Version bump #453806 by Agostino Sarubbo.

Package-Manager: portage-2.2.0_alpha159/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

1 files changed, 22 insertions, 23 deletions

diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index 5207736b8d17..694c550e8494 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-99999999.ebuild,v 1.6 2011/11/09 22:34:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-99999999.ebuild,v 1.7 2013/01/25 05:28:28 vapier Exp $
 
 # 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 when the jade/sgml packages are broken (which
 # seems to be more common than would be nice).
 
-EAPI="2"
+EAPI="4"
 
 inherit flag-o-matic eutils toolchain-funcs
 if [[ ${PV} == "99999999" ]] ; then
@@ -20,13 +20,15 @@ else
 fi
 
 DESCRIPTION="Network monitoring tools including ping and ping6"
-HOMEPAGE="http://www.linux-foundation.org/en/Net:Iputils"
+HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iputils"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="doc idn ipv6 SECURITY_HAZARD ssl static"
+IUSE="caps doc gnutls idn ipv6 SECURITY_HAZARD ssl static"
 
 RDEPEND="!net-misc/rarpd
+	caps? ( sys-libs/libcap )
+	gnutls? ( net-libs/gnutls )
 	ssl? ( dev-libs/openssl )
 	idn? ( net-dns/libidn )"
 DEPEND="${RDEPEND}
@@ -44,41 +46,38 @@ S=${WORKDIR}/${PN}-s${PV}
 
 src_prepare() {
 	epatch "${FILESDIR}"/021109-uclibc-no-ether_ntohost.patch
-	epatch "${FILESDIR}"/${PN}-20100418-openssl.patch #335436
+	epatch "${FILESDIR}"/${PN}-20121221-openssl.patch #335436
 	epatch "${FILESDIR}"/${PN}-20100418-so_mark.patch #335347
-	epatch "${FILESDIR}"/${PN}-20100418-makefile.patch
-	epatch "${FILESDIR}"/${PN}-20100418-proper-libs.patch #332703
-	epatch "${FILESDIR}"/${PN}-20100418-printf-size.patch
-	epatch "${FILESDIR}"/${PN}-20100418-aliasing.patch
-	epatch "${FILESDIR}"/${PN}-20071127-kernel-ifaddr.patch
-	epatch "${FILESDIR}"/${PN}-20070202-idn.patch #218638
-	epatch "${FILESDIR}"/${PN}-20071127-infiniband.patch #377687
-	epatch "${FILESDIR}"/${PN}-20101006-owl-pingsock.diff
+	epatch "${FILESDIR}"/${PN}-20121221-makefile.patch
+	epatch "${FILESDIR}"/${PN}-20121221-printf-size.patch
+	epatch "${FILESDIR}"/${PN}-20121221-owl-pingsock.diff
 	use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20071127-nonroot-floodping.patch
 	use static && append-ldflags -static
-	use ssl && append-cppflags -DHAVE_OPENSSL
-	use ipv6 || sed -i -e 's:IPV6_TARGETS=:#IPV6_TARGETS=:' Makefile
-	export IDN=$(use idn && echo yes)
 }
 
 src_compile() {
 	tc-export CC
-	emake || die
+	emake \
+		USE_CAP=$(usex caps) \
+		USE_IDN=$(usex idn) \
+		USE_GNUTLS=$(usex gnutls) \
+		USE_CRYPTO=$(usex ssl) \
+		$(use ipv6 || echo IPV6_TARGETS=)
 
 	if [[ ${PV} == "99999999" ]] ; then
-		emake -j1 html man || die
+		emake -j1 html man
 	fi
 }
 
 src_install() {
 	into /
-	dobin ping || die
+	dobin ping
 	use ipv6 && dobin ping6
-	dosbin arping || die
+	dosbin arping
 	into /usr
-	dosbin tracepath || die
+	dosbin tracepath
 	use ipv6 && dosbin trace{path,route}6
-	dosbin clockdiff rarpd rdisc ipg tftpd || die
+	dosbin clockdiff rarpd rdisc ipg tftpd
 
 	fperms 4711 /bin/ping
 	use ipv6 && fperms 4711 /bin/ping6 /usr/sbin/traceroute6