Make ipv6 traceroute6, tracepath6 and ping6 made optional based on ipv6 use flag. Prepare for x86 stable in the next day to two for GRP release.

5 files changed, 117 insertions, 6 deletions

diff --git a/net-misc/iputils/ChangeLog b/net-misc/iputils/ChangeLog
index 671b6fc9b437..6bf4eaed19ad 100644
--- a/net-misc/iputils/ChangeLog
+++ b/net-misc/iputils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/iputils
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.18 2004/01/13 02:41:52 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/ChangeLog,v 1.19 2004/01/13 11:03:11 solar Exp $
+
+  13 Jan 2004; Ned Ludd <solar@gentoo.org> iputils-021109-r1.ebuild:
+  Make ipv6 traceroute6, tracepath6 and ping6 made optional based on 
+  ipv6 use flag. Prepare for x86 stable in the next day to two for
+  GRP release.
+
+*iputils-021109-r1 (13 Jan 2004)
 
   12 Jan 2004; Luca Barbato <lu_zero@gentoo.org> iputils-021109.ebuild:
   Marked ppc to match the linux-headers changes
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 8e5b51070cd0..b850c4e354ee 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -1,6 +1,8 @@
 MD5 6bdf08081c1f60212129b07a17ca3a34 ChangeLog 3027
 MD5 1f46035ba1eb4e0a5778c62e7e5f7839 iputils-021109.ebuild 2285
 MD5 21bbbdb8abaaadd8e7d084aab7d181b6 iputils-020927.ebuild 1333
-MD5 0a62fdeb93c761e5407fd3e185308a99 files/iputils-021109-pfkey.patch 3477
-MD5 d6d6f3cb8ff77c826d432ed7eb394c43 files/digest-iputils-020927 68
+MD5 32f053a0b2d70679a78ac2bfab7e557e iputils-021109-r1.ebuild 2503
 MD5 66a524e27160410a2dbaef8d2eed5365 files/digest-iputils-021109 73
