Fixed broken build.xml of 1.1.1. Both versions: removed DEPEND on full ant and installation of LICENSE-AspectJ.html.

(Portage version: 2.0.53_rc4)

5 files changed, 38 insertions, 27 deletions

diff --git a/dev-java/aspectj/ChangeLog b/dev-java/aspectj/ChangeLog
index 72155c52dbe0..4e56b9f6f750 100644
--- a/dev-java/aspectj/ChangeLog
+++ b/dev-java/aspectj/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/aspectj
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectj/ChangeLog,v 1.10 2005/01/01 18:08:34 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectj/ChangeLog,v 1.11 2005/10/08 10:55:35 betelgeuse Exp $
+
+  08 Oct 2005; Petteri Räty <betelgeuse@gentoo.org>
+  +files/aspectj-1.1.1.build.xml.patch, aspectj-1.1.1.ebuild,
+  aspectj-1.2.ebuild:
+  Fixed broken build.xml of 1.1.1. Both versions: removed DEPEND on full ant
+  and installation of LICENSE-AspectJ.html.
 
   28 Dec 2004; Dylan Carlson <absinthe@gentoo.org> aspectj-1.2.ebuild:
   Stable on amd64.
diff --git a/dev-java/aspectj/Manifest b/dev-java/aspectj/Manifest
index 76939b8168de..5a89d2d6b3d7 100644
--- a/dev-java/aspectj/Manifest
+++ b/dev-java/aspectj/Manifest
@@ -1,22 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f376ed249287cfaeab30f1c16602b889 aspectj-1.1.1.ebuild 2256
-MD5 7f5bd38c2ae560637a56f349976b6c9f aspectj-1.2.ebuild 2381
-MD5 b6310194a4ffced57b4ae7533c94d161 ChangeLog 1364
-MD5 72ba0dd87abe126d73774a74b1b4cbb1 metadata.xml 663
-MD5 c46c31665f413547763e5b2c860e1782 files/ajc 143
-MD5 d8e6e955badeb042ec37383717e5ca0c files/aspectj-1.2-version-gentoo.patch 964
-MD5 a28d4390d35f00659399d020dceaa71c files/aspectj-1.2-fix-javadoc.patch 939
+MD5 901f531c764ca858bd63afb527628b77 ChangeLog 1623
+MD5 6b274b7535c2ac9a28e6608da4266f9f aspectj-1.1.1.ebuild 2358
+MD5 2612383aee882f425fe17d5090a2567a aspectj-1.2.ebuild 2377
 MD5 46d9b1155eb3ab559158a93afe23b36c files/ajbrowser 149
-MD5 4038bffac6102552f95eac41c4239b94 files/digest-aspectj-1.1.1 73
+MD5 c46c31665f413547763e5b2c860e1782 files/ajc 143
 MD5 6f9b4aef0d744f489b6f506b3b83a542 files/aspectj-1.1.1-version-gentoo.patch 1263
+MD5 6d54bb03fec483072f2b33b8f2600d9d files/aspectj-1.1.1.build.xml.patch 545
 MD5 15d8886f1eb56232e7d76c4e71c34763 files/aspectj-1.2-fix-examples-build.xml.patch 649
+MD5 a28d4390d35f00659399d020dceaa71c files/aspectj-1.2-fix-javadoc.patch 939
+MD5 d8e6e955badeb042ec37383717e5ca0c files/aspectj-1.2-version-gentoo.patch 964
+MD5 4038bffac6102552f95eac41c4239b94 files/digest-aspectj-1.1.1 73
 MD5 941140894bda896b874057612f14b88c files/digest-aspectj-1.2 73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC2YAm/rLF9B432nYRAu7uAJwJjH6P9/f2udYMZMcmNTzfTOqzfACdFk4Q
-1Uv2LDp6fioS+Lp+l7ghzyE=
-=6w1G
------END PGP SIGNATURE-----
+MD5 72ba0dd87abe126d73774a74b1b4cbb1 metadata.xml 663
diff --git a/dev-java/aspectj/aspectj-1.1.1.ebuild b/dev-java/aspectj/aspectj-1.1.1.ebuild
index 474c387af9cf..478639230b40 100644
--- a/dev-java/aspectj/aspectj-1.1.1.ebuild
+++ b/dev-java/aspectj/aspectj-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectj/aspectj-1.1.1.ebuild,v 1.11 2005/07/16 21:46:02 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectj/aspectj-1.1.1.ebuild,v 1.12 2005/10/08 10:55:35 betelgeuse Exp $
 
 inherit java-pkg eutils
 
