--- eclipse-sdk-3.7.1.ebuild.orig	2011-11-03 12:43:50.519793374 +0100
+++ eclipse-sdk-3.7.1.ebuild	2011-11-03 11:04:21.939864334 +0100
@@ -26,6 +26,7 @@
 #	${BASE_URI}eclipse-build-${ECLIPSE_BUILD_VER}.tar.xz"
 
 LICENSE="EPL-1.0"
+RESTRICT="mirror"
 SLOT="3.7"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc gnome source"
@@ -48,8 +49,8 @@
 	>=dev-java/sat4j-core-2.3.0:2
 	>=dev-java/sat4j-pseudo-2.3.0:2
 	dev-java/tomcat-servlet-api:2.5
-	>=www-servers/jetty-6.1.23:6
-	>=www-servers/tomcat-5.5.17:5.5
+	>=www-servers/tomcat-7:7
+	java-virtuals/jetty-server:6
 	x86? ( gnome? ( gnome-base/gconf ) )"
 RDEPEND="${CDEPEND}
 	>=virtual/jre-1.5"
@@ -92,7 +93,7 @@
 	'org.apache.commons.httpclient - commons-httpclient-3'
 #	'org.apache.commons.httpclient jakarta-commons-httpclient-3.1 commons-httpclient-3'
 	'org.apache.commons.logging apache-commons-logging commons-logging'
-	'org.apache.jasper - tomcat-5.5 jasper-compiler jasper-runtime'
+	'org.apache.jasper - tomcat-7 jasper jasper-el'
 	'org.apache.lucene.core - lucene-2.9'
 #	'org.apache.lucene.core lucene lucene-2.9'
 	'org.apache.lucene.analysis - lucene-analyzers-2.9'
@@ -138,9 +139,27 @@
 ALL_WS='carbon cocoa gtk motif photon win32 wpf'
 ALL_ARCH='alpha arm ia64 mips mipsel PA_RISC ppc ppc64 s390 s390x sparc sparc64 x86 x86_64'
 
+pkg_pretend() {
+	CHECKREQS_MEMORY="1536M"
+	if use doc ; then
+		CHECKREQS_DISK_BUILD="3072M"
+	else
+		CHECKREQS_DISK_BUILD="1536M"
+	fi
+	check-reqs_pkg_pretend
+}
+
 buildDir="${S}/build/eclipse-${BUILD_VER}-src"
 
 pkg_setup() {
+	CHECKREQS_MEMORY="1536M"
+	if use doc ; then
+		CHECKREQS_DISK_BUILD="3072M"
+	else
+		CHECKREQS_DISK_BUILD="1536M"
+	fi
+
+	check-reqs_pkg_setup
 	ws='gtk'
 	if use x86 ; then os='linux' ; arch='x86'
 	elif use amd64 ; then os='linux' ; arch='x86_64'
@@ -155,14 +174,6 @@
 }
 
 src_unpack() {
-	CHECKREQS_MEMORY="1536"
-	if use doc ; then
-		CHECKREQS_DISK_BUILD="3072"
-	else
-		CHECKREQS_DISK_BUILD="1536"
-	fi
-	check_reqs
-
 	unpack "eclipse-build-${ECLIPSE_BUILD_VER}.tar.bz2"
 	#tar -xpJf "${DISTDIR}/eclipse-build-${ECLIPSE_BUILD_VER}.tar.xz"
 	ln -s "${DISTDIR}/eclipse-${BUILD_VER}-src.tar.bz2" "${S}/eclipse-${BUILD_VER}-src.tar.bz2" || die