3 files changed, 26 insertions, 25 deletions
diff --git a/dev-scheme/kawa/ChangeLog b/dev-scheme/kawa/ChangeLog
index a28bceb26ab7..009d393b38ba 100644
--- a/dev-scheme/kawa/ChangeLog
+++ b/dev-scheme/kawa/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-scheme/kawa
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/kawa/ChangeLog,v 1.10 2009/11/30 19:51:42 ulm Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/kawa/ChangeLog,v 1.11 2010/06/28 23:30:54 chiiph Exp $
+
+*kawa-1.9.90-r1 (29 Jun 2010)
+
+  29 Jun 2010; Tomas Touceda <chiiph@gentoo.org> -kawa-1.9.90.ebuild,
+  +kawa-1.9.90-r1.ebuild:
+  Revbump, change swt dependency to swt:3.5. Port to EAPI 3
 
 *kawa-1.9.90 (30 Nov 2009)
 
diff --git a/dev-scheme/kawa/Manifest b/dev-scheme/kawa/Manifest
index bb446429b3ec..716dff817349 100644
--- a/dev-scheme/kawa/Manifest
+++ b/dev-scheme/kawa/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX kawa-1.9.90.patch 949 RMD160 8e5e1649e55f0c16f03463aea4f780f621d5f15e SHA1 8a2fea2f5269f6f7bc357ee31cdf7ac83664e71c SHA256 943dcf79cdeff184e026a41cb658ba270be721b5a1f64c7bfc5a2b94ea17553f
 DIST XQTS_1_0_2.zip 19879467 RMD160 1dd6219b7c2d0c04deca41d2efa7966136fc5a14 SHA1 8e6d06b674f0acbbdacec2a8b4a0fb3d33419a6f SHA256 923361362d70a20818c6442eb52a6401fe9d2e53e4f52ee8b4d7fb1c841b4443
 DIST kawa-1.9.1.tar.gz 1973504 RMD160 db2f7f131132aa92c9fe782f93d5a2305b605108 SHA1 6b7d4c3011f4de550f6b0718e6321e0380c5903b SHA256 590da119e1a130c059cdb08dcf0a17a2d27f14020bd51b99a8318554b57a77d9
 DIST kawa-1.9.90.tar.gz 2079745 RMD160 4ad74f206078b3d259d3089e9b0d8f2b03feaf9b SHA1 5c262e586fc3ba1d005d024cc2bb17098709c7d5 SHA256 11152de647e93ea966883bc59f761033520ce1e3e4c9e3cc9f7b5ba1d0d5f4b7
 EBUILD kawa-1.9.1.ebuild 827 RMD160 89a955a70f3da286c275e8c8a01dfb2f96adf927 SHA1 4e1b7bed281e69039b77fc55525983a36fa2ae5e SHA256 df03b8dc38fdee5bff67b25744e7b17c6c569dd7a8a55b3053ae686de6ef8b85
-EBUILD kawa-1.9.90.ebuild 2965 RMD160 9c0e090158ae3686d73a680fa697c76fa7de4f7d SHA1 df27751c57526f0f47d2e9d732e54fc437020e8b SHA256 0de3215e04f4dc1e4691baa4edb2a696b4e66c6323e1888e6638e67d9c67ee28
-MISC ChangeLog 2116 RMD160 1c96d805befc776e8de75c4dc433e01be670ed21 SHA1 58d907fb90c4073e40da67da05b8e68cf5ef8037 SHA256 a2c9e2d0b5e6d936a3c75b4400f68fad7b28909d80cee347bf3f3d4926224e4d
+EBUILD kawa-1.9.90-r1.ebuild 3031 RMD160 b02f6ea16ec08445bace52a13c3133b19b407b47 SHA1 e80fa74f8b98c8780673c5cc499db639138bc306 SHA256 bf358d9748b0004ef305bad40801c5a9aa034ab97f4f703c4a39181d6552aa6d
+MISC ChangeLog 2307 RMD160 f3c7d40ad164bc6b76d29bdc0e5d1e03e623b4a0 SHA1 1bc014574b8bf583346a1af8cee9b5bf5efd6f99 SHA256 46472a49a03246c9ec5495b442cfda62756f554b6a6cc1460d3294fc1b5aec54
 MISC metadata.xml 1281 RMD160 243ff2d208de06d8cf5512fea00a381d59e467c6 SHA1 366a6fda5b8c462eb951cb2396e4404163e7784c SHA256 39872500001989ac7d35446dfafc1d9e3e606b07ce2b3f590e34114ee389f173
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.10 (GNU/Linux)
-
-iEYEARECAAYFAksUIucACgkQOeoy/oIi7uz9GQCdHRlPwtdt+0z8f8MHIMzX/YU3
-GwoAoIqfpffcoqrFfGoWvxDR89FAyyHR
-=hh6V
------END PGP SIGNATURE-----
diff --git a/dev-scheme/kawa/kawa-1.9.90.ebuild b/dev-scheme/kawa/kawa-1.9.90-r1.ebuild
index 90b7782cf69d..532aa0db5f6d 100644
--- a/dev-scheme/kawa/kawa-1.9.90.ebuild
+++ b/dev-scheme/kawa/kawa-1.9.90-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/kawa/kawa-1.9.90.ebuild,v 1.1 2009/11/30 19:51:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/kawa/kawa-1.9.90-r1.ebuild,v 1.1 2010/06/28 23:30:54 chiiph Exp $
 
