[gentoo-commits] repo/gentoo:master commit in: app-admin/apachetop/files/, app-admin/apachetop/

[Lars Wendler]

commit:     bfa7530a061f809397f193f22d8f823dd93bac51
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  4 17:15:56 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Sep  4 17:15:56 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfa7530a

app-admin/apachetop: Removed old

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 app-admin/apachetop/Manifest                       |   3 -
 app-admin/apachetop/apachetop-0.12.6-r2.ebuild     |  44 ------
 app-admin/apachetop/apachetop-0.17.4.ebuild        |  36 -----
 app-admin/apachetop/apachetop-0.18.4.ebuild        |  38 -----
 .../files/apachetop-0.12.6-ac_config_header.patch  |  12 --
 .../files/apachetop-0.12.6-configure.patch         | 101 -------------
 .../apachetop/files/apachetop-0.12.6-gcc41.patch   |  13 --
 .../files/apachetop-0.12.6-maxpathlen.patch        |  39 -----
 .../apachetop/files/apachetop-0.12.6-ncurses.patch | 166 ---------------------
 .../apachetop/files/apachetop-0.18.4-tinfo.patch   |  11 --
 10 files changed, 463 deletions(-)

diff --git a/app-admin/apachetop/Manifest b/app-admin/apachetop/Manifest
index 51160b4eeaf..3b37485c6fe 100644
--- a/app-admin/apachetop/Manifest
+++ b/app-admin/apachetop/Manifest
@@ -1,4 +1 @@
-DIST apachetop-0.12.6.tar.gz 126930 BLAKE2B 06d12cc72791920c959fa4ef8e18aa90f1f29a616389329685abf445f416cde9ce6edd2db5aaadaba51488033148e8109245200086a11422436ffe0aab1b4a40 SHA512 35081772f817c6a83a1fcf78790d2a288a9e4e48234c4b3163a09ad15f49a78d649b77f41aa002940fb9416c263cea159c5092a9b87285488eb450964c823c3a
-DIST apachetop-0.17.4.tar.gz 128153 BLAKE2B 7601ce98618d041f6fc67e528775ce79b63a726b765ff298d1d74a1dd22a4451be6c36669c7ab9bf82fb8c120a6930d2bbf03823de02a216c558c358c53c07be SHA512 b5115048f79c694344fd341631fe7739567ba3ce6e18514d0be250cb6f42e04c54d35cc023dea5258725fcbfbb6debdaa51b91d64ae3120e70f5b78a7989a330
-DIST apachetop-0.18.4.tar.gz 128849 BLAKE2B 912f060984da326b2e005cc0e3eb99c28182bc6a0930e6781d5a0a990dbbe56b5dbfe871baea1c86a5ac2bc02faa1e583ca104d3c8bd00cc3617599601b2d8bd SHA512 e32f94ab6223578aa5b8c11083de762e8f916ba6d057d93f99208333632a8362b421c41fff76bf60a52f0b377a70d69c17ed02abfb95f86474ad3719016e59f7
 DIST apachetop-0.19.7.tar.gz 132665 BLAKE2B 248247c361d1585de68a0a9adae22f98db72991babfb4a75f01fa67ef28443a3c04cf1da9c1ea34ed923599955b58959528cc9e0a881fbb7b463b1d64c0cb7bd SHA512 40d546facee23a9914483c06323940e219602518751d80f729d835c4dbf991c7d1dd9bcebcaa4ca6a2d64799d48c8a00d421bc324afc2959691c962113386969

diff --git a/app-admin/apachetop/apachetop-0.12.6-r2.ebuild b/app-admin/apachetop/apachetop-0.12.6-r2.ebuild
deleted file mode 100644
index 00e66ae0691..00000000000
--- a/app-admin/apachetop/apachetop-0.12.6-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A realtime Apache log analyzer"
-HOMEPAGE="https://github.com/tessus/apachetop"
-SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ~mips ppc sparc x86"
-IUSE="fam pcre"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	fam? ( virtual/fam )
-	pcre? ( dev-libs/libpcre )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc41.patch
-	"${FILESDIR}"/${P}-configure.patch
-	"${FILESDIR}"/${P}-maxpathlen.patch
-	"${FILESDIR}"/${P}-ac_config_header.patch
-	"${FILESDIR}"/${P}-ncurses.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-logfile="${EPREFIX}"/var/log/apache2/access_log \
-		--without-adns \
-		$(use_with fam) \
-		$(use_with pcre)
-}

