Migrate to EAPI 2.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.29-rc6 i686

3 files changed, 38 insertions, 38 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/Manifest b/www-apps/dspam-web/Manifest
index 396768916610..4c42e9bc63a4 100644
--- a/www-apps/dspam-web/Manifest
+++ b/www-apps/dspam-web/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX htaccess 135 RMD160 4f79db8e1bdf56ef86b922d2a87a7c2a1ba78d71 SHA1 f1cdf9aa23cef60ccc48f2303699b467bf7a98b5 SHA256 e0c0da58eea5ef6af65cc03c22eaa47ad4f6584cec0f6430817f836d60457c3b
 AUX htpasswd 19 RMD160 9ef909dbde45fd311062229354ba56c76174fa96 SHA1 d5e269924684fdda909b364638d378e64cc1646f SHA256 0fae2fe609644c4c631385e0f4127bb1a19dcf18013871c8353117f38fa7ea2a
 AUX postinst-en.txt 935 RMD160 8ac16b059581ac3d4a8f6adb28cbba7fd185671f SHA1 4f5914e32d216cee1a97d806c29569f93e847f21 SHA256 9d864da422c9e28e8ac645a2534af7a885d22ff4b49e5b7ef938e8bb84ea81dc
 AUX setperms 255 RMD160 4b29c87a2d1129c9aa9a7df9e2a6f412aeb029c8 SHA1 17f1bab63693018be6dbbb4ec7e4d1a5658f9fac SHA256 85cfd1a8a6e322698c5e09573dfb4e04220e8642d1835e9a7eedbb809736e9ed
 DIST dspam-3.8.0-patches-20071231.tar.gz 15159 RMD160 7c26a94a52832221954b7cf894c7651b0b0c6258 SHA1 fc3b29894cd5b53beb2b4b7e777d6fce714b2744 SHA256 d56d86bf245c06a1fc175c1e9e75429cc5b0900d2f9a3a346209c707e0f69754
 DIST dspam-3.8.0.tar.gz 726160 RMD160 e7831e2415e30e819dd9cbc0ba3f269e113e2fb9 SHA1 d1de7ee2134522adaf52f49167accecf1589fa96 SHA256 84a227934a7aee73516bdb82c33ee7b359e955c8cd95a1544a9a13069f79bfc7
-EBUILD dspam-web-3.8.0-r1.ebuild 2849 RMD160 88620655e858c43ad64cd10c878236035a351abf SHA1 e65b09c31c36b196f17ede3ff761b3c4ef3cfeec SHA256 807ee77e60e9ffff303d633fa56cac7dcccb8a6b48d8af0fb7322a2b7cffebf0
-MISC ChangeLog 6749 RMD160 2ddf259abb96150f07dff75a030b70f72f4396e0 SHA1 f4d5d6e6839d6f191b7a6ca0f6e67ea453bd0c69 SHA256 4a93bc741eaff8fb8e9dba2ec5b5f7520255c03c71816a3226e8458247d57373
+EBUILD dspam-web-3.8.0-r1.ebuild 2083 RMD160 0518e8c3cac8d9131439e59aa43b048b8c1a56c2 SHA1 f5393fc40e395dc2f16ab514d5b65b1970c0bf01 SHA256 9b5d844f5aee6701dc65b9fd6de5b559c263e22dfb831eac0b8d2104f56ddc7b
+MISC ChangeLog 6980 RMD160 19efa5744b8ff391225c2ee8abba063d8976d525 SHA1 7179c7a7a2e0da3ac953a2a665303cf15a0c74d3 SHA256 470ff308e2811bfed69c9d20d5f0b2cd307db15c77e55d31460539a80959ba86
 MISC metadata.xml 368 RMD160 47f34b035d0fc01757f976cb57a03373126f467f SHA1 ee7c74643fec7d1aba07021ad024bb71df713102 SHA256 7335198385eb9536d0b1b60080ca3336b70ea8defb53371d1e244249124a106e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAkmy3kkACgkQcxLzpIGCsLQ1+wCfdX2Nw6uTdiOlF66k9icOpSqp
+ejIAn2+Rg38faz1EeKYT36yXs2MjDGQs
+=t+e2
+-----END PGP SIGNATURE-----
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() {