convert to gen-2 java eclasses by Vlastimil Babka in bug #258334

Package-Manager: portage-2.2_rc23/cvs/Linux i686

4 files changed, 37 insertions, 19 deletions

diff --git a/media-gfx/aoi/ChangeLog b/media-gfx/aoi/ChangeLog
index 952d5e2b7468..77cb26dae34f 100644
--- a/media-gfx/aoi/ChangeLog
+++ b/media-gfx/aoi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/aoi
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/aoi/ChangeLog,v 1.21 2007/12/10 16:02:04 maekke Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/aoi/ChangeLog,v 1.22 2009/02/09 19:49:56 maekke Exp $
+
+  09 Feb 2009; Markus Meier <maekke@gentoo.org> aoi-2.2.1.ebuild,
+  aoi-2.5.ebuild:
+  convert to gen-2 java eclasses by Vlastimil Babka in bug #258334
 
 *aoi-2.5 (10 Dec 2007)
 
diff --git a/media-gfx/aoi/Manifest b/media-gfx/aoi/Manifest
index ed4c5c21271f..36ed05542bc1 100644
--- a/media-gfx/aoi/Manifest
+++ b/media-gfx/aoi/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX aoi 857 RMD160 4d4f4b66db5c45416d0d457e0b4a44caf105f5c7 SHA1 731546ae56028377508c0faa23fd3e7dc080e808 SHA256 f1da30c09e81271c31e42129fd0b3e5278cfcb712e81e4b7f21a901376841132
 DIST aoi221.zip 2653431 RMD160 8ac3af71ce5485799eb0ec26c5d71894d02f0376 SHA1 bc01309b6d48d947cf1c36496bad1f9ed40123b5 SHA256 7cd0f992dd032309d70b335f5c9748b71428bf66b28adc03774b23e4a686abc0
 DIST aoi25.zip 4529346 RMD160 62f536d4558ef14f4e1d4d1ac03b5e3b814955d3 SHA1 d1b8ad0ab4afed56b225fa92b80d3df7d8667ced SHA256 4b2fef9afa9015fda0d6b7e8fa684d83081f0c83f184330c9432cbd5ccda5231
 DIST manual2.2.zip 11458498 RMD160 d5d7e92df016f36109eb4d0ae21bb9d66e1f0687 SHA1 f78f446d43a6ee8fb3579b875b35273caeee0f19 SHA256 182782e006b03b3fc94ed35a82b9d4eead7695eb4a9a1c010e8cd4afd512d922
 DIST manual2.3.zip 11511867 RMD160 bcdadf4adfd47e5324406778dc23ddc8c6b519ef SHA1 d8152a3d51296babd6d124a70c388342e036b731 SHA256 d517bf915c5382cec7ef98aff84f9d6eea60e137cbd7e4a83c9d2e02d7b56de3
-EBUILD aoi-2.2.1.ebuild 1167 RMD160 fe4eadc9d63df82d23e9e06b8e1cdd92c0e1d45e SHA1 e8dddc79b1c1745bae9b855ebbac6269259efca0 SHA256 7a395301c81827ba5ca8b94425b300d15644e6c4d3999e2075dd7bc550619334
-EBUILD aoi-2.5.ebuild 1163 RMD160 37d22060a2edacd2f9fab28807424398ed98794e SHA1 4fd1170a022f5878fc35390b9b9922216ceba737 SHA256 ec26e397052168d6caca479e56fe481ecece8aeae7a93dd34e1d8f92f303b6a7
-MISC ChangeLog 3085 RMD160 0d5fbb379e0996b1b1085ace0b0c8a0cff5a9bc6 SHA1 ff3de03db17abe6e4fef5d5d33de649ea429a9d3 SHA256 30cee0f6c43c7caedfc8e4a4439df21c67a01b5183581d4c818751e33b4436c6
+EBUILD aoi-2.2.1.ebuild 1219 RMD160 f14e1597820083e4da367bfe9b2fa4df09e08758 SHA1 1b72b75660e7265c099e676ab97817268942da2c SHA256 db81d4da2eea9f48d711b8edda931f2667f0827c802acd0912f4635747f311da
+EBUILD aoi-2.5.ebuild 1214 RMD160 f8f6b9d7d989e9b8458df99aec509b0cf6c0f21d SHA1 91eca044c37475ae874ad27cddf73c2a5586d746 SHA256 5cc914c1de6476031e70ce83428057a4d4396984a06d3c96183ba7a4b3af78de
+MISC ChangeLog 3237 RMD160 4391a707216a465f1ea9008f076d936d0c7a64a4 SHA1 8b4cab5666c3a5430a38577c70f219187ead59b5 SHA256 21ccd6b3616d63219552c0fd896bb1df0ce0bc8da27069bcb2eef83345efc173
 MISC metadata.xml 161 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 SHA1 1c35398222ef7ed670c31965e42cca77fe4b1da6 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmQiTYACgkQkKaRLQcq0GITGwCfUODcglN6Ar88dpB7RRCuoBHf