diff --git a/app-admin/apachetop/apachetop-0.17.4.ebuild b/app-admin/apachetop/apachetop-0.17.4.ebuild
deleted file mode 100644
index 2f5954eb82b..00000000000
--- a/app-admin/apachetop/apachetop-0.17.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A realtime Apache log analyzer"
-HOMEPAGE="https://github.com/tessus/apachetop"
-SRC_URI="https://github.com/tessus/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
-IUSE="fam pcre"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	fam? ( virtual/fam )
-	pcre? ( dev-libs/libpcre )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-logfile="${EPREFIX}"/var/log/apache2/access_log \
-		--without-adns \
-		$(use_with fam) \
-		$(use_with pcre)
-}

diff --git a/app-admin/apachetop/apachetop-0.18.4.ebuild b/app-admin/apachetop/apachetop-0.18.4.ebuild
deleted file mode 100644
index c0a18315d1d..00000000000
--- a/app-admin/apachetop/apachetop-0.18.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A realtime Apache log analyzer"
-HOMEPAGE="https://github.com/tessus/apachetop"
-SRC_URI="https://github.com/tessus/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
-IUSE="fam pcre"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	fam? ( virtual/fam )
-	pcre? ( dev-libs/libpcre )"
-DEPEND="${RDEPEND}"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.18.4-tinfo.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-logfile="${EPREFIX}"/var/log/apache2/access_log \
-		--without-adns \
-		$(use_with fam) \
-		$(use_with pcre)
-}

diff --git a/app-admin/apachetop/files/apachetop-0.12.6-ac_config_header.patch b/app-admin/apachetop/files/apachetop-0.12.6-ac_config_header.patch
deleted file mode 100644
index aabdb13d75f..00000000000
--- a/app-admin/apachetop/files/apachetop-0.12.6-ac_config_header.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr apachetop-0.12.6.orig/configure.ac apachetop-0.12.6/configure.ac
---- apachetop-0.12.6.orig/configure.ac	2013-07-09 14:06:14.000000000 -0400
-+++ apachetop-0.12.6/configure.ac	2013-07-09 14:07:36.000000000 -0400
-@@ -6,7 +6,7 @@
- AC_CONFIG_AUX_DIR(config)
- #AC_CONFIG_MACRO_DIR(m4) # 2.58
- 
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADER(config.h)
- AM_INIT_AUTOMAKE(apachetop, 0.12.6) # 2.53 only?
- 
- # Add non-standard directories to the include path

