From f32a2ba6cae2aee70ca7e90a267e83c6bd963fa3 Mon Sep 17 00:00:00 2001
From: Johann Schmitz <ercpe@gentoo.org>
Date: Mon, 16 Sep 2013 17:56:23 +0000
Subject: Place .properties files into the aspectj.jar file.

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 77C501ED)
---
 dev-java/aspectj/ChangeLog               |  8 +++++-
 dev-java/aspectj/aspectj-1.7.3-r1.ebuild | 46 ++++++++++++++++++++++++++++++++
 dev-java/aspectj/aspectj-1.7.3.ebuild    | 44 ------------------------------
 3 files changed, 53 insertions(+), 45 deletions(-)
 create mode 100644 dev-java/aspectj/aspectj-1.7.3-r1.ebuild
 delete mode 100644 dev-java/aspectj/aspectj-1.7.3.ebuild

(limited to 'dev-java/aspectj')

diff --git a/dev-java/aspectj/ChangeLog b/dev-java/aspectj/ChangeLog
index 99640a759008..a38365354045 100644
--- a/dev-java/aspectj/ChangeLog
+++ b/dev-java/aspectj/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/aspectj
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectj/ChangeLog,v 1.27 2013/09/14 05:07:04 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectj/ChangeLog,v 1.28 2013/09/16 17:56:23 ercpe Exp $
+
+*aspectj-1.7.3-r1 (16 Sep 2013)
+
+  16 Sep 2013; Johann Schmitz <ercpe@gentoo.org> +aspectj-1.7.3-r1.ebuild,
+  -aspectj-1.7.3.ebuild:
+  Place .properties files into the aspectj.jar file.
 
 *aspectj-1.7.3 (14 Sep 2013)
 
diff --git a/dev-java/aspectj/aspectj-1.7.3-r1.ebuild b/dev-java/aspectj/aspectj-1.7.3-r1.ebuild
new file mode 100644
index 000000000000..db3626e6071f
--- /dev/null
+++ b/dev-java/aspectj/aspectj-1.7.3-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectj/aspectj-1.7.3-r1.ebuild,v 1.1 2013/09/16 17:56:23 ercpe Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A seamless aspect-oriented extension to the Java programming language"
+HOMEPAGE="http://eclipse.org/aspectj/"
+SRC_URI="http://www.eclipse.org/downloads/download.php?file=/tools/aspectj/aspectj-1.7.3-src.jar&r=1 -> ${P}.jar"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/asm:4
+	dev-java/commons-logging:0"
+
+DEPEND=">=virtual/jdk-1.5
+	app-arch/zip
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+
+S="${WORKDIR}"
+
+JAVA_SRC_DIR="${S}/src"
+JAVA_GENTOO_CLASSPATH="commons-logging,asm-4"
+
+src_unpack() {
+	default
+	unzip "${S}/aspectjweaver1.7.3-src.jar" -d "${S}/src/" || die
+}
+
+java_prepare() {
+	default
+	# needs part of BEA JRockit to compile
+	rm "${S}"/src/org/aspectj/weaver/loadtime/JRockitAgent.java || die
+	# aspectj uses a renamed version of asm:4
+	find -name "*.java" -exec sed -i -e 's/import aj.org.objectweb.asm./import org.objectweb.asm./g' {} \; || die
+	mkdir -p "${S}"/target/classes/org/aspectj/weaver/ || die
+	cp -vr "${S}"/src/org/aspectj/weaver/*.properties "${S}"/target/classes/org/aspectj/weaver/ || die
+}
diff --git a/dev-java/aspectj/aspectj-1.7.3.ebuild b/dev-java/aspectj/aspectj-1.7.3.ebuild
deleted file mode 100644
index 6d3c7bf5efd9..000000000000
--- a/dev-java/aspectj/aspectj-1.7.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectj/aspectj-1.7.3.ebuild,v 1.1 2013/09/14 05:07:04 ercpe Exp $
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A seamless aspect-oriented extension to the Java programming language"
-HOMEPAGE="http://eclipse.org/aspectj/"
-SRC_URI="http://www.eclipse.org/downloads/download.php?file=/tools/aspectj/aspectj-1.7.3-src.jar&r=1 -> ${P}.jar"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="dev-java/asm:4
-	dev-java/commons-logging:0"
-
-DEPEND=">=virtual/jdk-1.5
-	app-arch/zip
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-
-S="${WORKDIR}"
-
-JAVA_SRC_DIR="${S}/src"
-JAVA_GENTOO_CLASSPATH="commons-logging,asm-4"
-
-src_unpack() {
-	default
-	unzip "${S}/aspectjweaver1.7.3-src.jar" -d "${S}/src/" || die
-}
-
-src_prepare() {
-	default
-	# needs part of BEA JRockit to compile
-	rm "${S}"/src/org/aspectj/weaver/loadtime/JRockitAgent.java || die
-	# aspectj uses a renamed version of asm:4
-	find -name "*.java" -exec sed -i -e 's/import aj.org.objectweb.asm./import org.objectweb.asm./g' {} \; || die
-}
-- 
cgit v1.2.3-65-gdbad