4 files changed, 32 insertions, 34 deletions
diff --git a/dev-java/mckoi/ChangeLog b/dev-java/mckoi/ChangeLog
index 6aac37619b2e..2f4b098e02f1 100644
--- a/dev-java/mckoi/ChangeLog
+++ b/dev-java/mckoi/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-java/mckoi
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mckoi/ChangeLog,v 1.7 2004/12/21 11:51:11 axxo Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mckoi/ChangeLog,v 1.8 2005/07/15 19:16:35 axxo Exp $
 
 *mckoi-1.0.3 (21 Dec 2004)
 
diff --git a/dev-java/mckoi/Manifest b/dev-java/mckoi/Manifest
index b4b59f56170b..5c1a420a4ad6 100644
--- a/dev-java/mckoi/Manifest
+++ b/dev-java/mckoi/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d2c5cdf5d98749fb45b846c0d7d393c0 mckoi-1.0.2.ebuild 1576
-MD5 7870a7fe6a97d5791fd41b5235337614 mckoi-1.0.3.ebuild 1243
-MD5 9d84a50ae3dca0d501c10fbe535c8ee8 ChangeLog 1068
+MD5 4a3b007fccb46c20cd2bf4aa6edacc0f mckoi-1.0.2.ebuild 1630
+MD5 4866cf59743ae0d206489329bc23d7f6 mckoi-1.0.3.ebuild 1221
+MD5 0c15a20ef0f158cf57d60b986ae0647d ChangeLog 1068
 MD5 88a45e55f45705b8699507175d106c8e metadata.xml 842
 MD5 1e8a7ec3bae7dc7328124e22a150efef files/digest-mckoi-1.0.2 60
 MD5 082cf5d0acc9ed44d2c2770bb73f14f1 files/digest-mckoi-1.0.3 60
 MD5 8035781e30ce3ccaf159a59d17be2e4c files/build.xml 1453
 MD5 7ed5c070543963c72c14ea6acc8819f6 files/mckoi-1.0.3-jikes.patch 1728
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFByBFB/rLF9B432nYRAmPeAKDIrxFndSsswi6aoCOmlpSWvCmWmgCfaijI
-h71p1znZ4S7Cb7Xk9fIYj0I=
-=LzDY
+iD8DBQFC2Auu/rLF9B432nYRAqF3AKC5eZKzLmkKd7b0Bdni/ooT1S75AwCgvVPw
+8RGf2ZWlzgH4qNjUAvUxaNk=
+=vfm8
 -----END PGP SIGNATURE-----
diff --git a/dev-java/mckoi/mckoi-1.0.2.ebuild b/dev-java/mckoi/mckoi-1.0.2.ebuild
index 1c53a8cff754..1bfb1d44b7f7 100644
--- a/dev-java/mckoi/mckoi-1.0.2.ebuild
+++ b/dev-java/mckoi/mckoi-1.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mckoi/mckoi-1.0.2.ebuild,v 1.6 2004/12/21 11:42:58 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mckoi/mckoi-1.0.2.ebuild,v 1.7 2005/07/15 19:16:35 axxo Exp $
 
 inherit java-pkg
 
@@ -11,9 +11,11 @@ LICENSE="GPL-2"
 SLOT="1"
 KEYWORDS="x86"
 IUSE="doc"
-DEPEND="=dev-java/gnu-regexp-1.1*
+RDEPEND=">=virtual/jre-1.4
+		=dev-java/gnu-regexp-1.1*"
+DEPEND=">=virtual/jdk-1.4
+		${RDEPEND}
 		app-arch/unzip"
-#RDEPEND=""
 S=${WORKDIR}/${PN}${PV}
 
 src_unpack() {
@@ -27,7 +29,7 @@ src_unpack() {
 }
 
 src_compile() {
-	javac -classpath src:lib:$(java-config -p gnu-regexp-1) -d lib/ \
+	javac -classpath src:lib:$(java-pkg_getjars gnu-regexp-1) -d lib/ \
 		src/com/mckoi/runtime/McKoiDBMain.java \
 		src/com/mckoi/JDBCDriver.java \
 		src/com/mckoi/database/jdbcserver/DefaultLocalBootable.java \
@@ -35,11 +37,10 @@ src_compile() {
 		src/com/mckoi/database/control/*.java \
 		src/com/mckoi/tools/*.java \
 		src/com/mckoi/database/regexbridge/GNURegex.java || die
-	(
-		cd lib
-		jar cf mckoidb-${PV}.jar com
-	)
-	if (use doc) ; then
+	cd lib
+	jar cf mckoidb.jar com || die "failed too make jar"
+	cd ${S}
+	if use doc; then
 		javadoc \
 			src/com/mckoi/runtime/McKoiDBMain.java \
 			src/com/mckoi/JDBCDriver.java \
@@ -52,7 +53,7 @@ src_compile() {
 }
 
 src_install() {
-	dodoc LICENSE.txt README.txt db.conf
-	java-pkg_dojar lib/mckoidb-${PV}.jar
+	dodoc README.txt db.conf
+	java-pkg_dojar lib/mckoidb.jar
 	use doc && java-pkg_dohtml -r docs
 }
diff --git a/dev-java/mckoi/mckoi-1.0.3.ebuild b/dev-java/mckoi/mckoi-1.0.3.ebuild
index 6d4586472ede..ef14e39e1ab6 100644
--- a/dev-java/mckoi/mckoi-1.0.3.ebuild
+++ b/dev-java/mckoi/mckoi-1.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mckoi/mckoi-1.0.3.ebuild,v 1.2 2004/12/21 12:04:06 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mckoi/mckoi-1.0.3.ebuild,v 1.3 2005/07/15 19:16:35 axxo Exp $
 
 inherit eutils java-pkg
 
@@ -9,14 +9,15 @@ HOMEPAGE="http://mckoi.com/database/"
 SRC_URI="http://www.mckoi.com/database/ver/${P/-/}.zip"
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="doc jikes"
+RDEPEND=">=virtual/jre-1.4
+	=dev-java/gnu-regexp-1.1*"
 DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}
 	>=dev-java/ant-core-1.6.2
 	app-arch/unzip
 	jikes? ( >=dev-java/jikes-1.21 )"
-RDEPEND=">=virtual/jre-1.4
-	=dev-java/gnu-regexp-1.1*"
 
 S=${WORKDIR}/${P/-/}
 
@@ -31,7 +32,7 @@ src_unpack() {
 	rm *.jar
 
 	cp ${FILESDIR}/build.xml .
-	echo "gnu-regexp.jar=`java-config -p gnu-regexp-1`" > build.properties
+	echo "gnu-regexp.jar=$(java-pkg_getjars gnu-regexp-1)" > build.properties
 
 	cd src/
 	rm -rf net
@@ -39,17 +40,13 @@ src_unpack() {
 
 src_compile() {
 	local antflags="jar"
-	if use doc; then
-		antflags="${antflags} docs"
-	fi
-	if use jikes; then
-		antflags="${antflags} -Dbuild.compiler=jikes"
-	fi
+	use doc && antflags="${antflags} docs"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 	ant ${antflags} || die "compiling failed"
 }
 
 src_install() {
-	dodoc LICENSE.txt README.txt db.conf
+	dodoc README.txt db.conf
 	java-pkg_dojar dist/mckoidb.jar
 
 	if use doc; then