diff --git a/app-admin/apachetop/files/apachetop-0.12.6-configure.patch b/app-admin/apachetop/files/apachetop-0.12.6-configure.patch
deleted file mode 100644
index 38a1fc7f6a1..00000000000
--- a/app-admin/apachetop/files/apachetop-0.12.6-configure.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-Index: apachetop-0.12.6/configure.ac
-===================================================================
---- apachetop-0.12.6.orig/configure.ac
-+++ apachetop-0.12.6/configure.ac
-@@ -52,48 +52,60 @@ AC_FUNC_VPRINTF
- AC_CHECK_FUNCS([inet_aton memset strchr strdup kqueue strerror strstr])
- 
- # pcre {{{
--AC_ARG_WITH(pcre,
--	[  --with-pcre=<path>      prefix of pcre installation (eg /usr/local)],
--	[
--		CPPFLAGS="$CPPFLAGS -I $withval/include"
--		LDFLAGS="$LDFLAGS -L $withval/lib"
--	]
--)
--
--AC_CHECK_HEADERS(pcre.h,
--	AC_SEARCH_LIBS([pcre_compile], [pcre]) ,
--	AC_MSG_WARN([*** pcre.h not found -- consider using --with-pcre])
--)
-+AC_ARG_WITH([pcre],
-+			[  --with-pcre=<path>      prefix of pcre installation (eg /usr/local)],
-+			[case "${withval}" in
-+			  yes) with_pcre="/usr";;
-+			  no)  with_pcre="no";;
-+			  *)   with_pcre="/usr";;
-+			 esac],
-+			 [with_pcre="/usr"])
-+
-+if test x$with_pcre != xno; then
-+	CPPFLAGS="$CPPFLAGS -I $withval/include"
-+	LDFLAGS="$LDFLAGS -L $withval/lib"
-+	AC_CHECK_HEADERS(pcre.h,
-+					 AC_SEARCH_LIBS([pcre_compile], [pcre]),
-+					 AC_MSG_WARN([*** pcre.h not found -- consider using --with-pcre]))
-+fi
- # }}}
- 
- # fam {{{
--AC_ARG_WITH(fam,
--	[  --with-fam=<path>      prefix of fam installation (eg /usr/local)],
--	[
--		CPPFLAGS="$CPPFLAGS -I $withval/include"
--		LDFLAGS="$LDFLAGS -L $withval/lib"
--	]
--)
--
--AC_CHECK_HEADERS(fam.h,
--	AC_SEARCH_LIBS([FAMOpen], [fam]) ,
--	AC_MSG_WARN([*** fam.h not found -- consider using --with-fam])
--)
-+AC_ARG_WITH([fam],
-+			[  --with-fam=<path>      prefix of fam installation (eg /usr/local)],
-+			[case "${withval}" in
-+			  yes) with_fam="/usr";;
-+			  no)  with_fam="no";;
-+			  *)   with_fam="/usr";;
-+			 esac],
-+			 [with_fam="/usr"])
-+
-+if test x$with_fam != xno; then
-+	CPPFLAGS="$CPPFLAGS -I $with_fam/include"
-+	LDFLAGS="$LDFLAGS -L $with_fam/lib"
-+	AC_CHECK_HEADERS(fam.h,
-+					 AC_SEARCH_LIBS([FAMOpen], [fam]),
-+					 AC_MSG_WARN([*** fam.h not found -- consider using --with-fam]))
-+fi
- # }}}
- 
- # adns {{{
--AC_ARG_WITH(adns,
--	[  --with-adns=<path>     prefix of adns installation (eg /usr/local)],
--	[
--		CPPFLAGS="$CPPFLAGS -I $withval/include"
--		LDFLAGS="$LDFLAGS -L $withval/lib"
--	]
--)
--
--AC_CHECK_HEADERS(adns.h,
--	AC_SEARCH_LIBS([adns_submit], [adns]) ,
--	AC_MSG_WARN([*** adns.h not found -- consider using --with-adns])
--)
-+AC_ARG_WITH([adns],
-+			[  --with-adns=<path>     prefix of adns installation (eg /usr/local)],
-+			[case "${withval}" in
-+			  yes) with_adns="/usr";;
-+			  no)  with_adns="no";;
-+			  *)   with_adns="/usr";;
-+			 esac],
-+			 [with_adns="/usr"])
-+
-+if test x$with_adns != xno; then
-+	CPPFLAGS="$CPPFLAGS -I $with_adns/include"
-+	LDFLAGS="$LDFLAGS -L $with_adns/lib"
-+	AC_CHECK_HEADERS(adns.h,
-+					 AC_SEARCH_LIBS([adns_submit], [adns]),
-+					 AC_MSG_WARN([*** adns.h not found -- consider using --with-adns]))
-+fi
- # }}}
- 
- # --with-logfile {{{

