Remove old revision and fix javadoc installation for 3.2.

Package-Manager: portage-2.1.2.1-r1

5 files changed, 19 insertions, 65 deletions

diff --git a/dev-java/eclipse-ecj/ChangeLog b/dev-java/eclipse-ecj/ChangeLog
index aa82fcd11a55..699919b05ecc 100644
--- a/dev-java/eclipse-ecj/ChangeLog
+++ b/dev-java/eclipse-ecj/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/eclipse-ecj
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v 1.15 2006/12/09 09:36:43 flameeyes Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v 1.16 2007/03/08 18:09:52 betelgeuse Exp $
+
+  08 Mar 2007; Petteri Räty <betelgeuse@gentoo.org>
+  files/eclipse-ecj-3.2-build-gentoo.patch, -eclipse-ecj-3.1-r2.ebuild:
+  Remove old revision and fix javadoc installation for 3.2.
 
   09 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
   eclipse-ecj-3.1-r13.ebuild:
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index d932f61ff436..aa0fe143fd90 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -9,28 +9,24 @@ AUX compiler-settings-3.2 258 RMD160 40710ab16453db1f23433a9e74637662e917c159 SH
 MD5 7d2b0e1b4c5f4af9755b914db9301ed9 files/compiler-settings-3.2 258
 RMD160 40710ab16453db1f23433a9e74637662e917c159 files/compiler-settings-3.2 258
 SHA256 ca705f626f3871697afc65b90f7844479b8846d8e969e4ead107615a0ef168e9 files/compiler-settings-3.2 258
-AUX eclipse-ecj-3.2-build-gentoo.patch 1874 RMD160 ba7752a752fba88be994ac1e34cf77d89076fe0e SHA1 40071a8faa37ef585aac11070b014177d171a285 SHA256 254d6f8d7f5c22f2015d8c21f9e40e3e186101d968499b90741f962a279d0c7b
-MD5 9603400d0cb7aa3b10312c2b35aa98de files/eclipse-ecj-3.2-build-gentoo.patch 1874
-RMD160 ba7752a752fba88be994ac1e34cf77d89076fe0e files/eclipse-ecj-3.2-build-gentoo.patch 1874
-SHA256 254d6f8d7f5c22f2015d8c21f9e40e3e186101d968499b90741f962a279d0c7b files/eclipse-ecj-3.2-build-gentoo.patch 1874
+AUX eclipse-ecj-3.2-build-gentoo.patch 1877 RMD160 027003513593a3b880bff73a012f73959c674be5 SHA1 5e2a5f0b0f484e147665c48bb38e2df1401823e5 SHA256 086abbf990543dcbf511567a2f663e53f932e825c75600745771c7d3f5739bd3
+MD5 6cb4790e79d9fd3a6ad2acb12a0d6eb1 files/eclipse-ecj-3.2-build-gentoo.patch 1877
+RMD160 027003513593a3b880bff73a012f73959c674be5 files/eclipse-ecj-3.2-build-gentoo.patch 1877
+SHA256 086abbf990543dcbf511567a2f663e53f932e825c75600745771c7d3f5739bd3 files/eclipse-ecj-3.2-build-gentoo.patch 1877
 DIST eclipse-ecj-3.1-gentoo-r2.tar.bz2 543266 RMD160 a839e8bddae9e5dfe12c33d98557d5d4a1cd1494 SHA1 2c9e58ad11fcb8dd4e144c994581e55568e57739 SHA256 8367945471b97199962148ddaa917d7cc9fb59df094465622d0b0f2ff723a129
 DIST eclipse-ecj-3.2.tar.bz2 612611 RMD160 eefd1e27e5709e0ba828f3d01c5c10b1f7b98104 SHA1 f712c8cdc61b38b7cc60fc6b74b548c064f70efd SHA256 29406455d247a2067f1c2cf4c9139a6f9cc5cf90882daa2b6ae8972bb712a967
 EBUILD eclipse-ecj-3.1-r13.ebuild 1009 RMD160 1977006c2e25ff1fba3e23a7d391ac95e118b0fe SHA1 98fa22f95a5691de28aae78f4aef47f7d77a4109 SHA256 aa3148661cf79015b1e8e99a865c468ed93ecc04f562266f74271520e5d6fc8d
 MD5 298e6bacc4158c76984ef4b863d8b489 eclipse-ecj-3.1-r13.ebuild 1009
 RMD160 1977006c2e25ff1fba3e23a7d391ac95e118b0fe eclipse-ecj-3.1-r13.ebuild 1009
 SHA256 aa3148661cf79015b1e8e99a865c468ed93ecc04f562266f74271520e5d6fc8d eclipse-ecj-3.1-r13.ebuild 1009
