[gentoo-commits] gentoo-x86 commit in app-admin/webalizer: ChangeLog webalizer-2.01.10-r15.ebuild webalizer-2.01.10-r16.ebuild webalizer-2.01.10-r17.ebuild

[Sebastian Pipping (sping)]

sping       10/10/28 03:05:21

  Modified:             ChangeLog webalizer-2.01.10-r15.ebuild
                        webalizer-2.01.10-r16.ebuild
                        webalizer-2.01.10-r17.ebuild
  Log:
  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)

Revision  Changes    Path
1.79                 app-admin/webalizer/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webalizer/ChangeLog?rev=1.79&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webalizer/ChangeLog?rev=1.79&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webalizer/ChangeLog?r1=1.78&r2=1.79

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/webalizer/ChangeLog,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- ChangeLog	23 May 2010 04:33:07 -0000	1.78
+++ ChangeLog	28 Oct 2010 03:05:21 -0000	1.79
@@ -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@g.o>
+  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@g.o>
   webalizer-2.21.02.ebuild, +files/webalizer-2.21.02-gcc-4.4.patch:



1.12                 app-admin/webalizer/webalizer-2.01.10-r15.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r15.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r15.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r15.ebuild?r1=1.11&r2=1.12

Index: webalizer-2.01.10-r15.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r15.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- webalizer-2.01.10-r15.ebuild	10 Mar 2010 16:50:36 -0000	1.11
+++ webalizer-2.01.10-r15.ebuild	28 Oct 2010 03:05:21 -0000	1.12
@@ -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 @@
 	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 @@
 
 	# 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 @@
 		myconf="${myconf} --with-language=english"
 	fi
 
-	# stupid broken configuration file
-	eautoreconf
-
 	econf ${myconf} || die "econf failed"
-
-	emake || die "emake failed"
 }
 
 src_install() {



1.3                  app-admin/webalizer/webalizer-2.01.10-r16.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r16.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r16.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r16.ebuild?r1=1.2&r2=1.3

Index: webalizer-2.01.10-r16.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r16.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- webalizer-2.01.10-r16.ebuild	10 Mar 2010 16:50:36 -0000	1.2
+++ webalizer-2.01.10-r16.ebuild	28 Oct 2010 03:05:21 -0000	1.3
@@ -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 @@
 	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 @@
 	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 @@
 		$(use_enable geoip) \
 		${myconf} \
 		|| die "econf failed"
-	emake || die "emake failed"
 }
 
 src_install() {



1.4                  app-admin/webalizer/webalizer-2.01.10-r17.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r17.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r17.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r17.ebuild?r1=1.3&r2=1.4

Index: webalizer-2.01.10-r17.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-2.01.10-r17.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- webalizer-2.01.10-r17.ebuild	10 Mar 2010 16:50:36 -0000	1.3
+++ webalizer-2.01.10-r17.ebuild	28 Oct 2010 03:05:21 -0000	1.4
@@ -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 @@
 	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 @@
 	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 @@
 		--with-dblib=$(db_libname) \
 		${myconf} \
 		|| die "econf failed"
-	emake || die "emake failed"
 }
 
 src_install() {