diff --git a/app-admin/apachetop/files/apachetop-0.12.6-gcc41.patch b/app-admin/apachetop/files/apachetop-0.12.6-gcc41.patch
deleted file mode 100644
index 6bfb49d9f9d..00000000000
--- a/app-admin/apachetop/files/apachetop-0.12.6-gcc41.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/resolver.h
-+++ b/src/resolver.h
-@@ -10,8 +10,8 @@
- class Resolver
- {
- 	public:
--	Resolver::Resolver(void);
--	Resolver::~Resolver(void);
-+	Resolver(void);
-+	~Resolver(void);
- 	int add_request(char *request, enum resolver_action act);
- 
- 

diff --git a/app-admin/apachetop/files/apachetop-0.12.6-maxpathlen.patch b/app-admin/apachetop/files/apachetop-0.12.6-maxpathlen.patch
deleted file mode 100644
index b648b07cbfc..00000000000
--- a/app-admin/apachetop/files/apachetop-0.12.6-maxpathlen.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Patch by Robert Scheck <robert@×××××××××××××.org> for apachetop <= 0.12.6, which
-adds some includes in order to have a real change to get MAXPATHLEN defined with
-a valid value. Once MAXPATHLEN really gets filled with 128, it will just cause a
-buffer overflow.
-
-See Red Hat Bugzilla #446199 (https://bugzilla.redhat.com/show_bug.cgi?id=446199)
-for more information. This patch should solve the mentioned bug report and should
-be sane enough to get included by upstream of apachetop for the next release. It
-is important to run autoheader before ./configure to get these changes activated.
-
---- apachetop-0.12.6/configure.ac		2005-10-27 18:39:25.000000000 +0200
-+++ apachetop-0.12.6/configure.ac.maxpathlen	2008-06-21 16:00:38.000000000 +0200
-@@ -34,7 +34,8 @@
- # Checks for header files.
- AC_HEADER_STDC
- AC_CHECK_HEADERS([arpa/inet.h netdb.h netinet/in.h \
--		string.h strings.h sys/socket.h time.h sys/time.h])
-+		string.h strings.h sys/socket.h time.h sys/time.h \
-+		limits.h sys/param.h])
- 
- # Checks for typedefs, structures, and compiler characteristics.
- #AC_HEADER_STDBOOL # not in 2.53?
---- apachetop-0.12.6/src/apachetop.h		2005-10-15 18:10:01.000000000 +0200
-+++ apachetop-0.12.6/src/apachetop.h.maxpatlen	2008-06-21 16:02:00.000000000 +0200
-@@ -89,8 +89,12 @@
- #define getMIN(a,b) (a < b ? a : b)
- #define getMAX(a,b) (a > b ? a : b)
- 
--#ifndef MAXPATHLEN
--# define MAXPATHLEN 128
-+#ifdef HAVE_SYS_PARAM_H
-+# include <sys/param.h>
-+#endif
-+ 
-+#if HAVE_LIMITS_H
-+# include <limits.h>
- #endif
- 
- /* upon startup, each input file is put into an element of this array,

diff --git a/app-admin/apachetop/files/apachetop-0.12.6-ncurses.patch b/app-admin/apachetop/files/apachetop-0.12.6-ncurses.patch
deleted file mode 100644
index f12c989c340..00000000000
--- a/app-admin/apachetop/files/apachetop-0.12.6-ncurses.patch
+++ /dev/null
@@ -1,166 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -4,7 +4,7 @@
- AC_CONFIG_SRCDIR(src/apachetop.cc)
- 
- AC_CONFIG_AUX_DIR(config)
--#AC_CONFIG_MACRO_DIR(m4) # 2.58
-+AC_CONFIG_MACRO_DIR(m4)
- 
- AC_CONFIG_HEADER(config.h)
- AM_INIT_AUTOMAKE(apachetop, 0.12.6) # 2.53 only?
-@@ -29,7 +29,6 @@
- #AC_PROG_CC
- #AC_PROG_CPP
- AC_PROG_CXX
--AC_LANG_CPLUSPLUS
- 
- # Checks for header files.
- AC_HEADER_STDC
-@@ -120,24 +119,9 @@
- 
- AC_SEARCH_LIBS([socket], [socket])
- AC_SEARCH_LIBS([inet_addr], [nsl])
--AC_SEARCH_LIBS([attron], [ncurses])
--AC_SEARCH_LIBS([tgetstr], [termcap])
--AC_SEARCH_LIBS([mvprintw], [curses ncurses] ,
--	[] ,
--	[
--		AC_MSG_ERROR([No useful curses library found!])
--	]
--)
- 
--AC_SEARCH_LIBS([readline], [readline],
--	[
--		AC_DEFINE(HAVE_READLINE,1,[Define if you have readline library])
--		AC_SUBST(HAVE_READLINE)
--	] ,
--	[
--		AC_MSG_ERROR(readline library not found)
--	]
--)
-+PKG_CHECK_MODULES([NCURSES], [ncurses])
-+AX_LIB_READLINE
- 
- 
- # everything is in CPPFLAGS up to this point, now we move to CXXFLAGS
---- a/m4/ax_lib_readline.m4
-+++ b/m4/ax_lib_readline.m4
-@@ -0,0 +1,107 @@
-+# ===========================================================================
-+#     https://www.gnu.org/software/autoconf-archive/ax_lib_readline.html
-+# ===========================================================================
-+#
-+# SYNOPSIS
-+#
-+#   AX_LIB_READLINE
-+#
-+# DESCRIPTION
-+#
-+#   Searches for a readline compatible library. If found, defines
-+#   `HAVE_LIBREADLINE'. If the found library has the `add_history' function,
-+#   sets also `HAVE_READLINE_HISTORY'. Also checks for the locations of the
-+#   necessary include files and sets `HAVE_READLINE_H' or
-+#   `HAVE_READLINE_READLINE_H' and `HAVE_READLINE_HISTORY_H' or
-+#   'HAVE_HISTORY_H' if the corresponding include files exists.
-+#
-+#   The libraries that may be readline compatible are `libedit',
-+#   `libeditline' and `libreadline'. Sometimes we need to link a termcap
-+#   library for readline to work, this macro tests these cases too by trying
-+#   to link with `libtermcap', `libcurses' or `libncurses' before giving up.
-+#
-+#   Here is an example of how to use the information provided by this macro
-+#   to perform the necessary includes or declarations in a C file:
-+#
-+#     #ifdef HAVE_LIBREADLINE
-+#     #  if defined(HAVE_READLINE_READLINE_H)
-+#     #    include <readline/readline.h>
-+#     #  elif defined(HAVE_READLINE_H)
-+#     #    include <readline.h>
-+#     #  else /* !defined(HAVE_READLINE_H) */
-+#     extern char *readline ();
-+#     #  endif /* !defined(HAVE_READLINE_H) */
-+#     char *cmdline = NULL;
-+#     #else /* !defined(HAVE_READLINE_READLINE_H) */
-+#       /* no readline */
-+#     #endif /* HAVE_LIBREADLINE */
-+#
-+#     #ifdef HAVE_READLINE_HISTORY
-+#     #  if defined(HAVE_READLINE_HISTORY_H)
-+#     #    include <readline/history.h>
-+#     #  elif defined(HAVE_HISTORY_H)
-+#     #    include <history.h>
-+#     #  else /* !defined(HAVE_HISTORY_H) */
-+#     extern void add_history ();
-+#     extern int write_history ();
-+#     extern int read_history ();
-+#     #  endif /* defined(HAVE_READLINE_HISTORY_H) */
-+#       /* no history */
-+#     #endif /* HAVE_READLINE_HISTORY */
-+#
-+# LICENSE
-+#
-+#   Copyright (c) 2008 Ville Laurikari <vl@×××.fi>
-+#
-+#   Copying and distribution of this file, with or without modification, are
-+#   permitted in any medium without royalty provided the copyright notice
-+#   and this notice are preserved. This file is offered as-is, without any
-+#   warranty.
-+
-+#serial 7
-+
-+AU_ALIAS([VL_LIB_READLINE], [AX_LIB_READLINE])
-+AC_DEFUN([AX_LIB_READLINE], [
-+  AC_CACHE_CHECK([for a readline compatible library],
-+                 ax_cv_lib_readline, [
-+    ORIG_LIBS="$LIBS"
-+    for readline_lib in readline edit editline; do
-+      for termcap_lib in "" termcap curses ncurses; do
-+        if test -z "$termcap_lib"; then
-+          TRY_LIB="-l$readline_lib"
-+        else
-+          TRY_LIB="-l$readline_lib -l$termcap_lib"
-+        fi
-+        LIBS="$ORIG_LIBS $TRY_LIB"
-+        AC_TRY_LINK_FUNC(readline, ax_cv_lib_readline="$TRY_LIB")
-+        if test -n "$ax_cv_lib_readline"; then
-+          break
-+        fi
-+      done
-+      if test -n "$ax_cv_lib_readline"; then
-+        break
-+      fi
-+    done
-+    if test -z "$ax_cv_lib_readline"; then
-+      ax_cv_lib_readline="no"
-+    fi
-+    LIBS="$ORIG_LIBS"
-+  ])
-+
-+  if test "$ax_cv_lib_readline" != "no"; then
-+    LIBS="$LIBS $ax_cv_lib_readline"
-+    AC_DEFINE(HAVE_LIBREADLINE, 1,
-+              [Define if you have a readline compatible library])
-+    AC_CHECK_HEADERS(readline.h readline/readline.h)
-+    AC_CACHE_CHECK([whether readline supports history],
-+                   ax_cv_lib_readline_history, [
-+      ax_cv_lib_readline_history="no"
-+      AC_TRY_LINK_FUNC(add_history, ax_cv_lib_readline_history="yes")
-+    ])
-+    if test "$ax_cv_lib_readline_history" = "yes"; then
-+      AC_DEFINE(HAVE_READLINE_HISTORY, 1,
-+                [Define if your readline library has \`add_history'])
-+      AC_CHECK_HEADERS(history.h readline/history.h)
-+    fi
-+  fi
-+])dnl
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -6,6 +6,7 @@
-                     display.cc hits_circle.cc timed_circle.cc filters.cc \
- 		    resolver.cc
- 
-+apachetop_LDADD = $(NCURSES_LIBS)
- 
- noinst_HEADERS = apachetop.h log.h ohtbl.h map.h queue.h \
-                  display.h hits_circle.h circle.h timed_circle.h filters.h \

diff --git a/app-admin/apachetop/files/apachetop-0.18.4-tinfo.patch b/app-admin/apachetop/files/apachetop-0.18.4-tinfo.patch
deleted file mode 100644
index d975a430914..00000000000
--- a/app-admin/apachetop/files/apachetop-0.18.4-tinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -133,7 +133,7 @@
- AC_SEARCH_LIBS([socket], [socket])
- AC_SEARCH_LIBS([inet_addr], [nsl])
- AC_SEARCH_LIBS([attron], [ncurses])
--AC_SEARCH_LIBS([tgetstr], [termcap])
-+AC_SEARCH_LIBS([tgetstr], [tinfo termcap])
- AC_SEARCH_LIBS([mvprintw], [curses ncurses] ,
-     [] ,
-     [