-EBUILD eclipse-ecj-3.1-r2.ebuild 947 RMD160 4f5033fcdc5d16fac0c2d02ff17582b2cb84b1ff SHA1 411c1c749646feda2282e54575c180e92cc94368 SHA256 c08a5e953955a3ccc40c159ead337ff78849fea2a12c05180c1ecab5b58b403f
-MD5 761506da928b0302918acca0a74e42e9 eclipse-ecj-3.1-r2.ebuild 947
-RMD160 4f5033fcdc5d16fac0c2d02ff17582b2cb84b1ff eclipse-ecj-3.1-r2.ebuild 947
-SHA256 c08a5e953955a3ccc40c159ead337ff78849fea2a12c05180c1ecab5b58b403f eclipse-ecj-3.1-r2.ebuild 947
 EBUILD eclipse-ecj-3.2.ebuild 1733 RMD160 2a6113412f9e64e243f19002afbc4b5e69a031bf SHA1 e5b7276f4359234655951eb292a7062d60a23341 SHA256 ae6359aff5bbda52f730f3893da25c2fdfcd22b135467d3077b8fa68e965ad71
 MD5 5895a3a2973ca1ae75b04b85487b9067 eclipse-ecj-3.2.ebuild 1733
 RMD160 2a6113412f9e64e243f19002afbc4b5e69a031bf eclipse-ecj-3.2.ebuild 1733
 SHA256 ae6359aff5bbda52f730f3893da25c2fdfcd22b135467d3077b8fa68e965ad71 eclipse-ecj-3.2.ebuild 1733
-MISC ChangeLog 2657 RMD160 81b9073828bac7bc0b94180bfc5f97778bc7a509 SHA1 080a29393fe845caa5b5a525236aa4ad7e21c1a6 SHA256 592a41a55ccc63d94b8204e20880d2596c31ccc824df027811e4d4f8f17c3474
-MD5 2761bb9e214c99f7849927d1e990994c ChangeLog 2657
-RMD160 81b9073828bac7bc0b94180bfc5f97778bc7a509 ChangeLog 2657
-SHA256 592a41a55ccc63d94b8204e20880d2596c31ccc824df027811e4d4f8f17c3474 ChangeLog 2657
+MISC ChangeLog 2844 RMD160 30eb7b050517cabd58b7fc87aa9dbc10149f4cc8 SHA1 2520c14514b9d147e59eaa710f54d75e5608d1aa SHA256 7370f146d0fef8a832abc57171541d1e4c6ba0fd9e6ab73741251af14da88f73
+MD5 aebb273cee5c2de73aa8585024210972 ChangeLog 2844
+RMD160 30eb7b050517cabd58b7fc87aa9dbc10149f4cc8 ChangeLog 2844
+SHA256 7370f146d0fef8a832abc57171541d1e4c6ba0fd9e6ab73741251af14da88f73 ChangeLog 2844
 MISC metadata.xml 471 RMD160 a7f40a047de904e4e2f63fce4ae9377a36b66fa0 SHA1 c855f10cc8e043bcd1e59b48d570053304a66f49 SHA256 229f3cffb80ccec1b7c3ddff609d045bd11f8004724bcb9de5d3bf9104a37d20
 MD5 72aec5cc8f858a54713b987b28f0ac4c metadata.xml 471
 RMD160 a7f40a047de904e4e2f63fce4ae9377a36b66fa0 metadata.xml 471
@@ -38,16 +34,13 @@ SHA256 229f3cffb80ccec1b7c3ddff609d045bd11f8004724bcb9de5d3bf9104a37d20 metadata
 MD5 f993cb08b51696b9b5616a4aec63be96 files/digest-eclipse-ecj-3.1-r13 280
 RMD160 8bd6587829605bd2101e4a5fb50faa2b8e97ca94 files/digest-eclipse-ecj-3.1-r13 280
 SHA256 b2f4a3feee586f320578797f57e612642ce3e9bcc6a4e3e774239e3d6bcdc5bd files/digest-eclipse-ecj-3.1-r13 280
