summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Nichols <nichoj@gentoo.org>2006-01-15 17:45:30 +0000
committerJoshua Nichols <nichoj@gentoo.org>2006-01-15 17:45:30 +0000
commit0982f303841a4daeed1224cd8aeb135932363031 (patch)
treeade6537f0715efd4222d0581e8afa00fdc4e7f31
parentMirror syntax in 1.27 and 1.29 (diff)
downloadgentoo-2-0982f303841a4daeed1224cd8aeb135932363031.tar.gz
gentoo-2-0982f303841a4daeed1224cd8aeb135932363031.tar.bz2
gentoo-2-0982f303841a4daeed1224cd8aeb135932363031.zip
Fixed jar-from call for saxon to fix bug #119089.
(Portage version: 2.1_pre3-r1)
-rw-r--r--dev-java/aspectj/ChangeLog5
-rw-r--r--dev-java/aspectj/Manifest12
-rw-r--r--dev-java/aspectj/aspectj-1.2-r1.ebuild18
3 files changed, 19 insertions, 16 deletions
diff --git a/dev-java/aspectj/ChangeLog b/dev-java/aspectj/ChangeLog
index 3df6d4bb2e3f..5ab7901021da 100644
--- a/dev-java/aspectj/ChangeLog
+++ b/dev-java/aspectj/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/aspectj
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectj/ChangeLog,v 1.15 2006/01/15 17:45:30 nichoj Exp $
+
+ 15 Jan 2006; Joshua Nichols <nichoj@gentoo.org> aspectj-1.2-r1.ebuild:
+ Fixed jar-from call for saxon to fix bug #119089.
*aspectj-1.2-r1 (08 Jan 2006)
diff --git a/dev-java/aspectj/Manifest b/dev-java/aspectj/Manifest
index 6a91fd588e8f..4c81153d0b4f 100644
--- a/dev-java/aspectj/Manifest
+++ b/dev-java/aspectj/Manifest
@@ -1,9 +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
+MD5 e5fa2011c1036ee2d7e813d27ec39e28 aspectj-1.2-r1.ebuild 3057
MD5 5f80accb3c4baa44ed55ccfa8c0f08f3 aspectj-1.2.ebuild 2383
MD5 46d9b1155eb3ab559158a93afe23b36c files/ajbrowser 149
MD5 c46c31665f413547763e5b2c860e1782 files/ajc 143
@@ -16,10 +13,3 @@ 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
index ab329e469f46..75fe96e012e1 100644
--- a/dev-java/aspectj/aspectj-1.2-r1.ebuild
+++ b/dev-java/aspectj/aspectj-1.2-r1.ebuild
@@ -1,6 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aspectj/aspectj-1.2-r1.ebuild,v 1.2 2006/01/15 17:45:30 nichoj Exp $
inherit java-pkg eutils
@@ -55,28 +55,38 @@ src_unpack() {
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
+ rm *.jar
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 ../../commons
+ rm *.jar
cd ../../bcel
+ rm *.jar
java-pkg_jar-from bcel
+ cd ../../jdiff
+ rm *.jar
+
cd ../junit
+ rm *.jar
java-pkg_jar-from junit
cd ../jython
+ rm *.jar
java-pkg_jar-from jython
cd ../regexp
+ rm *.jar
java-pkg_jar-from jakarta-regexp-1.3
cd ../saxon
- java-pkg_jar-from saxon-6.5 saxon6.5.jar saxon.jar
+ rm *.jar
+ java-pkg_jar-from saxon-6.5
}
src_compile() {