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

Package-Manager: portage-2.1.9.22/cvs/Linux x86_64

5 files changed, 28 insertions, 29 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/Manifest b/app-admin/webalizer/Manifest
index 6c6a85300f84..832925f5d2fa 100644
--- a/app-admin/webalizer/Manifest
+++ b/app-admin/webalizer/Manifest
@@ -10,9 +10,9 @@ DIST webalizer-2.01-10-RB21-patch.tar.gz 585340 RMD160 bfd020cf078342ebc5b660793
 DIST webalizer-2.01-10-src.tar.bz2 252664 RMD160 4605ff9bd8ec1c74680b8fbfe703f2e81ae68e20 SHA1 fbf6ad78fc2b0189d065e661dc02a781e858b31a SHA256 f339e4b8879aeade0f889b7bc7eb85854a7746a16b267c4aa985cd5b8a112262
 DIST webalizer-2.21-02-src.tar.bz2 304926 RMD160 c7d48acf6e2c1fedfd04eac30214a76db7c84aee SHA1 b637ebf1eb459e03c052c24d7da3e5f0794e2230 SHA256 f2663d67f5820644a0b1c0b7dee4a5c764d829166fa28d5880442c28886729d9
 DIST webalizer.conf.gz 8986 RMD160 61751fa52c4e4bc29a8c3ba5956daf0a45138ec5 SHA1 557406236b10630fb213b12ef30c810a76eac6e5 SHA256 b7da31865a8c13a66756247d68242d6478900f2c2b9b5698ed35c0c613fb9a71
-EBUILD webalizer-2.01.10-r15.ebuild 4273 RMD160 d3570be5cdc2898593513b074a3e49057cbd9446 SHA1 2524af7516bbb74bedfa2201a3752499dcf13776 SHA256 da6ddaef882f32b56414f9ac823ec5266f9a67f8a46d369a67997cd252e1c04d
-EBUILD webalizer-2.01.10-r16.ebuild 3879 RMD160 e2c89172ba3600fa2f5f22869e161b9a96ac9218 SHA1 3c1b3a90df502d1a363496f6cd00fbffac554bed SHA256 68c0f858369c0728b5b6507607d59b95ba3d77798f3d819ad4b92d717d144361
-EBUILD webalizer-2.01.10-r17.ebuild 4039 RMD160 daf8bd0a5db5307da60a14d33ac9f3d6c8777c63 SHA1 9880d7eddabc4262564bf2dfc350637fe3b69e82 SHA256 88103587dd4c9a5fcbce63f8301ed2fe05b4bab1dc0598c246dc77ab6cd902e8
+EBUILD webalizer-2.01.10-r15.ebuild 4230 RMD160 9b9ea976eca6672a18234a1c6e091c0951798035 SHA1 e3b34b4b4be018f4f8f029ee0467f9e52b4bff07 SHA256 e17054e275857b400ea6ddc5a57192d937d03d0d202721296ff1eed338a39f4e
+EBUILD webalizer-2.01.10-r16.ebuild 3838 RMD160 bf52119ee1a5437194af6da04c99969f4c3bae58 SHA1 d26670aa8ae0f477b65197e0be7a97429c50b9e9 SHA256 50c1adc23a9501574f9ea05cb23d3d898ec564ab5cb20f204721c6d93cf289d1
+EBUILD webalizer-2.01.10-r17.ebuild 3998 RMD160 ab1f99b5283d8bcb67aa0c62969bec7182ed8bf0 SHA1 aa864c41688bbad1abb0742c54a8fa98e4109f69 SHA256 d2a48f96476c5c90b9ea0a4b855fb00776fd2e4c0481ff83a0285c44ab251b90
 EBUILD webalizer-2.21.02.ebuild 3230 RMD160 58fa2abfec6ab10d9bf5763b32a06e3fb2e7d3f2 SHA1 7ebef95f2e565ad018899b22012191a3e9ee87a7 SHA256 551b608b646fb5d3dd5d006ffc10e9e7692f0fc7fb75d154d4d74829cdcd3397
-MISC ChangeLog 11527 RMD160 3b4f5894f0caa5b02ecec9c9d4ecaf32bff5ff48 SHA1 b6cd9ac1b59d31d21fc94eef96f2e3112571fc40 SHA256 a807b68e1129ec6c5835429e1236a4eb321f78e78cb5fd3f5e760f8c042648aa
+MISC ChangeLog 11744 RMD160 02841505ced108c413b019449e362cce90f035dc SHA1 91c451a37db0b520a6720462e66bed620f530c89 SHA256 6e73d8297b2eb438906aff17b0a0f4b95cad6400895dc63ec69dfaff60b1f8bb
 MISC metadata.xml 233 RMD160 d096fc5efa30bb590a552300fdf51486f8990348 SHA1 935edd183d9e6436eccdcdf0275147b524f8b52f SHA256 508e864fe9eca5b8405c2d52503c5a4ed3c432bac41391cdefb1c79ec57ce7b9
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() {