Removed the older version because it does not work with Netbeans. Fixed emerging with a 1.5 jdk.

Package-Manager: portage-2.0.51.22-r2

6 files changed, 17 insertions, 63 deletions

diff --git a/dev-java/jmi-interface/ChangeLog b/dev-java/jmi-interface/ChangeLog
index d3108c8b4de8..9e4cc25ce572 100644
--- a/dev-java/jmi-interface/ChangeLog
+++ b/dev-java/jmi-interface/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jmi-interface
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jmi-interface/ChangeLog,v 1.3 2005/07/19 18:38:59 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jmi-interface/ChangeLog,v 1.4 2005/08/12 22:31:34 betelgeuse Exp $
+
+  12 Aug 2005; Petteri Räty <betelgeuse@gentoo.org>
+  files/jmi-interface-1.0-build.xml, -jmi-interface-1.0.ebuild,
+  jmi-interface-1.0-r1.ebuild:
+  Removed the older version because it does not work with Netbeans.
+  Fixed emerging with a 1.5 jdk.
 
 *jmi-interface-1.0-r1 (19 Jul 2005)
 
diff --git a/dev-java/jmi-interface/Manifest b/dev-java/jmi-interface/Manifest
index 2b8d3296b47f..1000e38797bb 100644
--- a/dev-java/jmi-interface/Manifest
+++ b/dev-java/jmi-interface/Manifest
@@ -1,17 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f19ec1ed2c45153964b090d800c9437a jmi-interface-1.0.ebuild 1067
-MD5 90c65e7d3c32de103b10d52cebb105df ChangeLog 775
-MD5 48dbe00d8b58797895691aa5d8d85dc6 jmi-interface-1.0-r1.ebuild 1338
+MD5 1bf2dd6061118fe3aca34c3d3762b642 jmi-interface-1.0-r1.ebuild 1344
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 41b714faf1253e1c06640f7452bf07e2 ChangeLog 1031
 MD5 a3afc86e56133eabd4f8206fbf00ffa3 files/digest-jmi-interface-1.0-r1 127
-MD5 c32e1638d6cfd4da9fa8d2d9a22974a3 files/jmi-interface-1.0-build.xml 1510
-MD5 214ca012130654d654a8b8121a0fd561 files/digest-jmi-interface-1.0 69
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC3Uje/rLF9B432nYRAqslAJ99xTOe1grsF5tyyqhfUk0bPadg5wCgmLXP
-Cirx78PuQJadqtY7LdBvwqQ=
-=GZRo
------END PGP SIGNATURE-----
+MD5 1edf4d1017b6758ffd9c2ea3a64f3277 files/jmi-interface-1.0-build.xml 1676
diff --git a/dev-java/jmi-interface/files/digest-jmi-interface-1.0 b/dev-java/jmi-interface/files/digest-jmi-interface-1.0
deleted file mode 100644
index d9d25da4855e..000000000000
--- a/dev-java/jmi-interface/files/digest-jmi-interface-1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9a974f9df7a9eefe440ac91b18fef5a7 jmi-1_0-fr-interfaces.zip 38946
diff --git a/dev-java/jmi-interface/files/jmi-interface-1.0-build.xml b/dev-java/jmi-interface/files/jmi-interface-1.0-build.xml
index f9967c1a28e0..c14915fd1761 100644
--- a/dev-java/jmi-interface/files/jmi-interface-1.0-build.xml
+++ b/dev-java/jmi-interface/files/jmi-interface-1.0-build.xml
@@ -5,8 +5,9 @@
 	<property name="src.dir"     value="src"   />
 	<property name="build.dir"   value="build" />
 	<property name="dist.dir"    value="dist"  />
-        <property name="doc.dir"     value="doc"   />
+    <property name="doc.dir"     value="doc"   />
 	<property name="jarfile"     value="${ant.project.name}.jar"/>
+	<property name="source.jdk.version" value="1.4" />
 
 	<!-- init -->
    <target name="init">
@@ -17,7 +18,8 @@
 
 	<!-- compile everything -->
    <target name="compile" depends="init">
-      <javac srcdir="${src.dir}" destdir="${build.dir}"/>
+      <javac srcdir="${src.dir}" destdir="${build.dir}" 
+       source="${source.jdk.version}" target="${source.jdk.version}"/>
    </target>
 
 	<!-- build the jar file -->
@@ -41,6 +43,7 @@
                  version="true"
                  use="true"
                  windowtitle="${ant.project.name} API"
+                 source="${source.jdk.version}"
         />
     </target>
 
diff --git a/dev-java/jmi-interface/jmi-interface-1.0-r1.ebuild b/dev-java/jmi-interface/jmi-interface-1.0-r1.ebuild
index 9bfa19b8cf4c..38703df6201e 100644
--- a/dev-java/jmi-interface/jmi-interface-1.0-r1.ebuild
+++ b/dev-java/jmi-interface/jmi-interface-1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jmi-interface/jmi-interface-1.0-r1.ebuild,v 1.1 2005/07/19 18:38:59 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jmi-interface/jmi-interface-1.0-r1.ebuild,v 1.2 2005/08/12 22:31:34 betelgeuse Exp $
 
 inherit java-pkg
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${JMI_ZIP}
 
 LICENSE="sun-bcla-jmi"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc jikes source"
 
 DEPEND=">=virtual/jdk-1.4
diff --git a/dev-java/jmi-interface/jmi-interface-1.0.ebuild b/dev-java/jmi-interface/jmi-interface-1.0.ebuild
deleted file mode 100644
index 4a24cfa2f787..000000000000
--- a/dev-java/jmi-interface/jmi-interface-1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jmi-interface/jmi-interface-1.0.ebuild,v 1.4 2005/07/16 08:55:43 axxo Exp $
-
-inherit java-pkg
-
-DESCRIPTION="Java Metadata Interface Sample Class Interface"
-HOMEPAGE="http://java.sun.com/products/jmi/"
-SRC_URI="mirror://gentoo/jmi-${PV/./_}-fr-interfaces.zip"
-
-LICENSE="sun-bcla-jmi"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE="doc jikes source"
-
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	jikes? ( dev-java/jikes )
-	source? ( app-arch/zip )"
-RDEPEND=">=virtual/jre-1.4"
-
-S=${WORKDIR}
-
-src_unpack() {
-	cp ${FILESDIR}/${P}-build.xml ${S}/build.xml
-
-	mkdir ${S}/src
-	unzip -q -d ${S}/src ${DISTDIR}/${A} || die
-}
-
-src_compile() {
-	local antflags="jar"
-	use doc && antflags="${antflags} javadoc"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags} || die "Failed to compile"
-}
-
-src_install() {
-	use doc && java-pkg_dohtml -r doc/*
-	use source && java-pkg_dosrc src/*
-	java-pkg_dojar dist/*.jar
-}