@@ -8,7 +8,7 @@ DESCRIPTION="AspectJ is a seemless extension to the Java programming language fo
 SRC_URI="mirror://gentoo/aspectj-CVS-V1_1_1.tar.bz2"
 HOMEPAGE="http://www.eclipse.org/aspectj/"
 DEPEND=">=virtual/jdk-1.3
-	dev-java/ant"
+	dev-java/ant-core"
 RDEPEND=">=virtual/jre-1.3"
 SLOT="0"
 LICENSE="CPL-1.0 Apache-1.1"
@@ -37,8 +37,10 @@ S=${WORKDIR}/org.aspectj/modules
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/aspectj-${PV}-version-gentoo.patch
+	epatch ${FILESDIR}/${P}-version-gentoo.patch
 	cd ${S}
+	epatch ${FILESDIR}/${P}.build.xml.patch
+	epatch ${FILESDIR}/${PN}-1.2-fix-examples-build.xml.patch
 	sed -i "s,DEVELOPMENT,${PV},g" build/build-properties.xml
 	sed -i -e "s,@PV@,${PV},g" -e "s,@PV_LONG@,${PV} (Gentoo Build),g" \
 		org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties
@@ -46,7 +48,7 @@ src_unpack() {
 
 src_compile() {
 	cd build
-	ant -f build.xml || die
+	ant -f build.xml || die "build failed"
 }
 
 src_install() {
@@ -57,7 +59,7 @@ src_install() {
 	dobin ${FILESDIR}/{ajc,ajbrowser}
 
 	dohtml doc/*.html
-	cp *.html ${D}/usr/share/doc/${PF}/
+	dohtml README-AspectJ.html
 	if use doc; then
 		cp -R doc/{devguide,api,progguide} ${D}/usr/share/doc/${PF}/html
 		cp -R doc/examples ${D}/usr/share/doc/${PF}
diff --git a/dev-java/aspectj/aspectj-1.2.ebuild b/dev-java/aspectj/aspectj-1.2.ebuild
index dc8d7fcbbf3c..9b468089e7c6 100644
--- a/dev-java/aspectj/aspectj-1.2.ebuild
+++ b/dev-java/aspectj/aspectj-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectj/aspectj-1.2.ebuild,v 1.7 2005/07/16 17:18:31 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectj/aspectj-1.2.ebuild,v 1.8 2005/10/08 10:55:35 betelgeuse Exp $
 
 inherit java-pkg eutils
 
@@ -8,7 +8,7 @@ DESCRIPTION="AspectJ is a seemless extension to the Java programming language fo
 SRC_URI="mirror://gentoo/aspectj-CVS-V1_2_0.tar.bz2"
 HOMEPAGE="http://www.eclipse.org/aspectj/"
 DEPEND=">=virtual/jdk-1.3
-	dev-java/ant"
+	dev-java/ant-core"
 RDEPEND=">=virtual/jre-1.3"
 SLOT="0"
 LICENSE="CPL-1.0 Apache-1.1"
@@ -59,7 +59,7 @@ src_install() {
 	dobin ${FILESDIR}/{ajc,ajbrowser}
 
 	dohtml doc/*.html
-	cp *.html ${D}/usr/share/doc/${PF}/
+	dohtml README-AspectJ.html
 	if use doc; then
 		cp -R doc/{devguide,api,progguide} ${D}/usr/share/doc/${PF}/html
 		cp -R doc/examples ${D}/usr/share/doc/${PF}
diff --git a/dev-java/aspectj/files/aspectj-1.1.1.build.xml.patch b/dev-java/aspectj/files/aspectj-1.1.1.build.xml.patch
new file mode 100644
index 000000000000..cbc6898bceb4
--- /dev/null
+++ b/dev-java/aspectj/files/aspectj-1.1.1.build.xml.patch
@@ -0,0 +1,12 @@
+diff -ur org.aspectj.orig/modules/build/build.xml org.aspectj/modules/build/build.xml
+--- org.aspectj.orig/modules/build/build.xml	2005-10-08 13:44:14.709485640 +0300
++++ org.aspectj/modules/build/build.xml	2005-10-08 13:44:32.585768032 +0300
+@@ -13,7 +13,7 @@
+ <!-- ========================================================================= -->
+ 
+ <!DOCTYPE project [
+-<!ENTITY build-properties SYSTEM "file:build-properties.xml">
++<!ENTITY build-properties SYSTEM "build-properties.xml">
+ ]>
+ <project name="build" default="all" basedir=".">
+