gentoo resync : 25.08.2020

3 files changed, 176 insertions, 6 deletions

diff --git a/net-analyzer/fragroute/Manifest b/net-analyzer/fragroute/Manifest
index 08c5a7b41701..c256bb6717c5 100644
--- a/net-analyzer/fragroute/Manifest
+++ b/net-analyzer/fragroute/Manifest
@@ -1,5 +1,6 @@
+AUX fragroute-1.2.6-libdir.patch 4634 BLAKE2B 71fa0052f4e9b15b8ba143fac4f2a1af8bac19dafc9ecae71056b62cf6090ea0182da0b8e7986eb90318cfd3e4e57e8ae9c3a7146dbfda1ed91595ccf14d9783 SHA512 9013a8d685a66b0c7bd051ea4a95ae45140cefc11db05a1b476c07ecdeb26e99e90bd74f19698c2e7e52d4126e0415b5c3427d8028d260860f40aa1e3f95d727
 AUX fragroute-1.2.6-pcap_open.patch 1171 BLAKE2B cdd664bea732c2abab0813526eba79a7dd7beef3c373a7f86414356d786f47b950561a74ed5bc9d404a7b39f63ab12c5b711835b056fccbda8583f8e7541c5ed SHA512 f60abf95fa5bd8798cf88f40d972311bbee4f877ee46cee1aa6e4438b5e4dd6c3b990b5e2565d24d1ce9c72d23f950ef13abd889d11a2f1bf6f34fb01957e7c6
 DIST fragroute-1.2.6-ipv6.tar.gz 163309 BLAKE2B c1927fdb6fbe6873b62fa48c5355b0b0d2be7b2183c94f259b8e0b4b3dec8a171defc4c6fbde507e522b28dffcc86dd68ae0ffe380a9d21eb478ebe7068d4beb SHA512 76c6fbe37100a43df477f0ba455a2bed6ac53c1f369e147d220562a34eca0eb273171e4b9ff4f3fc473c3f99a8344f6d49963c20d7cfaf6879200322a491ffc3
 EBUILD fragroute-1.2.6-r1.ebuild 1037 BLAKE2B 81e3443bdd270b36cbf94e88412cd3220befc5faf843bf1619e3ba2f8fca3a5eadaf5cf40983e265bb214c12fb7af9bc2e59780f26bb5992f4dbdbf38514b687 SHA512 49b02420969d14fcba01898ac514f8fe2342a0cb9eae0e74eb3f685930d9bd7802200c3d9c4b9f62061ab1422018a8b93a45ef0819547fd092c5f134b26ce534
-EBUILD fragroute-1.2.6-r2.ebuild 1040 BLAKE2B 7a4260437f050d4f501a31d95544625076a49c6919ae856c04924a8a91647504876d6eb316442755dc0d1a8f859dc2dc448277bcf03b583dd122060d1da2391e SHA512 d95b688b5e782cf9d9ac3978424c9bb807fa252226385039f2fe0478201c63f878d8d3c202e49ac9235905246450d039ef0899e045d9f63d4247adf4e601b011
+EBUILD fragroute-1.2.6-r3.ebuild 1084 BLAKE2B b8474ef0ce515758463ad4b7bfaea6f1834c201ea17273fc9f86bc5698cbe729a32d64cb6902d44b293d7c3c210f6772d49ab7fbaee27dddf19423189c08c8aa SHA512 ed76c00c900f281715fa38ed7d254e290b7cade2f152ab007faa76f99be4d53cdf86f1242cdcc14efb06ed13211c1e64cc8d6a5b591ac8c263615f8c76d72ceb
 MISC metadata.xml 364 BLAKE2B 6f99923afef64e689bb2169801086f433f54879999551e8ac7e74f3c49ae10b2381041e626a024efe57b167a9394219b3ff3f313b049b2d40ba5404134b766c1 SHA512 3b38ee5be21d5a6957e39fea01461187f01f5b34a0538df8b6f6c217e0832a5d6cb5dbd9b6508cb5a977618dd9f8ffb0d0feefb0ec6c050efcfb4fa68a00ed78
