new version

7 files changed, 126 insertions, 1 deletions

diff --git a/dev-java/aspectj/ChangeLog b/dev-java/aspectj/ChangeLog
index 780ee6e092d3..cf9d266e820d 100644
--- a/dev-java/aspectj/ChangeLog
+++ b/dev-java/aspectj/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/aspectj
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectj/ChangeLog,v 1.3 2004/06/24 22:17:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectj/ChangeLog,v 1.4 2004/07/14 20:45:23 axxo Exp $
+
+*aspectj-1.2 (14 Jul 2004)
+
+  14 Jul 2004; Thomas Matthijs <axxo@gentoo.org>
+  +files/aspectj-1.2-fix-examples-build.xml.patch,
+  +files/aspectj-1.2-fix-javadoc.patch,
+  +files/aspectj-1.2-version-gentoo.patch, +aspectj-1.2.ebuild:
+  new version, closes 53959
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org> aspectj-1.1.1.ebuild:
   Add inherit eutils
diff --git a/dev-java/aspectj/Manifest b/dev-java/aspectj/Manifest
index 9fdd9a483aa9..c38c6371c695 100644
--- a/dev-java/aspectj/Manifest
+++ b/dev-java/aspectj/Manifest
@@ -1,7 +1,12 @@
 MD5 3f7dc72d288308188284ac1213047748 aspectj-1.1.1.ebuild 2220
+MD5 de537b60bedfc66bd3ed3c021bb548ca aspectj-1.2.ebuild 2249
 MD5 284fd7d5e0e316fcb93570b3cfcf002b ChangeLog 554
 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 46d9b1155eb3ab559158a93afe23b36c files/ajbrowser 149
 MD5 4038bffac6102552f95eac41c4239b94 files/digest-aspectj-1.1.1 73
 MD5 6f9b4aef0d744f489b6f506b3b83a542 files/aspectj-1.1.1-version-gentoo.patch 1263