-EAPI="1"
+EAPI="3"
 
 JAVA_PKG_IUSE="source"
 
@@ -25,7 +25,7 @@ COMMON_DEPEND="( >=virtual/jdk-1.5 )
 			   frontend? ( sys-libs/readline:0 )
 			   sax? ( dev-java/sax:0 )
 			   echo2? ( dev-java/echo2 )
-			   swt? ( dev-java/swt:3 )
+			   swt? ( dev-java/swt:3.5 )
 			   servlets? ( dev-java/servletapi:2.4 )"
 DEPEND="${COMMON_DEPEND}
 		xqtests? ( app-arch/unzip:0 )"
@@ -35,9 +35,6 @@ xtestsuite="XQTS_${XQTS_Ver}"
 
 src_unpack () {
 	unpack kawa-${PV}.tar.gz || die
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}.patch
-
 	if use xqtests; then
 		mkdir "${WORKDIR}/${xtestsuite}" || die
 		cd "${WORKDIR}/${xtestsuite}" || die
@@ -45,7 +42,11 @@ src_unpack () {
 	fi
 }
 
-src_compile() {
+src_prepare() {
+	epatch "${FILESDIR}"/${P}.patch
+}
+
+src_configure() {
 	# speeds up one-shot ebuilds.
 	myconf="--disable-dependency-tracking"
 	if use jemacs && ! use swing; then
@@ -64,7 +65,7 @@ src_compile() {
 		myconf="${myconf} --with-servlet=$(java-pkg_getjar servletapi-2.4 servlet-api.jar)"
 	fi
 	if use swt; then
-		myconf="${myconf} --with-swt=$(java-pkg_getjar swt-3 swt.jar)"
+		myconf="${myconf} --with-swt=$(java-pkg_getjar swt-3.5 swt.jar)"
 	fi
 
 	econf ${myconf} $(use_enable frontend kawa-frontend) \
@@ -75,7 +76,9 @@ src_compile() {
 		  $(use_with awt) \
 		  $(use_with sax sax2) \
 		  --with-java-source=$(java-pkg_get-source) || die "econf failed."
+}
 
+src_compile() {
 	emake -j1 || die "emake failed."
 }
 
@@ -88,8 +91,10 @@ src_install () {
 	java-pkg_dolauncher "kawa" --main kawa.repl || die "dolauncher failed"
 	java-pkg_dolauncher "qexo" --main kawa.repl --pkg_args \
 		"--xquery" || die "dolauncher qexo failed"
-	java-pkg_dolauncher "kawa-cgi-servlet" --main \
-		gnu.kawa.servlet.CGIServletWrapper || die
+	if use servlets; then
+		java-pkg_dolauncher "kawa-cgi-servlet" --main \
+			gnu.kawa.servlet.CGIServletWrapper || die
+	fi
 	if use jemacs; then
 		java-pkg_dolauncher "jemacs" --main \
 			gnu.jemacs.lang.ELisp || die