+SscAn3vCATOfeyY0hc3bLyhxcMQSrMB3
+=8VbJ
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/aoi/aoi-2.2.1.ebuild b/media-gfx/aoi/aoi-2.2.1.ebuild
index cba483e618b6..6b1a1357260c 100644
--- a/media-gfx/aoi/aoi-2.2.1.ebuild
+++ b/media-gfx/aoi/aoi-2.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/aoi/aoi-2.2.1.ebuild,v 1.3 2007/03/27 06:09:15 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/aoi/aoi-2.2.1.ebuild,v 1.4 2009/02/09 19:49:56 maekke Exp $
 
-inherit java-pkg eutils
+inherit java-pkg-2 eutils
 
 MY_P="aoi221"
 MY_MANUAL_V="2.2"
@@ -15,13 +15,10 @@ KEYWORDS="~amd64 ~ppc x86"
 LICENSE="GPL-2"
 SLOT="0"
 DEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jdk-1.2"
+RDEPEND=">=virtual/jre-1.4"
 IUSE="doc"
 
 src_install() {
-	# wrapper script
-	dobin "${FILESDIR}"/aoi
-
 	# documentation
 	dodoc HISTORY README
 	if use doc ; then
@@ -32,6 +29,11 @@ src_install() {
 	# main app
 	java-pkg_dojar ArtOfIllusion.jar
 
+	# run script
+	java-pkg_dolauncher aoi \
+		--jar ArtOfIllusion.jar \
+		--java_args -Xmx128M
+
 	# plugins
 	mv Plugins "${D}"/usr/share/${PN}/lib
 
diff --git a/media-gfx/aoi/aoi-2.5.ebuild b/media-gfx/aoi/aoi-2.5.ebuild
index 4a82a80e2c8b..0742ceafc54b 100644
--- a/media-gfx/aoi/aoi-2.5.ebuild
+++ b/media-gfx/aoi/aoi-2.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/aoi/aoi-2.5.ebuild,v 1.1 2007/12/10 16:02:04 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/aoi/aoi-2.5.ebuild,v 1.2 2009/02/09 19:49:56 maekke Exp $
 
-inherit java-pkg eutils
+inherit java-pkg-2 eutils
 
 MY_P="aoi25"
 MY_MANUAL_V="2.3"
@@ -15,13 +15,10 @@ KEYWORDS="~amd64 ~ppc ~x86"
 LICENSE="GPL-2"
 SLOT="0"
 DEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jdk-1.2"
+RDEPEND=">=virtual/jre-1.4"
 IUSE="doc"
 
 src_install() {
-	# wrapper script
-	dobin "${FILESDIR}"/aoi
-
 	# documentation
 	dodoc HISTORY README
 	if use doc ; then
@@ -32,6 +29,11 @@ src_install() {
 	# main app
 	java-pkg_dojar ArtOfIllusion.jar
 
+	# run script
+	java-pkg_dolauncher aoi \
+		--jar ArtOfIllusion.jar \
+		--java_args -Xmx128M
+
 	# plugins
 	mv Plugins "${D}"/usr/share/${PN}/lib