--- dev-scheme/hop/hop-2.0.0.ebuild	2010-01-29 11:29:42.020562582 +0100
+++ dev-scheme/hop/hop-2.0.0-r1.ebuild	2010-01-29 13:39:53.848887964 +0100
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI="2"
+
 inherit multilib eutils
 
 MY_P=${P/_/-}
@@ -14,9 +16,8 @@
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND=">=dev-scheme/bigloo-3.3a
-		ssl? ( dev-scheme/bigloo[ssl] )
-		threads? ( dev-scheme/bigloo[threads] )"
+DEPEND=">=dev-scheme/bigloo-3.3a[ssl?,threads?]"
+
 RDEPEND="${DEPEND}"
 
 IUSE="ssl threads"
@@ -28,11 +29,13 @@
 	enewuser hop -1 -1 /var/www hop
 }
 
-src_compile() {
+src_configure() {
 	# Hop doesn't use autoconf and consequently a lot of options used by econf give errors
 	# Manuel Serrano says: "Please, dont talk to me about autoconf. I simply dont want to hear about it..."
 	./configure --prefix=/usr --mandir=/usr/share/man --libdir=/usr/$(get_libdir) --etcdir=/etc/hop $(use_enable ssl) $(use_enable threads) || die "configure failed"
+}
 
+src_compile() {
 	emake || die "emake failed"
 }