Migrated to gen-2 eclasses, bug #157482.

Package-Manager: portage-2.1.2_rc2-r5

diff --git a/dev-java/jmi-interface/ChangeLog b/dev-java/jmi-interface/ChangeLog
index 6f75d91de8a9f8557a4508d9ed14d08d0ac474e3..add38ff12b24b7451725fcbe907917e782f71935 100644 (file)
--- 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/Manifest b/dev-java/jmi-interface/Manifest
index 0259ae919eee29aa3b3c94c79ad536f3d397dd94..3779e848cfc994423c8ba039003a237202f37dc2 100644 (file)
--- a/dev-java/jmi-interface/Manifest
+++ b/dev-java/jmi-interface/Manifest
@@ -1,15 +1,32 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7fde9f7f604762e5b44a8547a42ef64d ChangeLog 1317
+AUX jmi-interface-1.0-build.xml 1676 RMD160 365e1cbefd8d0708e87b528f1b4beac061d8c81d SHA1 cb7b49e029a2020a007d0800a9239ba37e1e1aed SHA256 70e713494df10336cb8c4aa6646579158106ac6c7c1c1aefe515c0d767ff3d7c
+MD5 1edf4d1017b6758ffd9c2ea3a64f3277 files/jmi-interface-1.0-build.xml 1676
+RMD160 365e1cbefd8d0708e87b528f1b4beac061d8c81d files/jmi-interface-1.0-build.xml 1676
+SHA256 70e713494df10336cb8c4aa6646579158106ac6c7c1c1aefe515c0d767ff3d7c files/jmi-interface-1.0-build.xml 1676
+AUX jmi-interface-1.0-enum.patch 1334 RMD160 b64a14dac26e6166733b68c6849bdccf3f39862e SHA1 bd4d09be7895715418d9a2378bf4712beb0e7f0e SHA256 38598be041414d96344c8507ef3e0958f655d370e2f6fd1efc3bc4b48c5ecd54
+MD5 d09aacdef6f4d3853ddd8c54b7217dc3 files/jmi-interface-1.0-enum.patch 1334
+RMD160 b64a14dac26e6166733b68c6849bdccf3f39862e files/jmi-interface-1.0-enum.patch 1334
+SHA256 38598be041414d96344c8507ef3e0958f655d370e2f6fd1efc3bc4b48c5ecd54 files/jmi-interface-1.0-enum.patch 1334
+DIST jmi-1_0-fr-interfaces.zip 38946 RMD160 9394c77b176bf83287dc2b86e5f8067b7ff7c416 SHA1 0a0c8a2548dbc27a2a528b1e2542cf25d57e8b86 SHA256 a5b99f353ffee25b34c8fd628ae896d4fb9af70d2e6433db9e74669ffe456da2
+DIST mof-1.0.xml.bz2 7076 RMD160 4cf4dfe3e2f0c7ca0de41cd4b28bd957647e307c SHA1 8553ead360a339f1fd7772eff766187935a32e27 SHA256 e4b1f36ec115624625912894f3df07eb705246ec3aa1091d376763521dfc7db1
+EBUILD jmi-interface-1.0-r1.ebuild 1362 RMD160 356ea78a899af32a23c40618fdbcd0957c8a58e3 SHA1 1b1ddc8d279f2a4790d1a1fd38496587d6e1bace SHA256 66daf84bde05a935830d233b4068c8ac925636f62bf305ecfdfd72d61b767e5f
 MD5 8d51798cccad708c61088dbc7d91fa7e jmi-interface-1.0-r1.ebuild 1362
+RMD160 356ea78a899af32a23c40618fdbcd0957c8a58e3 jmi-interface-1.0-r1.ebuild 1362
+SHA256 66daf84bde05a935830d233b4068c8ac925636f62bf305ecfdfd72d61b767e5f jmi-interface-1.0-r1.ebuild 1362
+EBUILD jmi-interface-1.0-r2.ebuild 1286 RMD160 9c7bd119315255b772ac3c07712149876192a97f SHA1 adad70024444f0a8608a50206095f4192d329763 SHA256 3287054217616c8c14f3615ee362eb3b538f193520b53272950e7f3721530197
+MD5 8d720444a8e448e442a17d3b1835aa18 jmi-interface-1.0-r2.ebuild 1286
+RMD160 9c7bd119315255b772ac3c07712149876192a97f jmi-interface-1.0-r2.ebuild 1286
+SHA256 3287054217616c8c14f3615ee362eb3b538f193520b53272950e7f3721530197 jmi-interface-1.0-r2.ebuild 1286
+MISC ChangeLog 1514 RMD160 8652a732b7433174b4283575b6b7a6ea5b5cfefa SHA1 71ba85fa0ef9f9eb9f936cb725304767fff070fc SHA256 39dc090ce6291757cfed04f19eb95099e1b3a0cc8b367fe86e4f6d9da8192759
+MD5 0d0cc187c8a9ef256d6927301bceff63 ChangeLog 1514
+RMD160 8652a732b7433174b4283575b6b7a6ea5b5cfefa ChangeLog 1514
+SHA256 39dc090ce6291757cfed04f19eb95099e1b3a0cc8b367fe86e4f6d9da8192759 ChangeLog 1514
+MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 a3afc86e56133eabd4f8206fbf00ffa3 files/digest-jmi-interface-1.0-r1 127
-MD5 1edf4d1017b6758ffd9c2ea3a64f3277 files/jmi-interface-1.0-build.xml 1676
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDM0ELQiJ/wx066S4RApUyAJ9lp3wmcO/BmQ688phBY7T27gryegCfdWmW
-8g3vNkk1OLPNyWrA1sOz+Dk=
-=9Pic
------END PGP SIGNATURE-----
+RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
+SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
+MD5 834035ecd597fc900901d3849bbf0135 files/digest-jmi-interface-1.0-r1 473
+RMD160 d094ea34e03da69554afa1d99206296a744fb18f files/digest-jmi-interface-1.0-r1 473
+SHA256 26fa297fb4780c73a3e85333524378ec3cf6245ea153306e47a9bd3454feaa02 files/digest-jmi-interface-1.0-r1 473
+MD5 834035ecd597fc900901d3849bbf0135 files/digest-jmi-interface-1.0-r2 473
+RMD160 d094ea34e03da69554afa1d99206296a744fb18f files/digest-jmi-interface-1.0-r2 473
+SHA256 26fa297fb4780c73a3e85333524378ec3cf6245ea153306e47a9bd3454feaa02 files/digest-jmi-interface-1.0-r2 473

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 99aa7483fb184d3fd9729b3cb55921aa9fe31b6c..547d7e5904482c70532bb1cd144111bb730e812f 100644 (file)
--- 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 (file)
index 0000000..547d7e5
--- /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 (file)
index 0000000..ba12af7
--- /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();\r
+     public RefStruct refCreateStruct(RefObject struct, List params);\r
+     public RefStruct refCreateStruct(String structName, List params);\r
+-    public RefEnum refGetEnum(RefObject enum, String name);\r
++    public RefEnum refGetEnum(RefObject enumObj, String name);\r
+     public RefEnum refGetEnum(String enumName, String name);\r
+ }
+\ 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();\r
+     public RefStruct refCreateStruct(RefObject struct, List params);\r
+     public RefStruct refCreateStruct(String structName, List params);\r
+-    public RefEnum refGetEnum(RefObject enum, String name);\r
++    public RefEnum refGetEnum(RefObject enumObj, String name);\r
+     public RefEnum refGetEnum(String enumName, String name);\r
+     public void refDelete();\r
+ } \r

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 (file)
index 0000000..07e7c3d
--- /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
+}