gentoo resync : 14.07.2018

10 files changed, 471 insertions, 0 deletions

diff --git a/app-admin/apachetop/Manifest b/app-admin/apachetop/Manifest
new file mode 100644
index 000000000000..e3cb3b59482c
--- /dev/null
+++ b/app-admin/apachetop/Manifest
@@ -0,0 +1,12 @@
+AUX apachetop-0.12.6-ac_config_header.patch 458 BLAKE2B 714adf5ee34629abae9cfe38d630e4e1c0829a99c823bc00a5276fe424264378316e18274976c71b974e970a25329413ab720f6621dcf3a6dcf61f02bc7d46d7 SHA512 dc10e46cac980a3544579222c5859d8baf4a1b5fd86a4700b07661e202270ff59b746b14661ca548d83322965e789bf70c7eddf8bf07b51d97d9e13256040109
+AUX apachetop-0.12.6-configure.patch 2884 BLAKE2B 34310a487b0dc68e184c9facce01d8ca95364c6c8ed041fa5ccf9dbbdce3ca4ac944fff91aafb4866e7086e8fd9ebeb961026f84bd3c77ccaabdbc5e1be97997 SHA512 7c399fd434476291504cd7674fe63559c59a7b32628477ad4fbd1386e936be4d1f49d4faa2d8d95839c74908e755d50400ab8f4f30163967b94dc058456c9c15
+AUX apachetop-0.12.6-gcc41.patch 247 BLAKE2B f193def780fc35322d49af0e13898a5dd95ecb49f8c0f4039260eb6b2aaf6e5a45131682d68d38f474d384b9d6d35c27a5233b57949da8b6ff54d29b9634c86e SHA512 710b8e3b381dcf9aac58544f9afe0f2a3cc598b38e87145caad29404fc19983bc683b160f0f80dd003ffa57d246fbc5b0fa5754aa1012e985b4c2ffc7e01f50f
+AUX apachetop-0.12.6-maxpathlen.patch 1577 BLAKE2B 97c046e1bf9f7cd67aaf95f9ed755bc3f12774756da35b31cd7b38db22b2860400bcbc9626a37ea795dc454c46b90dd2a53f41c42124e9d777a7da7a75da3a4c SHA512 c0e4562b9789168acbea68b4f19eb32238244d8003bd4d0df458582b095d9680f2e20b592990f0bebe5ae17fcbcbfd2154e74169788a8d3a31498f26776f6f36
+AUX apachetop-0.12.6-ncurses.patch 5392 BLAKE2B bfbe54d1a3b32157cda1a22aba83829948233df7d18d6f54c9ec6f9b4e987c9c201d1bc5af43c3ce0edd8af5d83f14b229725f68b44e8e9ab202da961d628542 SHA512 2c4759a1a8c4a54fb10d75779c23bfadfdb789be1a790add29adc2cb9ba1829f57239da568057ddbfaf0cea5468a74a3fdf20b1fd35b0bf51e8c8ab9e6027b6d
+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
+EBUILD apachetop-0.12.6-r2.ebuild 896 BLAKE2B d8fa75f505641c95219c94f0fb09bbb8382a4797c08be644ac17958c4c804c2594c3c5809c9b82fc413010230f5a83a70a74f4616fce507a1726bcbed204e231 SHA512 b5368a948c0b4f4e6c2d754335de9dd20cb263985192631703d437f7f1c833758b11e4a17cd18fa6f5d09a2edba8de91966d9d72c453e17c6145012686ad68ca
+EBUILD apachetop-0.17.4.ebuild 726 BLAKE2B 2979fc7c056474d3e6e968eb7f8a9729a9dcd83137020f50f45c14d1dae27a567dc03e189878e7a2edaa5fb9c68a4ddb4b9211c4d2f5089a98f4850bc67185da SHA512 3e7bcd2561a0dcbdf8d494e3e41c4735e1d08b6893d2c1889dc7590edb83ba729d42b73327284eb50f7c313f0c4b7d07a7c2e63cc5cc01544fa593eebdd8a072
+EBUILD apachetop-0.18.4.ebuild 726 BLAKE2B 2979fc7c056474d3e6e968eb7f8a9729a9dcd83137020f50f45c14d1dae27a567dc03e189878e7a2edaa5fb9c68a4ddb4b9211c4d2f5089a98f4850bc67185da SHA512 3e7bcd2561a0dcbdf8d494e3e41c4735e1d08b6893d2c1889dc7590edb83ba729d42b73327284eb50f7c313f0c4b7d07a7c2e63cc5cc01544fa593eebdd8a072
+MISC metadata.xml 381 BLAKE2B 0ce0f75aab60659850e7d04532911feea89a4bccf8ec7826ebfb924416af438d5a2bf7981435a22e825b39881ac20a8b2a0bd93a66b2d7b031c72123033f1d78 SHA512 9b3a37c75a62f1873288ffba45ab105225a90d72e01c7ead253b5a903ec28babe152074cc7595d6398104f8ccc50ebfc71ff72c4e620a7dad1b5e57f767cd118
diff --git a/app-admin/apachetop/apachetop-0.12.6-r2.ebuild b/app-admin/apachetop/apachetop-0.12.6-r2.ebuild
new file mode 100644
index 000000000000..00e66ae0691c
--- /dev/null
+++ b/app-admin/apachetop/apachetop-0.12.6-r2.ebuild
@@ -0,0 +1,44 @@
+# 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
new file mode 100644
index 000000000000..2f5954eb82bf
--- /dev/null
+++ b/app-admin/apachetop/apachetop-0.17.4.ebuild
@@ -0,0 +1,36 @@
+# 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
new file mode 100644
index 000000000000..2f5954eb82bf
--- /dev/null
+++ b/app-admin/apachetop/apachetop-0.18.4.ebuild
@@ -0,0 +1,36 @@
+# 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/files/apachetop-0.12.6-ac_config_header.patch b/app-admin/apachetop/files/apachetop-0.12.6-ac_config_header.patch
new file mode 100644
index 000000000000..aabdb13d75f3
--- /dev/null
+++ b/app-admin/apachetop/files/apachetop-0.12.6-ac_config_header.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 000000000000..38a1fc7f6a1a
--- /dev/null
+++ b/app-admin/apachetop/files/apachetop-0.12.6-configure.patch
@@ -0,0 +1,101 @@
+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
new file mode 100644
index 000000000000..6bfb49d9f9d8
--- /dev/null
+++ b/app-admin/apachetop/files/apachetop-0.12.6-gcc41.patch
@@ -0,0 +1,13 @@
+--- 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
new file mode 100644
index 000000000000..b648b07cbfc5
--- /dev/null
+++ b/app-admin/apachetop/files/apachetop-0.12.6-maxpathlen.patch
@@ -0,0 +1,39 @@
+Patch by Robert Scheck <robert@fedoraproject.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
new file mode 100644
index 000000000000..f12c989c3407
--- /dev/null
+++ b/app-admin/apachetop/files/apachetop-0.12.6-ncurses.patch
@@ -0,0 +1,166 @@
+--- 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@iki.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/metadata.xml b/app-admin/apachetop/metadata.xml
new file mode 100644
index 000000000000..e7214b7e32c5
--- /dev/null
+++ b/app-admin/apachetop/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>oleksandr.trotsenko@gmail.com</email>
+		<name>Oleksandr Trotsenko</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>