+MD5 d6d6f3cb8ff77c826d432ed7eb394c43 files/digest-iputils-020927 68
+MD5 0a62fdeb93c761e5407fd3e185308a99 files/iputils-021109-pfkey.patch 3477
+MD5 66a524e27160410a2dbaef8d2eed5365 files/digest-iputils-021109-r1 73
diff --git a/net-misc/iputils/files/digest-iputils-021109-r1 b/net-misc/iputils/files/digest-iputils-021109-r1
new file mode 100644
index 000000000000..ea769a132e46
--- /dev/null
+++ b/net-misc/iputils/files/digest-iputils-021109-r1
@@ -0,0 +1 @@
+MD5 dd10ef3d76480990a2174d2bb0daddaf iputils-ss021109-try.tar.bz2 428335
diff --git a/net-misc/iputils/iputils-021109-r1.ebuild b/net-misc/iputils/iputils-021109-r1.ebuild
new file mode 100644
index 000000000000..75e2d3b16d84
--- /dev/null
+++ b/net-misc/iputils/iputils-021109-r1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-021109-r1.ebuild,v 1.1 2004/01/13 11:03:11 solar Exp $
+
+DESCRIPTION="Network monitoring tools including ping and ping6"
+HOMEPAGE="ftp://ftp.inr.ac.ru/ip-routing"
+SRC_URI="ftp://ftp.inr.ac.ru/ip-routing/${PN}-ss${PV}-try.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~alpha ~ppc ~hppa ~mips ~amd64 ~ia64 ppc64"
+IUSE="static ipv6" #doc
+
+DEPEND="virtual/glibc
+	virtual/os-headers
+	!ppc64? ( dev-util/yacc )"
+#	doc? ( app-text/openjade
+#		dev-perl/SGMLSpm
+#		app-text/docbook-sgml-dtd
+#		app-text/docbook-sgml-utils )
+RDEPEND="virtual/glibc"
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+
+	cp ${FILESDIR}/${P}-pfkey.patch include-glibc/net/pfkeyv2.h || die
+	sed -e "27s:-O2:${CFLAGS}:;68s:./configure:unset CFLAGS\;./configure:" -i Makefile
+	sed -e "20d;21d;22d;23d;24d" -i Makefile
+
+	# not everybody wants ipv6 suids laying around on the filesystems
+	use ipv6 || sed -i -e s:"IPV6_TARGETS=":"#IPV6_TARGETS=":g Makefile
+}
+
+src_compile() {
+
+	use static && LDFLAGS="${LDFLAGS} -static"
+
+	if [ -e ${ROOT}/usr/include/linux/pfkeyv2.h ]; then
+		sed -e '1s:/usr/src/linux/include:/usr/include:' -i libipsec/Makefile
+		sed -e '1s:/usr/src/linux/include:/usr/include:' -i setkey/Makefile
+		sed -e '1s:/usr/src/linux/include:/usr/include:;10s:-ll:-lfl:' -i setkey/Makefile
+		sed -e "51s:ifdef:ifndef:;68d; 69d; 70d;" -i racoon/grabmyaddr.c
+		sed -e '461i\LIBS="$LIBS -lfl -lresolv"' -i racoon/configure.in
+		cd ${S}/libipsec && emake || die
+		cd ${S}/setkey && emake || die
+
+		cd ${S}/racoon
+		autoconf || die; econf || die; emake || die
+	fi
+
+	cd ${S}
+	emake KERNEL_INCLUDE="/usr/include" || die
+
+#	if [ "`use doc`" ]; then
+#		make html || die
+#	fi
+	make man || die
+
+}
+
+src_install() {
+
+	if [ -e ${ROOT}/usr/include/linux/pfkeyv2.h ]; then
+		mkdir -p ${D}/usr/sbin; mkdir -p ${D}/usr/share/man/man8
+		mkdir -p ${D}/usr/share/man/man5;
+		cd ${S}/racoon && einstall || die
+
+		into /usr
+		dobin ${S}/setkey/setkey
+	fi
+
+	cd ${S}
+	into /
+	dobin ping
+	use ipv6 && dobin ping6
+	dosbin arping
+	into /usr
+	dobin tracepath
+	use ipv6 && dobin trace{path,route}6
+	dosbin clockdiff rarpd rdisc ipg tftpd
+
+	fperms 4711 /bin/ping /usr/bin/tracepath
+
+	use ipv6 && fperms 4711 /bin/ping6 \
+		/usr/bin/trace{path,route}6
+
+	dodoc INSTALL RELNOTES
+
+	use ipv6 || rm doc/*6.8
+	doman doc/*.8
+
+#	if [ "`use doc`" ]; then
+#		dohtml doc/*.html
+#	fi
+
+}
diff --git a/net-misc/iputils/iputils-021109.ebuild b/net-misc/iputils/iputils-021109.ebuild
index 2ca6bc8fc313..d93191fe005d 100644
--- a/net-misc/iputils/iputils-021109.ebuild
+++ b/net-misc/iputils/iputils-021109.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-021109.ebuild,v 1.8 2004/01/13 02:41:52 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iputils/iputils-021109.ebuild,v 1.9 2004/01/13 11:03:11 solar Exp $
 
 DESCRIPTION="Network monitoring tools including ping and ping6"
 HOMEPAGE="ftp://ftp.inr.ac.ru/ip-routing"
@@ -8,12 +8,13 @@ SRC_URI="ftp://ftp.inr.ac.ru/ip-routing/${PN}-ss${PV}-try.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~alpha ppc ~hppa ~mips ~amd64 ~ia64 ppc64"
+KEYWORDS="~x86 ~sparc ~alpha ppc ~hppa ~mips ~amd64 ~ia64 ~ppc64"
 IUSE="static" #doc
 
 DEPEND="virtual/glibc
 	virtual/os-headers
-	dev-util/yacc"
+	!ppc64? ( dev-util/yacc )"
+#	not marked stable at all on ppc64?
 #	doc? ( app-text/openjade
 #		dev-perl/SGMLSpm
 #		app-text/docbook-sgml-dtd