grr

(Portage version: 2.0.53_rc5)

5 files changed, 102 insertions, 4 deletions

diff --git a/dev-java/aspectj/ChangeLog b/dev-java/aspectj/ChangeLog
index cc15ae71274b..4ffdb8e88530 100644
--- a/dev-java/aspectj/ChangeLog
+++ b/dev-java/aspectj/ChangeLog
@@ -1,9 +1,6 @@
 # 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.12 2005/10/18 09:52:11 axxo Exp $
-
-  18 Oct 2005; Thomas Matthijs <axxo@gentoo.org> -aspectj-1.1.1.ebuild:
-  remove 1.1.1
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectj/ChangeLog,v 1.13 2005/10/18 11:06:23 axxo Exp $
 
   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/aspectj-1.1.1.ebuild b/dev-java/aspectj/aspectj-1.1.1.ebuild
new file mode 100644
index 000000000000..bb55b38282e6
--- /dev/null
+++ b/dev-java/aspectj/aspectj-1.1.1.ebuild
@@ -0,0 +1,68 @@
+# 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.14 2005/10/18 11:06: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_1_1.tar.bz2"
+HOMEPAGE="http://www.eclipse.org/aspectj/"
+DEPEND=">=virtual/jdk-1.3
+	dev-java/ant-core"
+RDEPEND=">=virtual/jre-1.3"
+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_1_1 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}
+	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
+}
+
+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/aspectj-1.1.1-version-gentoo.patch b/dev-java/aspectj/files/aspectj-1.1.1-version-gentoo.patch
new file mode 100644
index 000000000000..45d76f6534cc
--- /dev/null
+++ b/dev-java/aspectj/files/aspectj-1.1.1-version-gentoo.patch
@@ -0,0 +1,20 @@
+diff -ur org.aspectj.orig/modules/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties org.aspectj/modules/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties
+--- org.aspectj.orig/modules/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties	2003-06-06 06:54:56.000000000 -0500
++++ org.aspectj/modules/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties	2004-04-12 11:33:30.193430889 -0500
+@@ -4,11 +4,13 @@
+      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
+-configure.version = AspectJ Compiler 1.1
++configure.version = AspectJ Compiler @PV_LONG@
+ configure.directoryNotExist = invalid option: {0}
+ ## 3456789012345678901234567890123456789012345678901234567890123456789012345
+ ### miscellaneous
+-misc.usage = AspectJ Compiler 1.1\n\
++misc.usage = AspectJ Compiler @PV@\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\
+Only in org.aspectj/modules/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc: messages.properties.~1.9.~
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=".">
+ 
diff --git a/dev-java/aspectj/files/digest-aspectj-1.1.1 b/dev-java/aspectj/files/digest-aspectj-1.1.1
new file mode 100644
index 000000000000..b737e2c9a436
--- /dev/null
+++ b/dev-java/aspectj/files/digest-aspectj-1.1.1
@@ -0,0 +1 @@
+MD5 bfe210b3c071e0827b4366c712734096 aspectj-CVS-V1_1_1.tar.bz2 24504831