net-misc/iputils: Update live ebuild

Closes: https://github.com/gentoo/gentoo/pull/5591
Closes: https://bugs.gentoo.org/628240
Package-Manager: Portage-2.3.13, Repoman-2.3.4

diff --git a/net-misc/iputils/files/iputils-99999999-tracepath46.patch b/net-misc/iputils/files/iputils-99999999-tracepath46.patch
new file mode 100644 (file)
index 0000000..20d017b
--- /dev/null
+++ b/net-misc/iputils/files/iputils-99999999-tracepath46.patch
@@ -0,0 +1,30 @@
+From 2c4d0838dda90515d4971881d86e8b969baebe01 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Thu, 19 Oct 2017 17:38:20 +0200
+Subject: [PATCH] tracepath: Support calling `tracepath` as `tracepath4` or
+ `tracepath6`
+
+---
+ tracepath.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/tracepath.c b/tracepath.c
+index b0eb911..d2a6edf 100644
+--- a/tracepath.c
++++ b/tracepath.c
+@@ -394,6 +394,12 @@ int main(int argc, char **argv)
+       setlocale(LC_ALL, "");
+ #endif
+ 
++      /* Support being called using `tracepath4` or `tracepath6` symlinks */
++      if (argv[0][strlen(argv[0])-1] == '4')
++              hints.ai_family = AF_INET;
++      else if (argv[0][strlen(argv[0])-1] == '6')
++              hints.ai_family = AF_INET6;
++
+       while ((ch = getopt(argc, argv, "46nbh?l:m:p:")) != EOF) {
+               switch(ch) {
+               case '4':
+-- 
+2.14.3
+

diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index ce003cbf4fee512c0f3c1fe87af036c072a5da44..9731575e02e374c9377e27469e048291ddfbeb5a 100644 (file)
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -3,20 +3,22 @@
 
 # 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).
-# Required packages for doc generation:
-# app-text/docbook-sgml-utils
+# 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=5
+EAPI="6"
+
+inherit flag-o-matic toolchain-funcs fcaps
+
+PATCHES=( "${FILESDIR}"/${PN}-99999999-tracepath46.patch )
 
-inherit flag-o-matic eutils toolchain-funcs fcaps
 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/s${PV}.tar.gz -> ${P}.tar.gz
-               https://dev.gentoo.org/~polynomial-c/iputils-s${PV}-manpages.tar.xz"
+               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
 
@@ -43,13 +45,13 @@ RDEPEND="arping? ( !net-misc/arping )
        !static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
        static? ( ${LIB_DEPEND} )
-       virtual/os-headers"
+       virtual/os-headers
+"
 if [[ ${PV} == "99999999" ]] ; then
-       DEPEND+="
-               app-text/openjade
-               dev-perl/SGMLSpm
-               app-text/docbook-sgml-dtd
-               app-text/docbook-sgml-utils
+       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
 
@@ -58,7 +60,9 @@ REQUIRED_USE="ipv6? ( ssl? ( ^^ ( gcrypt nettle openssl ) ) )"
 [ "${PV}" = "99999999" ] || S="${WORKDIR}/${PN}-s${PV}"
 
 src_prepare() {
-       use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch
+       use SECURITY_HAZARD && PATCHES+=( "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch )
+
+       default
 }
 
 src_configure() {
@@ -70,7 +74,6 @@ src_configure() {
        )
        if use ipv6 ; then
                TARGETS+=(
-                       $(usex tracepath 'tracepath6' '')
                        $(usex traceroute 'traceroute6' '')
                )
        fi
@@ -100,7 +103,9 @@ src_compile() {
                ${myconf[@]}
 
        if [[ ${PV} == "99999999" ]] ; then
-               emake html man
+               emake man
+
+               use doc && emake html
        fi
 }
 
@@ -121,8 +126,14 @@ src_install() {
 
        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 tracepath ; do
+       for u in clockdiff rarpd rdisc tftpd ; do
                if use ${u} ; then
                        case ${u} in
                        clockdiff) dobin ${u};;
@@ -133,7 +144,7 @@ src_install() {
        done
 
        if use tracepath && use ipv6 ; then
-               dosbin tracepath6
+               dosym tracepath /usr/sbin/tracepath6
                dosym tracepath.8 /usr/share/man/man8/tracepath6.8
        fi
 
@@ -147,9 +158,9 @@ src_install() {
                newconfd "${FILESDIR}"/rarpd.conf.d rarpd
        fi
 
-       dodoc INSTALL.md RELNOTES
+       dodoc INSTALL.md
 
-       use doc && dohtml doc/*.html
+       use doc && dodoc doc/*.html
 }
 
 pkg_postinst() {