commit: 0cfa6146a1621e772c3dbbc1a5be2573fb424518 Author: Michael Weber <xmw <AT> gentoo <DOT> org> AuthorDate: Mon Nov 21 16:11:29 2016 +0000 Commit: Michael Weber <xmw <AT> gentoo <DOT> org> CommitDate: Mon Nov 21 16:11:29 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cfa6146
net-dns/dnstop: fix net-libs/libpcap[ipv6] situation, drop USE=ipv6, use pkg-config for ncurses[tinfo] (thanks lorem_ipsum and b4b1 <AT> free.fr, bug 595184). Package-Manager: portage-2.2.28 ...0140915-r1.ebuild => dnstop-20140915-r2.ebuild} | 19 +++++++------- .../dnstop/files/dnstop-20140915-pkg-config.patch | 29 ++++++++++++++++++++++ 2 files changed, 38 insertions(+), 10 deletions(-) diff --git a/net-dns/dnstop/dnstop-20140915-r1.ebuild b/net-dns/dnstop/dnstop-20140915-r2.ebuild similarity index 71% rename from net-dns/dnstop/dnstop-20140915-r1.ebuild rename to net-dns/dnstop/dnstop-20140915-r2.ebuild index cb7eeef..ba7c1cc 100644 --- a/net-dns/dnstop/dnstop-20140915-r1.ebuild +++ b/net-dns/dnstop/dnstop-20140915-r2.ebuild @@ -2,9 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 -inherit eutils flag-o-matic +inherit autotools DESCRIPTION="Displays various tables of DNS traffic on your network" HOMEPAGE="http://dnstop.measurement-factory.com/"; @@ -13,22 +13,21 @@ SRC_URI="http://dnstop.measurement-factory.com/src/${P}.tar.gz"; LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86" -IUSE="ipv6" +IUSE="" RDEPEND="sys-libs/ncurses:0 - net-libs/libpcap[ipv6?]" + net-libs/libpcap[ipv6(+)]" DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}/${P}"-pkg-config.patch ) + src_prepare() { - epatch_user + default + eautoreconf } src_configure() { - if has_version sys-libs/ncurses:0[tinfo] ; then - append-libs -ltinfo #bug 595068 - fi - econf \ - $(use_enable ipv6) + econf --enable-ipv6 } src_install() { diff --git a/net-dns/dnstop/files/dnstop-20140915-pkg-config.patch b/net-dns/dnstop/files/dnstop-20140915-pkg-config.patch new file mode 100644 index 00000000..5ee18e0 --- /dev/null +++ b/net-dns/dnstop/files/dnstop-20140915-pkg-config.patch @@ -0,0 +1,29 @@ +diff -Naur dnstop-20140915-orig/configure.ac dnstop-20140915/configure.ac +--- dnstop-20140915-orig/configure.ac 2016-09-25 19:36:25.222387686 +0100 ++++ dnstop-20140915/configure.ac 2016-09-25 19:32:01.489612302 +0100 +@@ -11,10 +11,7 @@ + AC_PROG_INSTALL + + # Checks for libraries. +-AC_CHECK_LIB([ncurses], [initscr]) +-if test "$ac_cv_lib_ncurses_initscr" != "yes" ; then +-AC_CHECK_LIB([curses], [initscr]) +-fi ++PKG_CHECK_MODULES([ncurses], [ncurses]) + AC_CHECK_LIB([pcap], [pcap_open_live]) + AC_CHECK_LIB([socket], [main]) + AC_CHECK_LIB([nsl], [main]) +diff -Naur dnstop-20140915-orig/Makefile.in dnstop-20140915/Makefile.in +--- dnstop-20140915-orig/Makefile.in 2016-09-25 19:36:25.221387679 +0100 ++++ dnstop-20140915/Makefile.in 2016-09-25 19:37:39.333887436 +0100 +@@ -2,8 +2,8 @@ + + OPTFLAGS=@OPTFLAGS@ + CC=@CC@ +-CFLAGS=@CFLAGS@ ${OPTFLAGS} +-LIBS=@LIBS@ ++CFLAGS=@CFLAGS@ @ncurses_CFLAGS@ ${OPTFLAGS} ++LIBS=@LIBS@ @ncurses_LIBS@ + LDFLAGS=@LDFLAGS@ + + prefix=@prefix@
