Stable for HPPA, remove old EAPI=2 ebuild (bug #249140).

(Portage version: 2.2_rc17/cvs/Linux 2.6.25-gentoo-r7-JeR i686)

3 files changed, 7 insertions, 58 deletions

diff --git a/app-admin/analog/ChangeLog b/app-admin/analog/ChangeLog
index 18300eed69b3..4242e0088163 100644
--- a/app-admin/analog/ChangeLog
+++ b/app-admin/analog/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/analog
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/ChangeLog,v 1.44 2008/12/16 15:05:25 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/ChangeLog,v 1.45 2008/12/16 15:25:19 jer Exp $
+
+  16 Dec 2008; Jeroen Roovers <jer@gentoo.org> -analog-6.0-r1.ebuild,
+  analog-6.0-r2.ebuild:
+  Stable for HPPA, remove old EAPI=2 ebuild (bug #249140).
 
   16 Dec 2008; Ferris McCormick <fmccor@gentoo.org> analog-6.0-r2.ebuild:
   Sparc stable, Security Bug #249140.
diff --git a/app-admin/analog/analog-6.0-r1.ebuild b/app-admin/analog/analog-6.0-r1.ebuild
deleted file mode 100644
index e0de66a79443..000000000000
--- a/app-admin/analog/analog-6.0-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/analog-6.0-r1.ebuild,v 1.1 2008/09/27 13:29:25 betelgeuse Exp $
-
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="A webserver log analyzer"
-HOMEPAGE="http://www.analog.cx/"
-SRC_URI="http://www.analog.cx/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/libpcre-3.4
-	>=media-libs/gd-1.8.4-r2[jpeg,png]
-	sys-libs/zlib
-	media-libs/jpeg
-	media-libs/libpng"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-5.1-gentoo.diff"
-	sed -i \
-		-e "s:^CFLAGS.*:CFLAGS = ${CFLAGS}:" \
-		-e 's:^DEFS.*:DEFS = -DHAVE_GD -DHAVE_PCRE -DHAVE_ZLIB:' \
-		-e "s:^LIBS.*:LIBS = -lgd -lz -lpcre -lm -lpng -ljpeg:" \
-		src/Makefile \
-		|| die "sed failed"
-}
-
-src_compile() {
-	emake -C src || die "make failed"
-}
-
-src_install() {
-	dobin analog || die "dobin failed"
-	newman analog.man analog.1
-
-	dodoc README.txt Licence.txt analog.cfg
-	dohtml -a html,gif,css,ico docs/*
-	dohtml -r how-to
-	docinto examples ; dodoc examples/*
-	docinto cgi ; dodoc anlgform.pl
-
-	insinto /usr/share/analog/images ; doins images/*
-	insinto /usr/share/analog/lang ; doins lang/*
-	dodir /var/log/analog
-	dosym /usr/share/analog/images /var/log/analog/images
-	insinto /etc/analog ; doins "${FILESDIR}/analog.cfg"
-}
diff --git a/app-admin/analog/analog-6.0-r2.ebuild b/app-admin/analog/analog-6.0-r2.ebuild
index 189245c62a0d..e3fdd6243e03 100644
--- a/app-admin/analog/analog-6.0-r2.ebuild
+++ b/app-admin/analog/analog-6.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/analog-6.0-r2.ebuild,v 1.3 2008/12/16 15:05:25 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/analog-6.0-r2.ebuild,v 1.4 2008/12/16 15:25:19 jer Exp $
 
 inherit eutils toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.analog.cx/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ppc ~ppc64 sparc ~x86"
 IUSE=""
 
 DEPEND=">=dev-libs/libpcre-3.4