-MD5 f993cb08b51696b9b5616a4aec63be96 files/digest-eclipse-ecj-3.1-r2 280
-RMD160 8bd6587829605bd2101e4a5fb50faa2b8e97ca94 files/digest-eclipse-ecj-3.1-r2 280
-SHA256 b2f4a3feee586f320578797f57e612642ce3e9bcc6a4e3e774239e3d6bcdc5bd files/digest-eclipse-ecj-3.1-r2 280
 MD5 31d2102122933cfd2a1013da4d5c5712 files/digest-eclipse-ecj-3.2 250
 RMD160 ad890eefafb61724abb97ab9bc50d76ca636fac3 files/digest-eclipse-ecj-3.2 250
 SHA256 d332e91eeb0646c5a0b09691e8106691d2620991d2bca45645ae1aeb819b8cd4 files/digest-eclipse-ecj-3.2 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFeoOxAiZjviIA2XgRArbCAJ9dMXglgy312tH0O87NraQ4IOhFogCfW9PW
-AwVXZRY+PN552ima2AgdJBg=
-=aV1s
+iD8DBQFF8FFycxLzpIGCsLQRAl+MAJ9SH5YOth9Wyx6pQXGDjcLCTWzxEACfYxYE
+FIu0hHvS6vLFqtq53zV55JU=
+=+iYh
 -----END PGP SIGNATURE-----
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-3.1-r2.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-3.1-r2.ebuild
deleted file mode 100644
index 309f76108322..000000000000
--- a/dev-java/eclipse-ecj/eclipse-ecj-3.1-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/eclipse-ecj-3.1-r2.ebuild,v 1.4 2006/09/14 03:25:54 nichoj Exp $
-
-inherit eutils java-pkg
-
-MY_PN=${PN##*-}
-
-DESCRIPTION="Eclipse Compiler for Java"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="mirror://gentoo/${P}-gentoo-r2.tar.bz2"
-LICENSE="EPL-1.0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-SLOT="3.1"
-
-IUSE="doc jikes"
-
-RDEPEND=">=virtual/jre-1.4"
-
-DEPEND="${RDEPEND}
-	>=virtual/jdk-1.4
-	dev-java/ant-core"
-
-src_compile() {
-	local antflags="jar"
-	use doc && antflags="${antflags} javadoc"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags} || die "Failed to compile ecj.jar"
-}
-
-src_install() {
-	java-pkg_dojar build/${MY_PN}.jar || die "ecj.jar not installable"
-
-	dodoc README
-	use doc && java-pkg_dohtml -r build/doc/api
-
-	exeinto /usr/bin
-	doexe ${MY_PN}-${SLOT}
-}
-
diff --git a/dev-java/eclipse-ecj/files/digest-eclipse-ecj-3.1-r2 b/dev-java/eclipse-ecj/files/digest-eclipse-ecj-3.1-r2
deleted file mode 100644
index e7e4bcb69589..000000000000
--- a/dev-java/eclipse-ecj/files/digest-eclipse-ecj-3.1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6d79a571b2e43caef2f963ae3798f3da eclipse-ecj-3.1-gentoo-r2.tar.bz2 543266
-RMD160 a839e8bddae9e5dfe12c33d98557d5d4a1cd1494 eclipse-ecj-3.1-gentoo-r2.tar.bz2 543266
-SHA256 8367945471b97199962148ddaa917d7cc9fb59df094465622d0b0f2ff723a129 eclipse-ecj-3.1-gentoo-r2.tar.bz2 543266
diff --git a/dev-java/eclipse-ecj/files/eclipse-ecj-3.2-build-gentoo.patch b/dev-java/eclipse-ecj/files/eclipse-ecj-3.2-build-gentoo.patch
index c60a6591fc4d..987095cabc7f 100644
--- a/dev-java/eclipse-ecj/files/eclipse-ecj-3.2-build-gentoo.patch
+++ b/dev-java/eclipse-ecj/files/eclipse-ecj-3.2-build-gentoo.patch
@@ -45,7 +45,7 @@ diff -Naur eclipse-ecj-3.2/compilejdtcore.xml eclipse-ecj-3.2-mod/compilejdtcore
 +	<target name="javadoc" depends="init">
 +	    <mkdir dir="${javadocdir}"/>
 +	    <javadoc destdir="${javadocdir}">
-+		<fileset dir="${srcdir}"/>
++		<packageset dir="${srcdir}"/>
 +	    </javadoc>
 +	</target>
 +