app-admin/webalizer: Move to EAPI 2 with src_prepare() and src_configure() (bug #331027)

(Portage version: 2.1.9.22/cvs/Linux x86_64)

4 files changed, 24 insertions, 25 deletions

diff --git a/app-admin/webalizer/ChangeLog b/app-admin/webalizer/ChangeLog
index 7a7d52864dbe..57aca93a162f 100644
--- a/app-admin/webalizer/ChangeLog
+++ b/app-admin/webalizer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/webalizer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.78 2010/05/23 04:33:07 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v 1.79 2010/10/28 03:05:21 sping Exp $
+
+  28 Oct 2010; Sebastian Pipping <sping@gentoo.org>
+  webalizer-2.01.10-r15.ebuild, webalizer-2.01.10-r16.ebuild,
+  webalizer-2.01.10-r17.ebuild:
+  Move to EAPI 2 with src_prepare() and src_configure() (bug #331027)
 
   23 May 2010; Sebastian Pipping <sping@gentoo.org>
   webalizer-2.21.02.ebuild, +files/webalizer-2.21.02-gcc-4.4.patch:
diff --git a/app-admin/webalizer/webalizer-2.01.10-r15.ebuild b/app-admin/webalizer/webalizer-2.01.10-r15.ebuild
index 2c6d3bf9991f..4cff09842dea 100644
--- a/app-admin/webalizer/webalizer-2.01.10-r15.ebuild
+++ b/app-admin/webalizer/webalizer-2.01.10-r15.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r15.ebuild,v 1.11 2010/03/10 16:50:36 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r15.ebuild,v 1.12 2010/10/28 03:05:21 sping Exp $
+
+EAPI="2"
 
 # uses webapp.eclass to create directories with right permissions
 # probably slight overkill but works well
@@ -51,9 +53,7 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
-	unpack ${A} ; cd "${S}"
-
+src_prepare() {
 	if use geoip; then
 		epatch "${WORKDIR}"/geolizer_${MY_PV}-patch/geolizer.patch || die
 		use xtended && elog "Xtended doesn't work with geolizer, skipping"
@@ -66,9 +66,12 @@ src_unpack() {
 
 	# bug 121816: prevent truncated useragent fields
 	sed -i -e 's:^#define MAXAGENT 64:#define MAXAGENT 128:' webalizer.h
+
+	# stupid broken configuration file
+	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	local myconf=" --enable-dns \
 		--with-db=$(db_includedir) \
 		--with-dblib=$(db_libname)"
@@ -86,12 +89,7 @@ src_compile() {
 		myconf="${myconf} --with-language=english"
 	fi
 
-	# stupid broken configuration file
-	eautoreconf
-
 	econf ${myconf} || die "econf failed"
-
-	emake || die "emake failed"
 }
 
 src_install() {
diff --git a/app-admin/webalizer/webalizer-2.01.10-r16.ebuild b/app-admin/webalizer/webalizer-2.01.10-r16.ebuild
index dfc874e601fb..c95d0da272df 100644
--- a/app-admin/webalizer/webalizer-2.01.10-r16.ebuild
+++ b/app-admin/webalizer/webalizer-2.01.10-r16.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r16.ebuild,v 1.2 2010/03/10 16:50:36 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r16.ebuild,v 1.3 2010/10/28 03:05:21 sping Exp $
+
+EAPI="2"
 
 # uses webapp.eclass to create directories with right permissions
 # probably slight overkill but works well
@@ -48,10 +50,7 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	if use geoip && ! use xtended; then
 		epatch "${WORKDIR}"/geolizer_${MY_PV}-patch/geolizer.patch
 	else
@@ -66,7 +65,7 @@ src_unpack() {
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	# really dirty hack; necessary due to a really gross ./configure
 	# basically, it just sets the natural language the program uses
 	# unfortunatly, this program only allows for one lang, so only the first
@@ -84,7 +83,6 @@ src_compile() {
 		$(use_enable geoip) \
 		${myconf} \
 		|| die "econf failed"
-	emake || die "emake failed"
 }
 
 src_install() {
diff --git a/app-admin/webalizer/webalizer-2.01.10-r17.ebuild b/app-admin/webalizer/webalizer-2.01.10-r17.ebuild
index 64eb983f6790..4baa3e8b63cd 100644
--- a/app-admin/webalizer/webalizer-2.01.10-r17.ebuild
+++ b/app-admin/webalizer/webalizer-2.01.10-r17.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r17.ebuild,v 1.3 2010/03/10 16:50:36 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r17.ebuild,v 1.4 2010/10/28 03:05:21 sping Exp $
+
+EAPI="2"
 
 # uses webapp.eclass to create directories with right permissions
 # probably slight overkill but works well
@@ -48,10 +50,7 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	if use geoip && ! use xtended; then
 		epatch "${WORKDIR}"/geolizer_${MY_PV}-patch/geolizer.patch
 	else
@@ -66,7 +65,7 @@ src_unpack() {
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	# really dirty hack; necessary due to a really gross ./configure
 	# basically, it just sets the natural language the program uses
 	# unfortunatly, this program only allows for one lang, so only the first
@@ -90,7 +89,6 @@ src_compile() {
 		--with-dblib=$(db_libname) \
 		${myconf} \
 		|| die "econf failed"
-	emake || die "emake failed"
 }
 
 src_install() {