diff --git a/net-analyzer/fragroute/files/fragroute-1.2.6-libdir.patch b/net-analyzer/fragroute/files/fragroute-1.2.6-libdir.patch
new file mode 100644
index 000000000000..69fa067859aa
--- /dev/null
+++ b/net-analyzer/fragroute/files/fragroute-1.2.6-libdir.patch
@@ -0,0 +1,160 @@
+--- a/configure.in
++++ b/configure.in
+@@ -22,157 +22,12 @@
+ AC_PROG_LN_S
+ AC_PROG_RANLIB
+ 
+-dnl XXX - we need MingW32 under Cygwin for win32
+-AC_CYGWIN
+-if test "$CYGWIN" = yes ; then
+-   if test -d /usr/include/mingw; then
+-      CPPFLAGS="$CPPFLAGS -mno-cygwin"
+-      CFLAGS="$CFLAGS -mno-cygwin"
+-      AC_DEFINE(WIN32_LEAN_AND_MEAN, 1, 
+-          [Define for faster code generation.])
+-      AC_DEFINE(snprintf, _snprintf, [Use MingW32's internal snprintf])
+-      AC_DEFINE(vsnprintf, _vsnprintf, [Use MingW32's internal vsnprintf])
+-   else
+-      AC_MSG_ERROR([need MingW32 package to build under Cygwin])
+-   fi
+-   dnl XXX - use our internal event-win32 hack
+-   EVENTINC="-I${srcdir}/win32"
+-   AC_LIBOBJ([event-win32])
+-   AC_SUBST(EVENTINC)
+-
+-else
+-dnl XXX - BEGIN !CYGWIN
+-
+-
+-dnl Checks for libevent
+-AC_MSG_CHECKING(for libevent)
+-AC_ARG_WITH(libevent,
+-[  --with-libevent=DIR     use libevent in DIR],
+-[ case "$withval" in
+-  yes|no)
+-     AC_MSG_RESULT(no)
+-     ;;
+-  *)
+-     AC_MSG_RESULT($withval)
+-     if test -f $withval/include/event.h -a -f $withval/lib/libevent.so; then
+-        owd=`pwd`
+-        if cd $withval; then withval=`pwd`; cd $owd; fi
+-        EVENTINC="-I$withval/include"
+-        EVENTLIB="-L$withval/lib -levent"
+-     elif test -f $withval/include/event.h -a -f $withval/lib64/libevent.so; then
+-        owd=`pwd`
+-        if cd $withval; then withval=`pwd`; cd $owd; fi
+-        EVENTINC="-I$withval/include"
+-        EVENTLIB="-L$withval/lib64 -levent"
+-     elif test -f $withval/event.h -a -f $withval/libevent.so; then
+-        owd=`pwd`
+-        if cd $withval; then withval=`pwd`; cd $owd; fi
+-        EVENTINC="-I$withval"
+-        EVENTLIB="-L$withval -levent"
+-     else
+-        AC_ERROR(event.h or libevent.so not found in $withval)
+-     fi
+-     ;;
+-  esac ],
+-[ if test -f ${prefix}/include/event.h -a -f ${prefix}/lib/libevent.so; then
+-     EVENTINC="-I${prefix}/include"
+-     EVENTLIB="-L${prefix}/lib -levent"
+-  elif test -f ${prefix}/include/event.h -a -f ${prefix}/lib64/libevent.so; then
+-     EVENTINC="-I${prefix}/include"
+-     EVENTLIB="-L${prefix}/lib64 -levent"
+-  else
+-     AC_MSG_RESULT(no)
+-     AC_ERROR(libevent not found)
+-  fi
+-  AC_MSG_RESULT(yes) ]
+-)
+ AC_SUBST(EVENTINC)
+ AC_SUBST(EVENTLIB)
+ 
+-dnl XXX - END !CYGWIN
+-fi
+-
+-dnl Checks for libpcap
+-AC_MSG_CHECKING(for libpcap)
+-AC_ARG_WITH(libpcap,
+-[  --with-libpcap=DIR      use libpcap in DIR],
+-[ case "$withval" in
+-  yes|no)
+-     AC_MSG_RESULT(no)
+-     ;;
+-  *)
+-     AC_MSG_RESULT($withval)
+-     if test -f $withval/pcap.h -a -f $withval/libpcap.so; then
+-        owd=`pwd`
+-        if cd $withval; then withval=`pwd`; cd $owd; fi
+-	PCAPINC="-I$withval -I$withval/bpf"
+-	PCAPLIB="-L$withval -lpcap"
+-     elif test -f $withval/include/pcap.h -a \
+-	       -f $withval/include/pcap-bpf.h; then
+-	owd=`pwd`
+-	if cd $withval; then withval=`pwd`; cd $owd; fi
+-	PCAPINC="-I$withval/include"
+-	if test -f $withval/lib/libwpcap.a; then
+-	   PCAPLIB="-L$withval/lib -lwpcap"
+-	else
+-	   PCAPLIB="-L$withval/lib -lpcap"
+-        fi
+-     else
+-        AC_ERROR(pcap.h, pcap-bpf.h, or libpcap.so not found in $withval)
+-     fi
+-     ;;
+-  esac ],
+-[ if test -f ${prefix}/include/pcap.h; then
+-     PCAPINC="-I${prefix}/include"
+-     if test -f ${prefix}/lib/libwpcap.a; then
+-	PCAPLIB="-L${prefix}/lib -lwpcap"
+-     else
+-        PCAPLIB="-L${prefix}/lib -lpcap"
+-     fi
+-  elif test -f /usr/include/pcap/pcap.h; then
+-     PCAPINC="-I/usr/include/pcap"
+-     PCAPLIB="-lpcap"
+-  elif test -f /usr/include/pcap.h; then
+-     PCAPLIB="-lpcap"
+-  else
+-     AC_MSG_RESULT(no)
+-     AC_ERROR(libpcap not found)
+-  fi
+-  AC_MSG_RESULT(yes) ]
+-)
+ AC_SUBST(PCAPINC)
+ AC_SUBST(PCAPLIB)
+ 
+-dnl Checks for (installed) libdnet
+-AC_MSG_CHECKING(for libdnet)
+-AC_ARG_WITH(libdnet,
+-[  --with-libdnet=DIR      use libdnet in DIR],
+-[ case "$withval" in
+-  yes|no)
+-     AC_MSG_RESULT(no)
+-     ;;
+-  *)
+-     AC_MSG_RESULT($withval)
+-     if test -f $withval/src/libdnet.so; then
+-	DNETINC="-I$withval/include"
+-	DNETLIB="-L$withval/src -ldnet `$withval/dnet-config --libs`"
+-     elif test -x $withval/bin/dnet-config; then
+-	DNETINC="`$withval/bin/dnet-config --cflags`"
+-	DNETLIB="`$withval/bin/dnet-config --libs`"
+-     else
+-        AC_ERROR(dnet-config not found in $withval/bin)
+-     fi
+-     ;;
+-  esac ],
+-[ if test -x ${prefix}/bin/dnet-config; then
+-     DNETINC="`${prefix}/bin/dnet-config --cflags`"
+-     DNETLIB="`${prefix}/bin/dnet-config --libs`"
+-  else
+-     AC_MSG_RESULT(no)
+-     AC_ERROR(libdnet not found)
+-  fi
+-  AC_MSG_RESULT(yes) ]
+-)
+ AC_SUBST(DNETINC)
+ AC_SUBST(DNETLIB)
+ 
diff --git a/net-analyzer/fragroute/fragroute-1.2.6-r2.ebuild b/net-analyzer/fragroute/fragroute-1.2.6-r3.ebuild
index 1043d0fd9879..60b3c08bfca8 100644
--- a/net-analyzer/fragroute/fragroute-1.2.6-r2.ebuild
+++ b/net-analyzer/fragroute/fragroute-1.2.6-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,32 +16,41 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="
+	>=dev-libs/libdnet-1.12[ipv6]
 	dev-libs/libevent:=
 	net-libs/libpcap
-	>=dev-libs/libdnet-1.12[ipv6]
 "
 DEPEND="
 	${RDEPEND}
+"
+BDEPEND="
 	virtual/awk
 "
 DOCS=( INSTALL README TODO )
 PATCHES=(
+	"${FILESDIR}"/${P}-libdir.patch
 	"${FILESDIR}"/${P}-pcap_open.patch
 )
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	default
+
 	# Remove broken and old files, autotools will regen needed files
 	rm *.m4 acconfig.h missing Makefile.in || die
+
 	# Add missing includes
 	sed -i -e "/#define IPUTIL_H/a#include <stdio.h>\n#include <stdint.h>" iputil.h || die
+
 	eautoreconf
 }
 
 src_configure() {
 	econf \
-		--with-libdnet="${EPREFIX}"/usr \
-		--with-libevent="${EPREFIX}"/usr \
-		--with-libpcap="${EPREFIX}"/usr
+		DNETINC='' \
+		DNETLIB=-ldnet \
+		EVENTINC='' \
+		EVENTLIB=-levent \
+		PCAPINC='' \
+		PCAPLIB=-lpcap
 }