commit: a14f74fb4da41d0c6ac8ff511a33b3209fb56fd1 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Sat Aug 24 10:10:50 2019 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Sat Aug 24 10:11:32 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a14f74fb
net-libs/libpcap: pcap-config: Do not hardcode includedir Package-Manager: Portage-2.3.72, Repoman-2.3.17 Bug: https://bugs.gentoo.org/692772 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> .../libpcap-1.9.0-pcap-config-includedir.patch | 36 ++++++++++++++++++++++ ...libpcap-9999.ebuild => libpcap-1.9.0-r1.ebuild} | 27 ++++++++++------ net-libs/libpcap/libpcap-9999.ebuild | 1 + 3 files changed, 55 insertions(+), 9 deletions(-) diff --git a/net-libs/libpcap/files/libpcap-1.9.0-pcap-config-includedir.patch b/net-libs/libpcap/files/libpcap-1.9.0-pcap-config-includedir.patch new file mode 100644 index 00000000000..cd2c9fe61f2 --- /dev/null +++ b/net-libs/libpcap/files/libpcap-1.9.0-pcap-config-includedir.patch @@ -0,0 +1,36 @@ +--- a/pcap-config.in ++++ b/pcap-config.in +@@ -59,13 +59,13 @@ + # + if [ "$show_cflags" = 1 -a "$show_libs" = 1 ] + then +- echo "-I$includedir -L$libdir -lpcap $LIBS" ++ echo "-L$libdir -lpcap $LIBS" + elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ] + then +- echo "-I$includedir -L$libdir $LIBS" ++ echo "-L$libdir $LIBS" + elif [ "$show_cflags" = 1 ] + then +- echo "-I$includedir" ++ echo "" + elif [ "$show_libs" = 1 ] + then + echo "-L$libdir -lpcap $LIBS" +@@ -80,13 +80,13 @@ + # + if [ "$show_cflags" = 1 -a "$show_libs" = 1 ] + then +- echo "-I$includedir -L$libdir $RPATH -l$PACKAGE_NAME" ++ echo "-L$libdir $RPATH -l$PACKAGE_NAME" + elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ] + then +- echo "-I$includedir" ++ echo "" + elif [ "$show_cflags" = 1 ] + then +- echo "-I$includedir" ++ echo "" + elif [ "$show_libs" = 1 ] + then + echo "-L$libdir $RPATH -l$PACKAGE_NAME" diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-1.9.0-r1.ebuild similarity index 61% copy from net-libs/libpcap/libpcap-9999.ebuild copy to net-libs/libpcap/libpcap-1.9.0-r1.ebuild index 35c308e5a2b..4d5a0121e31 100644 --- a/net-libs/libpcap/libpcap-9999.ebuild +++ b/net-libs/libpcap/libpcap-1.9.0-r1.ebuild @@ -2,25 +2,26 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit autotools git-r3 multilib-minimal ltprune +inherit autotools multilib-minimal ltprune DESCRIPTION="A system-independent library for user-level network packet capture" -EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap"; HOMEPAGE=" http://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" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="bluetooth dbus netlink static-libs usb" -KEYWORDS="" RDEPEND=" bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] ) dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] ) - usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] ) " DEPEND=" ${RDEPEND} @@ -29,13 +30,20 @@ DEPEND=" dbus? ( virtual/pkgconfig[${MULTILIB_USEDEP}] ) " +S=${WORKDIR}/${PN}-${P/_} + PATCHES=( - "${FILESDIR}"/${PN}-9999-prefix-darwin.patch + "${FILESDIR}"/${PN}-1.6.1-prefix-solaris.patch + "${FILESDIR}"/${PN}-1.8.1-darwin.patch + "${FILESDIR}"/${PN}-1.8.1-usbmon.patch + "${FILESDIR}"/${PN}-1.9.0-pcap-config-includedir.patch ) src_prepare() { default + echo ${PV} > VERSION || die + eautoreconf } @@ -43,9 +51,10 @@ multilib_src_configure() { ECONF_SOURCE="${S}" \ econf \ $(use_enable bluetooth) \ - $(use_enable dbus) \ $(use_enable usb) \ - $(use_with netlink libnl) + $(use_enable dbus) \ + $(use_with netlink libnl) \ + --enable-ipv6 } multilib_src_compile() { @@ -53,7 +62,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 35c308e5a2b..3e6c9db1d11 100644 --- a/net-libs/libpcap/libpcap-9999.ebuild +++ b/net-libs/libpcap/libpcap-9999.ebuild @@ -30,6 +30,7 @@ DEPEND=" " PATCHES=( + "${FILESDIR}"/${PN}-1.9.0-pcap-config-includedir.patch "${FILESDIR}"/${PN}-9999-prefix-darwin.patch )
