No longer uses bundled jars to build. Patch contributed by Julie Bovee Hill <joulie@gmail.com> (bug #63293).

Package-Manager: portage-2.1_pre3-r1

4 files changed, 120 insertions, 2 deletions

diff --git a/dev-java/aspectj/ChangeLog b/dev-java/aspectj/ChangeLog
index 4ffdb8e88530..3df6d4bb2e3f 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.13 2005/10/18 11:06:23 axxo Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectj/ChangeLog,v 1.14 2006/01/08 05:33:16 nichoj Exp $
+
+*aspectj-1.2-r1 (08 Jan 2006)
+
+  08 Jan 2006; Joshua Nichols <nichoj@gentoo.org> +aspectj-1.2-r1.ebuild:
+  No longer uses bundled jars to build. Patch contributed by Julie Bovee Hill
+  <joulie@gmail.com> (bug #63293).
 
   08 Oct 2005; Petteri Räty <betelgeuse@gentoo.org>
   +files/aspectj-1.1.1.build.xml.patch, aspectj-1.1.1.ebuild,
diff --git a/dev-java/aspectj/Manifest b/dev-java/aspectj/Manifest
index 7c8611822a3a..6a91fd588e8f 100644
--- a/dev-java/aspectj/Manifest
+++ b/dev-java/aspectj/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 f8383f748fabfde7c99ecd44710a85b6 ChangeLog 1838
 MD5 7e80d3b8d68ab9162097a68b797aacd3 aspectj-1.1.1.ebuild 2358
 MD5 2b2bb585e6d9154254e652a413ba7391 aspectj-1.2-r1.ebuild 2995
@@ -13,3 +16,10 @@ MD5 4038bffac6102552f95eac41c4239b94 files/digest-aspectj-1.1.1 73
 MD5 941140894bda896b874057612f14b88c files/digest-aspectj-1.2 73
 MD5 941140894bda896b874057612f14b88c files/digest-aspectj-1.2-r1 73
 MD5 72ba0dd87abe126d73774a74b1b4cbb1 metadata.xml 663
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDwKQmndWRXhKOboURAiy7AKDNfiTm0NPL06MjKXUqBKBN9KybYgCg9ASe
+DfdMkQ47BPlMIkG/sXDG2Is=
+=pPQ7
+-----END PGP SIGNATURE-----
diff --git a/dev-java/aspectj/aspectj-1.2-r1.ebuild b/dev-java/aspectj/aspectj-1.2-r1.ebuild
new file mode 100644
index 000000000000..ab329e469f46
--- /dev/null
+++ b/dev-java/aspectj/aspectj-1.2-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectj/aspectj-1.2-r1.ebuild,v 1.1 2006/01/08 05:33:16 nichoj 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-core
+	sys-apps/findutils"
+RDEPEND=">=virtual/jre-1.3
+	dev-java/xalan
+	dev-java/bcel
+	dev-java/junit
+	dev-java/jython
+	=dev-java/jakarta-regexp-1.3*
+	=dev-java/saxon-6.5*
+	dev-java/xml-commons
+	=dev-java/xerces-2*"
+
+SLOT="0"
+LICENSE="CPL-1.0 Apache-1.1"
+KEYWORDS="~x86 ~ppc ~amd64"
+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
+
+	find lib -name "*.jar" -exec rm {} \;
+
+	cd lib/ant/lib
+		java-pkg_jar-from xalan
+		java-pkg_jar-from ant-core
+		java-pkg_jar-from xml-commons xml-apis.jar
+		java-pkg_jar-from xerces-2
+
+	cd ../../bcel
+		java-pkg_jar-from bcel
+
+	cd ../junit
+		java-pkg_jar-from junit
+
+	cd ../jython
+		java-pkg_jar-from jython
+
+	cd ../regexp
+		java-pkg_jar-from jakarta-regexp-1.3
+
+	cd ../saxon
+		java-pkg_jar-from saxon-6.5 saxon6.5.jar saxon.jar
+}
+
+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
+	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}
+		cp doc/*.pdf ${D}/usr/share/doc/${PF}
+	fi
+}
diff --git a/dev-java/aspectj/files/digest-aspectj-1.2-r1 b/dev-java/aspectj/files/digest-aspectj-1.2-r1
new file mode 100644
index 000000000000..d12f0e29d230
--- /dev/null
+++ b/dev-java/aspectj/files/digest-aspectj-1.2-r1
@@ -0,0 +1 @@
+MD5 f90f1bde5f9076a9df555b5474254602 aspectj-CVS-V1_2_0.tar.bz2 25289180