summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohann Schmitz <ercpe@gentoo.org>2013-09-16 17:56:23 +0000
committerJohann Schmitz <ercpe@gentoo.org>2013-09-16 17:56:23 +0000
commitf32a2ba6cae2aee70ca7e90a267e83c6bd963fa3 (patch)
tree4f31a5e9a2e744a58d60d8c0c1eb1fe05160cb95
parentUse ${PYTHON} rather than $(python_get_PYTHON). It is exported anyway. (diff)
downloadgentoo-2-f32a2ba6cae2aee70ca7e90a267e83c6bd963fa3.tar.gz
gentoo-2-f32a2ba6cae2aee70ca7e90a267e83c6bd963fa3.tar.bz2
gentoo-2-f32a2ba6cae2aee70ca7e90a267e83c6bd963fa3.zip
Place .properties files into the aspectj.jar file.
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 77C501ED)
-rw-r--r--dev-java/aspectj/ChangeLog8
-rw-r--r--dev-java/aspectj/aspectj-1.7.3-r1.ebuild (renamed from dev-java/aspectj/aspectj-1.7.3.ebuild)6
2 files changed, 11 insertions, 3 deletions
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.ebuild b/dev-java/aspectj/aspectj-1.7.3-r1.ebuild
index 6d3c7bf5efd9..db3626e6071f 100644
--- a/dev-java/aspectj/aspectj-1.7.3.ebuild
+++ b/dev-java/aspectj/aspectj-1.7.3-r1.ebuild
@@ -1,6 +1,6 @@
# 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 $
+# $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"
@@ -35,10 +35,12 @@ src_unpack() {
unzip "${S}/aspectjweaver1.7.3-src.jar" -d "${S}/src/" || die
}
-src_prepare() {
+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
}