commit: c3e15bc6bfa9b4d08ede38baa872135d04a74ae0 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Wed Jan 17 11:16:53 2018 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Wed Jan 17 11:16:53 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3e15bc6
net-analyzer/iftop: Old. Package-Manager: Portage-2.3.19, Repoman-2.3.6 .../iftop/files/iftop-1.0_pre4-pthread.patch | 46 ------------------ .../iftop/files/iftop-1.0_pre4-tinfo.patch | 55 ---------------------- net-analyzer/iftop/iftop-1.0_pre4.ebuild | 42 ----------------- 3 files changed, 143 deletions(-) diff --git a/net-analyzer/iftop/files/iftop-1.0_pre4-pthread.patch b/net-analyzer/iftop/files/iftop-1.0_pre4-pthread.patch deleted file mode 100644 index ce04c46a65e..00000000000 --- a/net-analyzer/iftop/files/iftop-1.0_pre4-pthread.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -383,39 +383,10 @@ - dnl libraries, etc. We use a test program to figure this stuff out. - dnl - --AC_MSG_CHECKING([POSIX threads compilation]) --thrfail=1 --oldCFLAGS=$CFLAGS --oldLIBS=$LIBS --for flag in "" -mt -pthread -thread ; do -- CFLAGS="$oldCFLAGS $flag" -- for lib in "" -lpthread "-lpthread -lposix4" ; do -- LIBS="$oldLIBS $lib" -- AC_LINK_IFELSE([AC_LANG_SOURCE([`cat config/pthread.c`])], [ -- foundthrlib=$lib -- foundthrflag=$flag -- thrfail=0 -- break -- ]) -- done -- if test $thrfail = 0 ; then -- break -- fi --done -- --if test $thrfail = 1 ; then -- AC_MSG_RESULT([no idea]) -- AC_MSG_ERROR([can't figure out how to compile with POSIX threads -- If your system actually supports POSIX threads, this means we've messed up.]) --fi -- --AC_MSG_RESULT([CFLAGS=$foundthrflag and LIBS=$foundthrlib]) --AC_MSG_CHECKING([POSIX threads usability]) --AC_RUN_IFELSE([AC_LANG_SOURCE([`cat config/pthread.c`])], -- [AC_MSG_RESULT([yes])], -- [AC_MSG_ERROR( -- [it fails. We probably guessed the wrong CFLAGS.])], -- [AC_MSG_RESULT([can't test because we are cross-compiling])]) -+AX_PTHREAD( -+ [LIBS="$PTHREAD_LIBS $LIBS" -+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"], -+ AC_MSG_ERROR([Could not find out how to enable POSIX threads])) - - dnl - dnl Are we on a system (like Solaris) that requires promiscuous mode in order to diff --git a/net-analyzer/iftop/files/iftop-1.0_pre4-tinfo.patch b/net-analyzer/iftop/files/iftop-1.0_pre4-tinfo.patch deleted file mode 100644 index bb14b3c6ca4..00000000000 --- a/net-analyzer/iftop/files/iftop-1.0_pre4-tinfo.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -25,7 +25,7 @@ iftop_SOURCES = addr_hash.c edline.c hash.c iftop.c ns_hash.c \ - # addrs_ioctl.c addrs_dlpi.c dlcommon.c \ - # stringmap.c cfgfile.c - -- -+iftop_LDADD = $(ncurses_LIBS) - - noinst_HEADERS = addr_hash.h ether.h ethertype.h extract.h hash.h iftop.h \ - integers.h ip.h llc.h ns_hash.h options.h resolver.h \ ---- a/configure.ac -+++ b/configure.ac -@@ -348,29 +348,27 @@ - dnl AC_SEARCH_LIBS.... - dnl - --AC_MSG_CHECKING([for a curses library containing mvchgat]) --oldLIBS=$LIBS --for curseslib in ncursesw curses ncurses ; do -- LIBS="$oldLIBS -l$curseslib" -- AC_TRY_LINK([ -+PKG_CHECK_MODULES([ncurses], [ncursesw], [foundcurseslib="$ncurses_LIBS"], [ -+ PKG_CHECK_MODULES([ncurses], [ncurses], [foundcurseslib="$ncurses_LIBS"], [ -+ AC_MSG_CHECKING([for a curses library containing mvchgat]) -+ oldLIBS=$LIBS -+ for curseslib in ncursesw curses ncurses ; do -+ LIBS="$oldLIBS -l$curseslib" -+ AC_TRY_LINK([ - #include <$curseslib.h> - ], [ - mvchgat(0, 0, 1, A_REVERSE, 0, NULL) - ], [ -- foundcurseslib=$curseslib -+ foundcurseslib=-l$curseslib - break - ]) --done -- --if test x$foundcurseslib = x ; then -- AC_MSG_RESULT([none found]) -+ done -+ ], - AC_MSG_ERROR([Curses! Foiled again! - (Can't find a curses library supporting mvchgat.) - Consider installing ncurses.]) --else -- AC_MSG_RESULT([-l$foundcurseslib]) --fi -- -+ ) -+]) - - dnl - dnl POSIX threads. Different systems like different combinations of flags, diff --git a/net-analyzer/iftop/iftop-1.0_pre4.ebuild b/net-analyzer/iftop/iftop-1.0_pre4.ebuild deleted file mode 100644 index 84f5ff4d23a..00000000000 --- a/net-analyzer/iftop/iftop-1.0_pre4.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools eutils - -DESCRIPTION="display bandwidth usage on an interface" -SRC_URI="http://www.ex-parrot.com/pdw/iftop/download/${P/_/}.tar.gz"; -HOMEPAGE="http://www.ex-parrot.com/pdw/iftop/"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="" - -RDEPEND=" - net-libs/libpcap - sys-libs/ncurses:0=" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -S="${WORKDIR}"/${P/_/} - -src_prepare() { - epatch "${FILESDIR}"/${P}-tinfo.patch - - # bug 490168 - cat "${FILESDIR}"/ax_pthread.m4 >> "${S}"/acinclude.m4 || die - epatch "${FILESDIR}"/${P}-pthread.patch - - eautoreconf -} - -src_install() { - dosbin iftop - doman iftop.8 - - dodoc AUTHORS ChangeLog README "${FILESDIR}"/iftoprc -}