+MD5 15d8886f1eb56232e7d76c4e71c34763 files/aspectj-1.2-fix-examples-build.xml.patch 649
+MD5 2e5f39e39167bb77e381215742aba149 files/digest-aspectj-1.2 73
diff --git a/dev-java/aspectj/aspectj-1.2.ebuild b/dev-java/aspectj/aspectj-1.2.ebuild
new file mode 100644
index 000000000000..dcf7aff1aa0c
--- /dev/null
+++ b/dev-java/aspectj/aspectj-1.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2004 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.1 2004/07/14 20:45:23 axxo Exp $
+
+inherit java-pkg eutils
+
+DESCRIPTION="AspectJ is a seemless extension to the Java programming language for Aspect Oriented Programming (AOP)"
+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"
+SLOT="0"
+LICENSE="CPL-1.0 Apache-1.1"
+KEYWORDS="~x86"
+IUSE="doc"
+
+# Welcome to the AspectJ ebuild.  An upstream source archive is not
+# available directly.  The AspectJ source .tar.bz2 snapshot is taken
+# from CVS with the following command:
+#
+#	 cvs -z3 -d:pserver:anonymous@dev.eclipse.org:/home/technology \
+#		 co -rV1_2_0 org.aspectj/modules
+#
+# The source is then patched so that the installed binaries have
+# version information which reflects the tagged source release.	 The
+# AspectJ build system does not do this automatically.
+#
+# Useful documentation for this port:
+#
+#	 http://dev.eclipse.org/viewcvs/index.cgi/~checkout~/org.aspectj/modules/build/readme-build-and-test-aspectj.html?rev=HEAD&content-type=text/html&cvsroot=Technology_Project
+#
+#	 http://dev.eclipse.org/viewcvs/index.cgi/~checkout~/org.aspectj/modules/build/release-checklist.txt?rev=HEAD&content-type=text/plain&cvsroot=Technology_Project
+#
+
+S=${WORKDIR}/org.aspectj/modules
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/aspectj-${PV}-version-gentoo.patch
+	epatch ${FILESDIR}/aspectj-${PV}-fix-javadoc.patch
+	epatch ${FILESDIR}/aspectj-${PV}-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
+}
+
+src_compile() {
+	cd build
+	ant -f build.xml || die "build failed"
+}
+
+src_install () {
+	mkdir aspectj-unpack
+	java -jar aj-build/dist/aspectj-${PV}.jar -to aspectj-unpack
+	cd aspectj-unpack
+	java-pkg_dojar lib/*.jar
+	dobin ${FILESDIR}/{ajc,ajbrowser}
+
+	dohtml doc/*.html
+	cp *.html ${D}/usr/share/doc/${PF}/
+	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}
+		cp doc/*.pdf ${D}/usr/share/doc/${PF}
+	fi
+}
diff --git a/dev-java/aspectj/files/aspectj-1.2-fix-examples-build.xml.patch b/dev-java/aspectj/files/aspectj-1.2-fix-examples-build.xml.patch
new file mode 100644
index 000000000000..3ff4374ba6de
--- /dev/null
+++ b/dev-java/aspectj/files/aspectj-1.2-fix-examples-build.xml.patch
@@ -0,0 +1,13 @@
+diff -Naur org.aspectj.orig/modules/docs/dist/doc/examples/build.xml org.aspectj/modules/docs/dist/doc/examples/build.xml
+--- org.aspectj.orig/modules/docs/dist/doc/examples/build.xml   2004-06-23 15:45:44.000000000 +0200
++++ org.aspectj/modules/docs/dist/doc/examples/build.xml        2004-06-23 17:50:41.519250288 +0200
+@@ -66,7 +66,7 @@
+       <property name="example.dir"
+             location="${basedir}"/> 
+       <property name="aspectj.lib.dir"
+-            location="${basedir}/../../lib"/> 
++          location="/usr/share/aspectj/lib"/> 
+ 
+       <!-- required libraries - install or predefine -->
+       <property name="aspectjrt.jar"
+
diff --git a/dev-java/aspectj/files/aspectj-1.2-fix-javadoc.patch b/dev-java/aspectj/files/aspectj-1.2-fix-javadoc.patch
new file mode 100644
index 000000000000..09181f1358e4
--- /dev/null
+++ b/dev-java/aspectj/files/aspectj-1.2-fix-javadoc.patch
@@ -0,0 +1,11 @@
+--- org.aspectj.orig/modules/docs/build.xml	2004-06-23 15:45:44.000000000 +0200
++++ org.aspectj/modules/docs/build.xml	2004-06-23 17:05:49.494500256 +0200
+@@ -173,7 +173,7 @@
+                     destdir="${docs.dist.dir}/doc/api"
+                 windowtitle="AspectJ(tm) runtime API"
+                        link="http://java.sun.com/j2se/1.4.2/docs/api"
+-                       classpath="${aspectj.modules.dir}/asm/bin;${aspectj.modules.dir}/bridge/bin;${aspectj.modules.dir}/util/bin;${aspectj.modules.dir}/lib/bcel/bcel.jar"
++                       classpath="${aspectj.modules.dir}/aj-build/jars/asm.jar;${aspectj.modules.dir}/aj-build/jars/util.jar;${aspectj.modules.dir}/aj-build/jars/bridge.jar;${aspectj.modules.dir}/lib/bcel/bcel.jar"
+                packagenames="org.aspectj.lang,org.aspectj.lang.reflect,org.aspectj.weaver.tools" />
+                <!-- note: link ineffective at avoiding see tag warning -->
+     </target>
diff --git a/dev-java/aspectj/files/aspectj-1.2-version-gentoo.patch b/dev-java/aspectj/files/aspectj-1.2-version-gentoo.patch
new file mode 100644
index 000000000000..815358a8547b
--- /dev/null
+++ b/dev-java/aspectj/files/aspectj-1.2-version-gentoo.patch
@@ -0,0 +1,20 @@
+--- org.aspectj/modules/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties.org	2004-06-23 16:24:27.852767144 +0200
++++ org.aspectj/modules/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties	2004-06-23 16:26:25.352904408 +0200
+@@ -4,7 +4,7 @@
+      The -Xlintfile:lint.properties allows fine-grained control. In tools.jar, see
+      org/aspectj/weaver/XlintDefault.properties for the default behavior and a template to copy. 
+ ### AspectJ-specific messages
+-compiler.name = AspectJ Compiler
++compiler.name = AspectJ Compiler @PV@
+ 
+ ## this next one superceded by above...
+ ## configure.version = AspectJ Compiler 1.1 
+@@ -13,6 +13,8 @@
+ ## 3456789012345678901234567890123456789012345678901234567890123456789012345
+ ### miscellaneous
+ misc.usage = {compiler.name}\n\
++Built by Portage in Gentoo Linux http://www.gentoo.org\n\
++Send bug reports to http://bugs.gentoo.org\n\
+ \n\
+ \tUsage: <options> <source file | @argfile>..\n\
+ \n\
diff --git a/dev-java/aspectj/files/digest-aspectj-1.2 b/dev-java/aspectj/files/digest-aspectj-1.2
new file mode 100644
index 000000000000..98fe59f12f66
--- /dev/null
+++ b/dev-java/aspectj/files/digest-aspectj-1.2
@@ -0,0 +1 @@
+MD5 50f93944b28b924217db019d17ead91e aspectj-CVS-V1_2_0.tar.bz2 25477597