fix #198553; remove old version

Package-Manager: portage-2.1.4.4

7 files changed, 135 insertions, 74 deletions

diff --git a/app-admin/apachetop/ChangeLog b/app-admin/apachetop/ChangeLog
index bb8cba2291a5..d8f1af5b9091 100644
--- a/app-admin/apachetop/ChangeLog
+++ b/app-admin/apachetop/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/apachetop
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apachetop/ChangeLog,v 1.42 2006/12/10 08:48:36 beu Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apachetop/ChangeLog,v 1.43 2008/02/23 20:26:07 hollow Exp $
+
+  23 Feb 2008; Benedikt Böhm <hollow@gentoo.org>
+  +files/apachetop-0.12.6-configure.patch, -files/CAN-2005-2660.patch,
+  metadata.xml, -apachetop-0.12.5-r1.ebuild, apachetop-0.12.6.ebuild:
+  fix #198553; remove old version
 
   10 Dec 2006; Elfyn McBratney <beu@gentoo.org> apachetop-0.12.5-r1.ebuild,
   apachetop-0.12.6.ebuild:
diff --git a/app-admin/apachetop/Manifest b/app-admin/apachetop/Manifest
index f216118b9759..1e091e7dd9b5 100644
--- a/app-admin/apachetop/Manifest
+++ b/app-admin/apachetop/Manifest
@@ -1,8 +1,16 @@
-AUX CAN-2005-2660.patch 577 RMD160 b1886b7cdd41a80d3dc8c547266904c8ddeebe2a SHA1 7ba090b5d147a9f85b26fbb133a1f5beed8b4a81 SHA256 c8f5e126c32514dd05d5e20bb50eafd5814ac0b1dee75ad028b901bef1b688ce
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX apachetop-0.12.6-configure.patch 2884 RMD160 bb72d58d30e5370f070a7e1963b52c0900501f66 SHA1 cd1215688c97a62562bf99931eba32161d5b1a05 SHA256 56c926a2bf56ebfbf38da95176f229ce89285b1fc86aea7c8924c50ddbb49c7a
 AUX apachetop-0.12.6-gcc41.patch 243 RMD160 866303a6de71002e4da924fb2089371b234b442c SHA1 410f8778c3412893a3f7e3653fdc18c01a3b0b8e SHA256 dcdb6b52b45079c06141bf6f28f5b925db78f5574e97a8bcdc41938643058669
-DIST apachetop-0.12.5.tar.gz 126967 RMD160 a46fb8e850d6d98ce38aaa97fb2ea62553091ded SHA1 b41d3c68478e3cd378988834f32ce9a33975c67e SHA256 493add45e318cbfeaf3ecc24b7bed9f15d2a011e89b898bdc3a57ddd34491055
 DIST apachetop-0.12.6.tar.gz 126930 RMD160 bceb52e339100f244c0246423fb9b6972cde3d88 SHA1 005c9479800a418ee7febe5027478ca8cbf3c51b SHA256 850062414517055eab2440b788b503d45ebe9b290d4b2e027a5f887ad70f3f29
