Migrate to EAPI 2 and fix building with ecj-3.5 reported in bug #295678.

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

5 files changed, 30 insertions, 24 deletions

diff --git a/dev-java/cglib/ChangeLog b/dev-java/cglib/ChangeLog
index 28afe2792660..4bf0f4c39790 100644
--- a/dev-java/cglib/ChangeLog
+++ b/dev-java/cglib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/cglib
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/ChangeLog,v 1.47 2009/12/28 05:31:02 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/ChangeLog,v 1.48 2009/12/28 14:39:02 betelgeuse Exp $
+
+  28 Dec 2009; Petteri Räty <betelgeuse@gentoo.org> cglib-2.0.2-r2.ebuild,
+  cglib-2.1.3.ebuild:
+  Migrate to EAPI 2 and fix building with ecj-3.5 reported in bug #295678.
 
   28 Dec 2009; Joseph Jezak <josejx@gentoo.org> cglib-2.2.ebuild:
   Marked ppc/ppc64 stable for bug #284316.
diff --git a/dev-java/cglib/Manifest b/dev-java/cglib/Manifest
index 5de8e8c49454..3d32bd591ac8 100644
--- a/dev-java/cglib/Manifest
+++ b/dev-java/cglib/Manifest
@@ -8,15 +8,15 @@ AUX words.txt 509 RMD160 6dcd18dad1faa1a01436009095b1a2061992ff5f SHA1 145309917
 DIST cglib-src-2.0.2.jar 445834 RMD160 7f0e63ee69c090465db906288b87ff541fd00691 SHA1 414985d703e1adc433bea5188e10015d40450423 SHA256 91644a03487a9a0161a54e0c3644c34c44e507557dcf4b8b97a60dd91e67cd1c
 DIST cglib-src-2.1_3.jar 1610524 RMD160 9341441cb931f8494c5a0917db1b526ae06a6511 SHA1 9f1bb4dcdd99bacc166a917a3fa6489ba54c3c38 SHA256 652c7533f5c6d4bf66ba13871f70133e9ffdca648e49354cff7f39824282739e
 DIST cglib-src-2.2.jar 1520971 RMD160 dadda8b80b36c729e9869f503c6560ca7f555d4e SHA1 e608c738fe37f78101cb84406f2afae31d45bc6f SHA256 762e0214f0d31f224e712a7a5b4768c16ad24741ba98fc2e94715ae390d07fcb
-EBUILD cglib-2.0.2-r2.ebuild 1330 RMD160 c03b0dd3d0b00e8de59773e4951386b32421f21e SHA1 c8e502a253473e3a028ddd815cac9bf3da581c8a SHA256 33ee5fe8f3ab45847fe213248c99608332ea2b1d60930ee278ea1d3047de2d2b
-EBUILD cglib-2.1.3.ebuild 1354 RMD160 355bbed43be2af56dd7f6059b1edd40a27e16b97 SHA1 2fddf50796201f55a4c9fb465772c8aa10f9e93d SHA256 2ca806cf18cc17f86986499ba18ddabf4da130c45e4b6ad3ec8b463b7c0aa66f
+EBUILD cglib-2.0.2-r2.ebuild 1381 RMD160 2a48dc049b2d34674dc3c982acb51ed31383ea24 SHA1 2bdf4659d50235c9926a7722dbd33ed9057b5d2b SHA256 714d6505f8db1baa0e706a129f9ff819177ccae17e002b45e1c45a71a3069b32
+EBUILD cglib-2.1.3.ebuild 1405 RMD160 b38bd7dcc96bb5e226ef7c854005c46430c3178f SHA1 e0d6f377751989798d99f0077a059903157eb6a8 SHA256 1b7e7969d64cefe29af5e9d8576c2e6700cb700bc52d6d73b48a7fd2bed5b525
 EBUILD cglib-2.2.ebuild 1614 RMD160 b9cfd237b9489accb6b8869282fb03ab00acad12 SHA1 5ef80a2403edf2d0086297411b43e631d3cfb4e9 SHA256 59e4e268b42e2f7899d97e4cc365121120576c0f2d76f828553d04739dd9fb14
-MISC ChangeLog 6853 RMD160 2bb054294bcaf05fe65099aafcb6f167969e198c SHA1 16e214f45df7fc520ce916d5c6a91a30687dc4f1 SHA256 b949fa8330b33f5fcd21d24d3acd92e0c6c9c06aa8d6538e8add59ca92e4b077
+MISC ChangeLog 7031 RMD160 836b722b32274bd0bbc12b6b95a1fbcc9c32c574 SHA1 b6dd2ca3539bf7cac3b1d0b66023493040a33467 SHA256 32489c6f930104b7a2b657b353f4e1d9febe76e6682005ca03ffb1f17f1ed647
 MISC metadata.xml 350 RMD160 c14c634175d8f1c82e457ffc403744b777926f8b SHA1 bc4e48c65f4ad0493076bf0719362f8cce1cef65 SHA256 1364c70f5978d4b5277c64fec94ba77ca7da6d41a3bf851ad90e49b93f3f8ec8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAks4QkMACgkQcsIHjyDViGQIqQCglyeHyYyblVDLdmBXLNsP6U9p
-4lEAnitWeeME1tGD759nEIBfWUgT3/jF
-=EfIs
+iEYEARECAAYFAks4ww4ACgkQcxLzpIGCsLRIRwCgiiv+P6bMXQNqwVzHmTJLfgTA
+FEwAn0S38xUGuSaLTYM2Igeqg895OIuN
+=ja5s
 -----END PGP SIGNATURE-----
