Disable ands support as it will be removed (#513238)

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

diff --git a/app-admin/apachetop/ChangeLog b/app-admin/apachetop/ChangeLog
index 4bf864e385df69904b3637419aad606ef1649c9a..a50f3ec100c17a1671a27e39ffb84379bb78e773 100644 (file)
--- a/app-admin/apachetop/ChangeLog
+++ b/app-admin/apachetop/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/apachetop
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apachetop/ChangeLog,v 1.53 2013/07/09 18:29:20 neurogeek Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apachetop/ChangeLog,v 1.54 2015/03/29 12:55:24 pacho Exp $
+
+*apachetop-0.12.6-r2 (29 Mar 2015)
+
+  29 Mar 2015; Pacho Ramos <pacho@gentoo.org> +apachetop-0.12.6-r2.ebuild:
+  Disable ands support as it will be removed (#513238)
 
   09 Jul 2013; <neurogeek@gentoo.org> apachetop-0.12.6-r1.ebuild,
   +files/apachetop-0.12.6-ac_config_header.patch:

diff --git a/app-admin/apachetop/Manifest b/app-admin/apachetop/Manifest
index 9b67abe00602613b29885ded7887da2370876dcc..a456b327d139905b5fe7c32d2ee0e0953b6aaa66 100644 (file)
--- a/app-admin/apachetop/Manifest
+++ b/app-admin/apachetop/Manifest
@@ -7,12 +7,13 @@ AUX apachetop-0.12.6-gcc41.patch 243 SHA256 dcdb6b52b45079c06141bf6f28f5b925db78
 AUX apachetop-0.12.6-maxpathlen.patch 1577 SHA256 9c85eb8461946aa40afb5eab05075276688f829856919469408c64bb44329d25 SHA512 c0e4562b9789168acbea68b4f19eb32238244d8003bd4d0df458582b095d9680f2e20b592990f0bebe5ae17fcbcbfd2154e74169788a8d3a31498f26776f6f36 WHIRLPOOL a813ba6c246c915531a7b626bcc819c00f9c90af51e00277c3f270fc050c1d7da1c594396d6bbdf3d183353d7bf9706b8da1c8fe1f1d9f866a5286d06251546f
 DIST apachetop-0.12.6.tar.gz 126930 SHA256 850062414517055eab2440b788b503d45ebe9b290d4b2e027a5f887ad70f3f29 SHA512 35081772f817c6a83a1fcf78790d2a288a9e4e48234c4b3163a09ad15f49a78d649b77f41aa002940fb9416c263cea159c5092a9b87285488eb450964c823c3a WHIRLPOOL 8b23d825b26c0ce43d1536edb3e6b613d9773c93cd62d02b84e479b9d1b0e89ef0f03b09b3e0cf3616fd3f05f2304b19c261c87e78c623bdabedfecbb5a5e8ae
 EBUILD apachetop-0.12.6-r1.ebuild 1122 SHA256 794349edcd0113b202618a95a7d3f3399f268e0203fb64cc66355af85368b405 SHA512 8a6c886874d0855c63cd86174285d4fcd45bbc3662eb2298469255dbc1ad2b2bb51438f2d5d9c060fb0dfa13259e7959eb0bf2a2991425531e3545719f79d0e1 WHIRLPOOL fd1f0e69c33e520b13b1129eb51b5909cc5121e21d9ab3563111bd760600fd91313fa5f5d2afc2128c133e813ef6f9882f95f8db57ab64aed7f2896a14840cd1
-MISC ChangeLog 6670 SHA256 3f54f8171b30c4a3b07ce3593af0fe99a0257140abc5f6216278c80b2564625f SHA512 cffdd293c21162f1db256e29762abace8d4ecb6fd17e791a622728bd13107c1906155e6f01a652b08d4eab79247b67be5a29ae5ec91b401bf1078ec64d6912db WHIRLPOOL 07706252b01027c76e44925c09d5d0aa0f7c82921c6ec8434ad7c7538a9cb637cf5c9429547fd7ef7d9ce8fceb0b371c6799b501ed18e7d22ce6f1993f25b7ee
+EBUILD apachetop-0.12.6-r2.ebuild 921 SHA256 00d1c98c0e2a36372b6e73f1a39440eb6a6e62a5e57080ea6826e32e1c3fe32c SHA512 1da2e1b6667b15fd30c239ce353af0a64e01be28fde57b65f5fa77da5c2fe4796a73fb600564ea1770dbd750e5fc1bd2276d3d697a95b77b0fc14b2d4978e4d0 WHIRLPOOL 69da183e3aec7b6c2fd5bd2b246064efa1f3c11d86adf615da23e077341210b8136155cfeafd2ee51dd1caf830baa8c2eb0eb971cd923d3dbd514dcbce7ff15d
+MISC ChangeLog 6833 SHA256 7a6a47f27fe1161299e6f49237dfb47236f5408fc482a4c753aa9cd3ac0aca37 SHA512 0f3e849629d2fe455cdcd64aae0f25c8ed1ca8eeb0074cca227d1093cbba9a2b53c030dc894a23313e8e6fb942264ec1ff29ee90da373c2a6ae5708283ffac9f WHIRLPOOL 40d1508eb45df0bef1edf27dfb4df7b0f7f2877330e831a66d72263cce27aac6334a613521843fe0a6270226b3ae80c22c5a7191b919b084c697bfbb197dfecd
 MISC metadata.xml 230 SHA256 8de1eed13d2505b1efb1c8aa4c52dc056b4e78c04be7dfcd77328d18e5f1e0cd SHA512 f90b0d0181129fa622097f68322d91e2deaf57da672de747f1d629878f873a5a7811282dcfd09a591b02a37a769ef7610bd2592ba39514f484f591a2fb164856 WHIRLPOOL 75a95775a930814d97c448430538a5b235a337afde2a90c5e99f0b6aeaa8ab478b6053e63603ae1b56438a1727b3d0d1d52cd45bb1516c0bb3b4a039ea31d4c8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlHcVq8ACgkQdIssYB9vBoOP8gCfX0RP2bGUE5hrDwBTmVSSe7b9
-DfgAn03vFLVi9W3kkKfRXCOzqse1cPs+
-=Ke/m
+iEYEAREIAAYFAlUX9j4ACgkQCaWpQKGI+9Rk4ACdGHjOk7Ub830VbK60WWo0kNP1
+lsQAn39mj+z+XBbISv4HC3IemzEVMZSN
+=Yt1v
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..78874d2
--- /dev/null
+++ b/app-admin/apachetop/apachetop-0.12.6-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apachetop/apachetop-0.12.6-r2.ebuild,v 1.1 2015/03/29 12:55:24 pacho Exp $
+
+EAPI=5
+inherit eutils autotools
+
+DESCRIPTION="A realtime Apache log analyzer"
+HOMEPAGE="http://www.webta.org/projects/apachetop"
+SRC_URI="http://www.webta.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE="fam pcre"
+
+RDEPEND="
+       fam? ( virtual/fam )
+       pcre? ( dev-libs/libpcre )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+       epatch "${FILESDIR}"/${P}-gcc41.patch
+       epatch "${FILESDIR}"/${P}-configure.patch
+       epatch "${FILESDIR}"/${P}-maxpathlen.patch
+       epatch "${FILESDIR}"/${P}-ac_config_header.patch
+       eautoreconf
+}
+
+src_configure() {
+       econf \
+               --with-logfile=/var/log/apache2/access_log \
+               --without-adns \
+               $(use_with fam) \
+               $(use_with pcre)
+}