-EBUILD apachetop-0.12.5-r1.ebuild 1049 RMD160 9df725ef515a2336ff19bfa822f57969cfd7ffe6 SHA1 a1bf0a4cdda04d588aa7c0eafbe4fd3522352084 SHA256 7b46b1e9642feb13d3024ed554a2fdd4fa809b03af41dad9108cb1807a0e2771
-EBUILD apachetop-0.12.6.ebuild 1033 RMD160 e81c22b91810bb18e630b0184eba4a7c8c6c71df SHA1 bc6c6530e06dd6162c8ae77c2cd8b5d0a2bb75be SHA256 97f76d5b3596fdc79c6aa4fc86537c0ef1e4daa591ed602cfc965c97ae2159c3
-MISC ChangeLog 5145 RMD160 d5fbea5912723aa9f3b83b3d3fb1e6007431b774 SHA1 c1dad4bd2a5c4eac6c84203e3b7319e5da2d5060 SHA256 c1cd10b8f74c87209d80f5bdffd3680f1d2e6b401dbf4ef8453e6bee3f5739ca
-MISC metadata.xml 161 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b SHA1 5b91a6d8d06d3dca2d774425befba30caca51507 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4
+EBUILD apachetop-0.12.6.ebuild 1020 RMD160 7ad5cbc276444142353a37138adc1f6f8ddef36d SHA1 46ebadda33d8d6f0da8d74e347a1969b86949e84 SHA256 93a1e21afda8ab1c7d1e767e41644504944070a51bdd5c2f0258634fd140c31c
+MISC ChangeLog 5374 RMD160 1d4075c8cc8a4be0824f8dd7df9c188da6c362d4 SHA1 bd2d60ea9607927d82baf1bc34d24e5abb9bf190 SHA256 d3cc1024440e8b8eb4e5e766cf9b98bf74cbe53d691597c83bc05feafd3ad830
+MISC metadata.xml 160 RMD160 a0f6e133e170b7477018d8584c20e8723f6914fa SHA1 a3b9b520ec43ee1f9b1c7b5c5b8745bf84454c03 SHA256 3c312146c4cb5b912d6f56292242ce3a85c629ca98ee7ef0a84ca575708b44fe
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkfAgWoACgkQmPFBzbX68WHTygCffz6RYgxfXxMQUVR5Amm4Bdqe
+ElMAn0T8nr5BuC12xWCOE8BSmd/jfU5j
+=LjVG
+-----END PGP SIGNATURE-----
diff --git a/app-admin/apachetop/apachetop-0.12.5-r1.ebuild b/app-admin/apachetop/apachetop-0.12.5-r1.ebuild
deleted file mode 100644
index 529b2c4dff13..000000000000
--- a/app-admin/apachetop/apachetop-0.12.5-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apachetop/apachetop-0.12.5-r1.ebuild,v 1.7 2006/12/10 08:48:36 beu Exp $
-
-inherit eutils
-
-DESCRIPTION="A realtime Apache log analyzer"
-HOMEPAGE="http://clueful.shagged.org/apachetop/"
-SRC_URI="http://clueful.shagged.org/apachetop/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ppc sparc x86"
-IUSE="apache2 fam pcre adns"
-
-DEPEND="fam? ( virtual/fam )
-	pcre? ( dev-libs/libpcre )
-	adns? ( net-libs/adns )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/CAN-2005-2660.patch
-}
-
-src_compile() {
-	useq apache2 && logfile="/var/log/apache2/access_log"
-	useq apache2 || logfile="/var/log/apache/access_log"
-	econf --with-logfile="${logfile}" `use_with fam` `use_with pcre` `use_with adns` || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc README INSTALL TODO AUTHORS ChangeLog NEWS
-}
diff --git a/app-admin/apachetop/apachetop-0.12.6.ebuild b/app-admin/apachetop/apachetop-0.12.6.ebuild
index a5aa8ecd4eba..3644df9a9186 100644
--- a/app-admin/apachetop/apachetop-0.12.6.ebuild
+++ b/app-admin/apachetop/apachetop-0.12.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 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.ebuild,v 1.8 2006/12/10 08:48:36 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apachetop/apachetop-0.12.6.ebuild,v 1.9 2008/02/23 20:26:07 hollow Exp $
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="A realtime Apache log analyzer"
 HOMEPAGE="http://www.webta.org/projects/apachetop"
@@ -11,7 +11,7 @@ SRC_URI="http://www.webta.org/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 hppa ~mips ppc sparc x86"
-IUSE="apache2 fam pcre adns"
+IUSE="fam pcre adns"
 
 DEPEND="fam? ( virtual/fam )
 	pcre? ( dev-libs/libpcre )
@@ -19,19 +19,22 @@ DEPEND="fam? ( virtual/fam )
 
 src_unpack() {
 	unpack ${A}
-
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-gcc41.patch
+	epatch "${FILESDIR}"/${P}-configure.patch
+	eautoreconf
 }
 
 src_compile() {
-	useq apache2 && logfile="/var/log/apache2/access_log"
-	useq apache2 || logfile="/var/log/apache/access_log"
-	econf --with-logfile="${logfile}" `use_with fam` `use_with pcre` `use_with adns` || die "econf failed"
+	econf --with-logfile=/var/log/apache2/access_log \
+		$(use_with fam) \
+		$(use_with pcre) \
+		$(use_with adns) \
+		|| die "econf failed"
 	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "make install failed"
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
 }
diff --git a/app-admin/apachetop/files/CAN-2005-2660.patch b/app-admin/apachetop/files/CAN-2005-2660.patch
deleted file mode 100644
index cea26afa4c5b..000000000000
--- a/app-admin/apachetop/files/CAN-2005-2660.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- apachetop-0.12.5.orig/src/apachetop.cc	2005-09-27 20:48:10.000000000 -0400
-+++ apachetop-0.12.5/src/apachetop.cc	2005-09-27 20:49:26.000000000 -0400
-@@ -1105,7 +1105,16 @@
- 	FILE *d;
-         va_list args;
- 
--	if (cf.debug && (d = fopen(DEBUG_OUTPUT, "a")))
-+	static char fileName[1024] = {'\0'};
-+
-+	if ( !strlen( fileName ) )
-+	{
-+		strcpy( fileName, "/tmp/atop.XXXXXX" );
-+		mkdtemp( fileName );
-+		strncat( fileName, "/debug", sizeof(fileName ) );
-+	}
-+
-+	if (cf.debug && (d = fopen(fileName, "a")))
- 	{
-         	va_start(args, fmt);
-         	vfprintf(d, fmt, args);
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/metadata.xml b/app-admin/apachetop/metadata.xml
index 95c06f0095bb..64a719ea1bfd 100644
--- a/app-admin/apachetop/metadata.xml
+++ b/app-admin/apachetop/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
+	<herd>apache</herd>
 </pkgmetadata>