[gentoo-commits] repo/gentoo:master commit in: net-libs/libpcap/

[Jeroen Roovers]

commit:     b153f9e565097857c853c3e0c628ee41a5f7e8d0
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 19 20:43:06 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Jan 19 20:47:38 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b153f9e5

net-libs/libpcap: Add USE=rdma

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 ...libpcap-9999.ebuild => libpcap-1.9.1-r3.ebuild} | 22 +++++++++++++++-------
 net-libs/libpcap/libpcap-9999.ebuild               |  4 +++-
 net-libs/libpcap/metadata.xml                      |  1 +
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-1.9.1-r3.ebuild
similarity index 70%
copy from net-libs/libpcap/libpcap-9999.ebuild
copy to net-libs/libpcap/libpcap-1.9.1-r3.ebuild
index a6571d9395c..71cfe9d377e 100644
--- a/net-libs/libpcap/libpcap-9999.ebuild
+++ b/net-libs/libpcap/libpcap-1.9.1-r3.ebuild
@@ -2,24 +2,27 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools git-r3 multilib-minimal
+inherit autotools multilib-minimal
 
 DESCRIPTION="A system-independent library for user-level network packet capture"
-EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap"
 HOMEPAGE="
 	https://www.tcpdump.org/
-	${EGIT_REPO_URI}
+	https://github.com/the-tcpdump-group/libpcap
+"
+SRC_URI="
+	https://github.com/the-tcpdump-group/${PN}/archive/${P/_}.tar.gz
 "
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="bluetooth dbus netlink -remote static-libs usb -yydebug"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="bluetooth dbus netlink rdma -remote static-libs usb -yydebug"
 
 RDEPEND="
 	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
 	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
+	rdma? ( sys-cluster/rdma-core )
 	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
 "
 DEPEND="
@@ -29,14 +32,18 @@ DEPEND="
 	dbus? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
 "
 
+S=${WORKDIR}/${PN}-${P/_}
+
 PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.1-usbmon.patch
 	"${FILESDIR}"/${PN}-1.9.1-pcap-config.patch
-	"${FILESDIR}"/${PN}-9999-prefix-darwin.patch
 )
 
 src_prepare() {
 	default
 
+	echo ${PV} > VERSION || die
+
 	eautoreconf
 }
 
@@ -45,6 +52,7 @@ multilib_src_configure() {
 	econf \
 		$(use_enable bluetooth) \
 		$(use_enable dbus) \
+		$(use_enable rdma) \
 		$(use_enable remote) \
 		$(use_enable usb) \
 		$(use_enable yydebug) \
@@ -57,7 +65,7 @@ multilib_src_compile() {
 }
 
 multilib_src_install_all() {
-	dodoc CREDITS CHANGES VERSION TODO README*
+	dodoc CREDITS CHANGES VERSION TODO README.* doc/README.*
 
 	# remove static libraries (--disable-static does not work)
 	if ! use static-libs; then

diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild
index a6571d9395c..b8aa2691022 100644
--- a/net-libs/libpcap/libpcap-9999.ebuild
+++ b/net-libs/libpcap/libpcap-9999.ebuild
@@ -13,13 +13,14 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="bluetooth dbus netlink -remote static-libs usb -yydebug"
+IUSE="bluetooth dbus netlink rdma -remote static-libs usb -yydebug"
 KEYWORDS=""
 
 RDEPEND="
 	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
 	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
+	rdma? ( sys-cluster/rdma-core )
 	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
 "
 DEPEND="
@@ -45,6 +46,7 @@ multilib_src_configure() {
 	econf \
 		$(use_enable bluetooth) \
 		$(use_enable dbus) \
+		$(use_enable rdma) \
 		$(use_enable remote) \
 		$(use_enable usb) \
 		$(use_enable yydebug) \

diff --git a/net-libs/libpcap/metadata.xml b/net-libs/libpcap/metadata.xml
index 6fb2c6c97ae..9c9e8fcf34e 100644
--- a/net-libs/libpcap/metadata.xml
+++ b/net-libs/libpcap/metadata.xml
@@ -7,6 +7,7 @@
 </maintainer>
 <use>
 <flag name="netlink">Use <pkg>dev-libs/libnl</pkg> to put wireless interfaces in monitor mode.</flag>
+<flag name="rdma">Enable RDMA capture support using <pkg>sys-cluster/rdma-core</pkg></flag>
 <flag name="remote">Enable remote packet capture which may expose libpcap-based applications to attacks by malicious remote capture servers!</flag>
 <flag name="yydebug">Enable parser debugging code</flag>
 </use>