Migrate to EAPI 2.

(Portage version: 2.2_rc20/cvs/Linux 2.6.29-rc6 i686)

2 files changed, 26 insertions, 36 deletions

diff --git a/www-apps/dspam-web/ChangeLog b/www-apps/dspam-web/ChangeLog
index df2c4e16833f..2d38d2f187ab 100644
--- a/www-apps/dspam-web/ChangeLog
+++ b/www-apps/dspam-web/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/dspam-web
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/ChangeLog,v 1.40 2007/12/31 08:00:11 mrness Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/ChangeLog,v 1.41 2009/03/07 20:49:50 betelgeuse Exp $
+
+  07 Mar 2009; Petteri Räty <betelgeuse@gentoo.org>
+  dspam-web-3.8.0-r1.ebuild:
+  Migrate to EAPI 2.
 
 *dspam-web-3.8.0-r1 (31 Dec 2007)
 
@@ -116,7 +120,8 @@
   +dspam-web-3.4.1.ebuild:
   Added 3.4.1
 
-*dspam-web-3.4_beta3 (11 Mar 2005)
+*dspam-web-3.4_rc3 (11 Mar 2005)
+*dspam-web-3.2.7 (11 Mar 2005)
 
   11 Mar 2005; Lim Swee Tat <st_lim@gentoo.org> -dspam-web-3.2.4.ebuild,
   +dspam-web-3.2.7.ebuild, -dspam-web-3.3.11.ebuild,
@@ -147,6 +152,7 @@
   Fixed URL for dspam
 
 *dspam-web-3.3.8 (05 Jan 2005)
+*dspam-web-3.2.4 (05 Jan 2005)
 
   05 Jan 2005; Lim Swee Tat <st_lim@gentoo.org> +dspam-web-3.2.4.ebuild,
   +dspam-web-3.3.8.ebuild:
@@ -184,6 +190,9 @@
   24 Aug 2004; Lim Swee Tat <st_lim@gentoo.org> +dspam-web-3.1.1.ebuild:
   Version bump and transfer to www-apps
 
+*dspam-web-3.1.0 (23 Aug 2004)
+*dspam-web-3.0.0 (23 Aug 2004)
+
   23 Aug 2004; Lim Swee Tat <st_lim@gentoo.org> +metadata.xml,
   +files/htaccess, +files/htpasswd, +dspam-web-3.0.0.ebuild,
   +dspam-web-3.1.0.ebuild:
diff --git a/www-apps/dspam-web/dspam-web-3.8.0-r1.ebuild b/www-apps/dspam-web/dspam-web-3.8.0-r1.ebuild
index e650c4aa5f58..c3377873e065 100644
--- a/www-apps/dspam-web/dspam-web-3.8.0-r1.ebuild
+++ b/www-apps/dspam-web/dspam-web-3.8.0-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/dspam-web-3.8.0-r1.ebuild,v 1.1 2007/12/31 08:00:11 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dspam-web/dspam-web-3.8.0-r1.ebuild,v 1.2 2009/03/07 20:49:50 betelgeuse Exp $
+
+EAPI="2"
 
 inherit webapp eutils autotools
 
@@ -15,12 +17,10 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc sparc x86"
 IUSE=""
 
-# These are really run-time dependencies, but we need to make sure they are installed
-# before pkg_setup runs the built_with_use tests
-DEPEND=">=mail-filter/dspam-${PV}
-	dev-perl/GD"
-
-RDEPEND="${DEPEND}
+DEPEND=""
+DEPEND="
+	>=mail-filter/dspam-${PV}[-user-homedirs]
+	dev-perl/GD[png]
 	dev-perl/GD-Graph3d
 	dev-perl/GDGraph
 	dev-perl/GDTextUtil"
@@ -31,29 +31,7 @@ CONFDIR="/etc/mail/dspam"
 
 S="${WORKDIR}/dspam-${PV}"
 
-pkg_setup() {
-	local use_tests_failed=false
-	if built_with_use "mail-filter/dspam" user-homedirs; then
-		echo
-		eerror "The DSPAM web interface requires that mail-filter/dspam be installed without user-homedirs USE flag."
-		eerror "Please disable this flag and re-emerge dspam."
-		use_tests_failed=true
-	fi
-	if ! built_with_use "dev-perl/GD" png; then
-		echo
-		eerror "The DSPAM web interface requires that dev-perl/GD be installed with png USE flag."
-		eerror "Please enable this flag and re-emerge GD."
-		use_tests_failed=true
-	fi
-	${use_tests_failed} && die "Dependency installed with incompatible USE flags"
-
-	webapp_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	EPATCH_SUFFIX="patch"
 	epatch "${WORKDIR}"/patches
 
@@ -61,12 +39,15 @@ src_unpack() {
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	econf \
 			--with-dspam-home=${HOMEDIR} \
 			--sysconfdir=${CONFDIR}  || die "econf failed"
+}
+
+src_compile() {
 	cd "${S}/webui"
-	emake || die "emake failed"
+	default
 }
 
 src_install() {