diff --git a/dev-java/cglib/cglib-2.0.2-r2.ebuild b/dev-java/cglib/cglib-2.0.2-r2.ebuild
index 867337a383c7..6cc1c9f7d8c0 100644
--- a/dev-java/cglib/cglib-2.0.2-r2.ebuild
+++ b/dev-java/cglib/cglib-2.0.2-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/cglib-2.0.2-r2.ebuild,v 1.14 2008/03/30 17:14:43 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/cglib-2.0.2-r2.ebuild,v 1.15 2009/12/28 14:39:02 betelgeuse Exp $
 
-EAPI=1
+EAPI=2
 JAVA_PKG_IUSE="doc source"
 
 inherit eutils java-pkg-2 java-ant-2
@@ -26,8 +26,9 @@ IUSE=""
 
 S=${WORKDIR}
 
-src_unpack() {
-	unpack ${A}
+java_prepare() {
+	# needed for ecj-3.5
+	java-ant_rewrite-bootclasspath auto
 
 	epatch "${FILESDIR}/${P}-asm-1.4.3.patch"
 
diff --git a/dev-java/cglib/cglib-2.1.3.ebuild b/dev-java/cglib/cglib-2.1.3.ebuild
index 79e368c512c7..b2a0de08cc02 100644
--- a/dev-java/cglib/cglib-2.1.3.ebuild
+++ b/dev-java/cglib/cglib-2.1.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/cglib-2.1.3.ebuild,v 1.16 2008/03/30 17:14:43 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cglib/cglib-2.1.3.ebuild,v 1.17 2009/12/28 14:39:02 betelgeuse Exp $
 
-EAPI=1
+EAPI=2
 JAVA_PKG_IUSE="doc source"
 
 inherit eutils java-pkg-2 java-ant-2
@@ -27,8 +27,9 @@ IUSE=""
 
 S=${WORKDIR}
 
-src_unpack() {
-	unpack ${A}
+java_prepare() {
+	# needed for ecj-3.5
+	java-ant_rewrite-bootclasspath auto
 
 	cd "${S}/lib"
 	rm -v *.jar || die
diff --git a/dev-java/freemarker/Manifest b/dev-java/freemarker/Manifest
index ede7f57f3eda..e5bc0e2d1050 100644
--- a/dev-java/freemarker/Manifest
+++ b/dev-java/freemarker/Manifest
@@ -5,13 +5,13 @@ AUX freemarker-2.3.10-gentoo.patch 1934 RMD160 63b558825d19eb9492a728a478caf96ed
 AUX freemarker-2.3.13-gentoo.patch 5228 RMD160 5c053ee78b5bf0084ac4d47919ae3870c41cb999 SHA1 73bd0f98997bdb258c40dc4e08aa712a84f510f6 SHA256 6bb4a5f0aa7696bbd1fb3666ec21605a90c0946c0fb131480282aab0d6cc97ad
 AUX freemarker-jython-2.2.patch 1132 RMD160 4a0d4357cfa9876f18f4d7b7623bfa6a176b098c SHA1 f6794b5bb2a8a4d050da503de98316aa97222edb SHA256 f46b6f48c25b170561a1bbc3d95d37294362b0f60810ad8264ab4678461958fa
 DIST freemarker-2.3.13.tar.gz 2136791 RMD160 beaaf510c992d435dd9b842733e4583e9512a4f5 SHA1 f1a93bf620f0542a35c2ed3da7b3caea8276c337 SHA256 00b43c28bc5b141e53ad9e56c472f40774b5638f96fc29f3d7cfa97048830eb5
-EBUILD freemarker-2.3.13.ebuild 1805 RMD160 5970944f968018a68dcb44722cbad9e655cc9dfb SHA1 41f988791f4afa0e5698c837fe009e9ba1c03c80 SHA256 5f1c5f919f7f25ca906a6ee0ecbd5c6e78642b267b3ba8bc5c731bb51713f9e2
-MISC ChangeLog 3867 RMD160 5381d08d711d8e6932f6cbd2e4f7ce8f0d045836 SHA1 18943776edbe9278594cad609a211b8b77a5fb47 SHA256 9d64e38b49dbc429b3c364dbf3f7821397790e7f33955127a470fe66573bcab6
+EBUILD freemarker-2.3.13.ebuild 1833 RMD160 22aca1d04f55bdee82bb59c9bfe7b8b24a172bcd SHA1 df0dd6e42ece779c5ca057cc907294776f8fb04c SHA256 75fa5375c9172c1e82c7f4fcd9b1a439bf6069289e45f2e02aca8a23a00d4334
+MISC ChangeLog 4006 RMD160 60b2d921dceace0c2c39080d97e565f949503507 SHA1 4ede214e8afd3dbe28b5c3d890657328dbfaa322 SHA256 d9fe06e7b521cd3c3f1d5736a3c6e995be5fc4ec16ecc5b4a699d5bf7af31ffe
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkqq0y0ACgkQkKaRLQcq0GKCYgCgjDklUdpfLG6xfD9Z9qww1StR
-pFcAoIED5hqGPbaREAwbRqclIw64ScRr
-=fBLZ
+iEYEARECAAYFAks4w8YACgkQcxLzpIGCsLSfCACfQ0/NltLyBizCfVgACCXevzXA
+zPkAn14LTmurKu2IecyK/yn259sHKZ7Z
+=nVjV
 -----END PGP SIGNATURE-----