Migrated to gen-2 eclasses, bug #157482.

(Portage version: 2.1.2_rc2-r5)

5 files changed, 94 insertions, 2 deletions

diff --git a/dev-java/jmi-interface/ChangeLog b/dev-java/jmi-interface/ChangeLog
index 6f75d91de8a9..add38ff12b24 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.6 2005/09/22 23:40:00 betelgeuse Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jmi-interface/ChangeLog,v 1.7 2006/12/08 23:56:47 caster Exp $
+
+*jmi-interface-1.0-r2 (08 Dec 2006)
+
+  08 Dec 2006; Vlastimil Babka <caster@gentoo.org>
+  +files/jmi-interface-1.0-enum.patch, +jmi-interface-1.0-r2.ebuild:
+  Migrated to gen-2 eclasses, bug #157482.
 
   22 Sep 2005; Petteri Räty <betelgeuse@gentoo.org>
   jmi-interface-1.0-r1.ebuild:
diff --git a/dev-java/jmi-interface/files/digest-jmi-interface-1.0-r1 b/dev-java/jmi-interface/files/digest-jmi-interface-1.0-r1
index 99aa7483fb18..547d7e590448 100644
--- a/dev-java/jmi-interface/files/digest-jmi-interface-1.0-r1
+++ b/dev-java/jmi-interface/files/digest-jmi-interface-1.0-r1
@@ -1,2 +1,6 @@
 MD5 9a974f9df7a9eefe440ac91b18fef5a7 jmi-1_0-fr-interfaces.zip 38946
+RMD160 9394c77b176bf83287dc2b86e5f8067b7ff7c416 jmi-1_0-fr-interfaces.zip 38946
+SHA256 a5b99f353ffee25b34c8fd628ae896d4fb9af70d2e6433db9e74669ffe456da2 jmi-1_0-fr-interfaces.zip 38946
 MD5 53713768742685cdbaef23e001e958ac mof-1.0.xml.bz2 7076
+RMD160 4cf4dfe3e2f0c7ca0de41cd4b28bd957647e307c mof-1.0.xml.bz2 7076
+SHA256 e4b1f36ec115624625912894f3df07eb705246ec3aa1091d376763521dfc7db1 mof-1.0.xml.bz2 7076
diff --git a/dev-java/jmi-interface/files/digest-jmi-interface-1.0-r2 b/dev-java/jmi-interface/files/digest-jmi-interface-1.0-r2
new file mode 100644
index 000000000000..547d7e590448
--- /dev/null
+++ b/dev-java/jmi-interface/files/digest-jmi-interface-1.0-r2
@@ -0,0 +1,6 @@
+MD5 9a974f9df7a9eefe440ac91b18fef5a7 jmi-1_0-fr-interfaces.zip 38946
+RMD160 9394c77b176bf83287dc2b86e5f8067b7ff7c416 jmi-1_0-fr-interfaces.zip 38946
+SHA256 a5b99f353ffee25b34c8fd628ae896d4fb9af70d2e6433db9e74669ffe456da2 jmi-1_0-fr-interfaces.zip 38946
+MD5 53713768742685cdbaef23e001e958ac mof-1.0.xml.bz2 7076
+RMD160 4cf4dfe3e2f0c7ca0de41cd4b28bd957647e307c mof-1.0.xml.bz2 7076
+SHA256 e4b1f36ec115624625912894f3df07eb705246ec3aa1091d376763521dfc7db1 mof-1.0.xml.bz2 7076
diff --git a/dev-java/jmi-interface/files/jmi-interface-1.0-enum.patch b/dev-java/jmi-interface/files/jmi-interface-1.0-enum.patch
new file mode 100644
index 000000000000..ba12af789cba
--- /dev/null
+++ b/dev-java/jmi-interface/files/jmi-interface-1.0-enum.patch
@@ -0,0 +1,24 @@
+diff -Naur src/javax/jmi/reflect/RefClass.java src2/javax/jmi/reflect/RefClass.java
+--- src/javax/jmi/reflect/RefClass.java	2006-12-09 00:45:59.000000000 +0100
++++ src/javax/jmi/reflect/RefClass.java	2002-05-02 13:44:42.000000000 +0200
+@@ -8,6 +8,6 @@
+     public Collection refAllOfClass();

+     public RefStruct refCreateStruct(RefObject struct, List params);

+     public RefStruct refCreateStruct(String structName, List params);

+-    public RefEnum refGetEnum(RefObject enum, String name);

++    public RefEnum refGetEnum(RefObject enumObj, String name);

+     public RefEnum refGetEnum(String enumName, String name);

+ }
+\ No newline at end of file
+diff -Naur src/javax/jmi/reflect/RefPackage.java src2/javax/jmi/reflect/RefPackage.java
+--- src/javax/jmi/reflect/RefPackage.java	2006-12-09 00:46:08.000000000 +0100
++++ src/javax/jmi/reflect/RefPackage.java	2002-05-02 13:44:16.000000000 +0200
+@@ -14,7 +14,7 @@
+     public Collection refAllAssociations();

+     public RefStruct refCreateStruct(RefObject struct, List params);

+     public RefStruct refCreateStruct(String structName, List params);

+-    public RefEnum refGetEnum(RefObject enum, String name);

++    public RefEnum refGetEnum(RefObject enumObj, String name);

+     public RefEnum refGetEnum(String enumName, String name);

+     public void refDelete();

+ } 

diff --git a/dev-java/jmi-interface/jmi-interface-1.0-r2.ebuild b/dev-java/jmi-interface/jmi-interface-1.0-r2.ebuild
new file mode 100644
index 000000000000..07e7c3d75b0f
--- /dev/null
+++ b/dev-java/jmi-interface/jmi-interface-1.0-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2006 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-r2.ebuild,v 1.1 2006/12/08 23:56:47 caster Exp $
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java Metadata Interface Sample Class Interface"
+HOMEPAGE="http://java.sun.com/products/jmi/"
+JMI_ZIP="jmi-${PV/./_}-fr-interfaces.zip"
+MOF_XML="mof-${PV}.xml.bz2"
+SRC_URI="mirror://gentoo/${JMI_ZIP}
+		 mirror://gentoo/${MOF_XML}"
+
+LICENSE="sun-bcla-jmi"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE="doc source"
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	dev-java/ant-core
+	source? ( app-arch/zip )"
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	mkdir "${S}/src" && cd "${S}/src"
+	unpack ${JMI_ZIP}
+
+	cd "${S}"
+	# rename enum keywords because javadoc hates them
+	# even with -source 1.4, bummer
+	epatch "${FILESDIR}/${P}-enum.patch"
+	cp "${FILESDIR}/${P}-build.xml" build.xml
+
+	#adding mof.xml required by Netbeans #98603
+	mkdir -p "${S}/build/javax/jmi/model/resources"
+	cd "${S}/build/javax/jmi/model/resources"
+	unpack ${MOF_XML}
+}
+
+src_compile() {
+	eant jar $(use_doc)
+}
+
+src_install() {
+	java-pkg_dojar dist/*.jar
+
+	use doc && java-pkg_dojavadoc doc
+	use source && java-pkg_dosrc src/javax
+}