filtered jikes and quoted some variables

Package-Manager: portage-2.1.3.19

3 files changed, 29 insertions, 14 deletions

diff --git a/dev-db/octopus/ChangeLog b/dev-db/octopus/ChangeLog
index 840c2af9b15b..3929130a8ba7 100644
--- a/dev-db/octopus/ChangeLog
+++ b/dev-db/octopus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/octopus
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/octopus/ChangeLog,v 1.11 2007/08/20 16:19:10 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/octopus/ChangeLog,v 1.12 2007/11/13 12:27:27 opfer Exp $
+
+  13 Nov 2007; Christian Faulhammer <opfer@gentoo.org>
+  octopus-3.0.1-r1.ebuild:
+  filtered jikes and quoted some variables
 
   20 Aug 2007; Vlastimil Babka <caster@gentoo.org> octopus-3.0.1-r1.ebuild:
   Restrict jdk in DEPEND to 1.4 only for added abstract API in 1.5+, reported
diff --git a/dev-db/octopus/Manifest b/dev-db/octopus/Manifest
index 9348127eaefe..0dc67b48f3ef 100644
--- a/dev-db/octopus/Manifest
+++ b/dev-db/octopus/Manifest
@@ -1,17 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX octopus-3.0.1-gentoo-build.xml 15173 RMD160 f41c4f0f35c6ba82a7bffbabc3bc92ea287bbfd2 SHA1 d445125369890ea3a7f7b35938a1674f8540785d SHA256 9e4ee3eee4b814e041dd2ded687c3d4aa556357ccf66047c3f66b1627ea10a4b
 MD5 24925210eca628235c1f8a498f261dc2 files/octopus-3.0.1-gentoo-build.xml 15173
 RMD160 f41c4f0f35c6ba82a7bffbabc3bc92ea287bbfd2 files/octopus-3.0.1-gentoo-build.xml 15173
 SHA256 9e4ee3eee4b814e041dd2ded687c3d4aa556357ccf66047c3f66b1627ea10a4b files/octopus-3.0.1-gentoo-build.xml 15173
 DIST octopus-3.0-1.src.tar.gz 25968343 RMD160 cb55e7fb574f522c4396bc83905dca9d8e94b983 SHA1 403f96abcab23429ddb6f4d8709326f73521e263 SHA256 9f37514f0540c64aba2163b4c4faa5d5327db6c7f1946fcbe7dc0a36a2097cac
 DIST octopus-xmls-3.0.1.tar.bz2 22492 RMD160 c99466a70cf1d7ab17a69c606fad49fc3bdf8279 SHA1 1e829160ed7f0137f8d59d007a98ec2816d80cb7 SHA256 e92e32cfca1955e7de2cd6a02bdd9bf279b2cf9471bd0ba93a4e13532e4f4095
-EBUILD octopus-3.0.1-r1.ebuild 1806 RMD160 9d458b197209c0237358afe289c6de012f2c7c13 SHA1 109faeea49d6642282a1fa1d52679744fee78034 SHA256 c3784d9b772b5d030f7f9a4c06676fc01d31cd543a8f232374de674852480fb3
-MD5 688aaf848feb6e934b1c402d9d7e3927 octopus-3.0.1-r1.ebuild 1806
-RMD160 9d458b197209c0237358afe289c6de012f2c7c13 octopus-3.0.1-r1.ebuild 1806
-SHA256 c3784d9b772b5d030f7f9a4c06676fc01d31cd543a8f232374de674852480fb3 octopus-3.0.1-r1.ebuild 1806
-MISC ChangeLog 1835 RMD160 c8af1f0961eeb23a60e9a67a3ea77f50c9ab5dbc SHA1 d9fe3f728bff59a3cccba6c40ff3d330d6ed0a34 SHA256 bf6c348ec11257b7b01c0ecda8ad8b0bf3418bbb277da06a1ea4de710f933622
-MD5 d990302d611888a4b51ba63b08d62c28 ChangeLog 1835
-RMD160 c8af1f0961eeb23a60e9a67a3ea77f50c9ab5dbc ChangeLog 1835
-SHA256 bf6c348ec11257b7b01c0ecda8ad8b0bf3418bbb277da06a1ea4de710f933622 ChangeLog 1835
+EBUILD octopus-3.0.1-r1.ebuild 1845 RMD160 7dde097b16f82e34181aca5109fd1c8802041d65 SHA1 9c9010d3ee83ea83902665f1d8332763407e3add SHA256 b77c349e69fd98fefcdfb0845905e1924e1bde065f6a3e667acb443e7552f081
+MD5 5cce8c3f207fdd1cf37cdd258b8c3213 octopus-3.0.1-r1.ebuild 1845
+RMD160 7dde097b16f82e34181aca5109fd1c8802041d65 octopus-3.0.1-r1.ebuild 1845
+SHA256 b77c349e69fd98fefcdfb0845905e1924e1bde065f6a3e667acb443e7552f081 octopus-3.0.1-r1.ebuild 1845
+MISC ChangeLog 1960 RMD160 0d4b07c43b8ca5eb4377d2b1b0281010d448771d SHA1 1564c0ded231752cfb617db5e353570cf3e6268f SHA256 916e262372152196a28701b62a38c14b42ee5fcf37b22a4f4566bbfdbeef5b09
+MD5 725f2db38d9099a2abe3d59d494c6a69 ChangeLog 1960
+RMD160 0d4b07c43b8ca5eb4377d2b1b0281010d448771d ChangeLog 1960
+SHA256 916e262372152196a28701b62a38c14b42ee5fcf37b22a4f4566bbfdbeef5b09 ChangeLog 1960
 MISC metadata.xml 360 RMD160 3866ff6e15925bf44afaf6495d232310977bcf10 SHA1 2d8d9bf19917f3177a76cf27ece6bb094f8a06e3 SHA256 276d2a4e636b8f732db4f61630d7d0737aa8ebcd2192ead0907cc8f3e664bd52
 MD5 f714935dbbb0098df2d7c92514e7703b metadata.xml 360
 RMD160 3866ff6e15925bf44afaf6495d232310977bcf10 metadata.xml 360
@@ -19,3 +22,10 @@ SHA256 276d2a4e636b8f732db4f61630d7d0737aa8ebcd2192ead0907cc8f3e664bd52 metadata
 MD5 0e40c109914222d2fcda00f41eab2a7d files/digest-octopus-3.0.1-r1 515
 RMD160 6d193267ee00c5c8993163a4a24d68f1e611469e files/digest-octopus-3.0.1-r1 515
 SHA256 d5e311cd19d535c3b487e503b25e905c14813ad409270cdedcc61f1767356f02 files/digest-octopus-3.0.1-r1 515
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFHOZg3NQqtfCuFneMRAuQYAKCWeGN/YxGTr8oJ0k5qavWFtMcUDACffwJi
+YhwRnRHj4Yh24FkRLGlEGSg=
+=w0f+
+-----END PGP SIGNATURE-----
diff --git a/dev-db/octopus/octopus-3.0.1-r1.ebuild b/dev-db/octopus/octopus-3.0.1-r1.ebuild
index 5678282ea54e..53f1207e81a5 100644
--- a/dev-db/octopus/octopus-3.0.1-r1.ebuild
+++ b/dev-db/octopus/octopus-3.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/octopus/octopus-3.0.1-r1.ebuild,v 1.7 2007/08/20 16:19:10 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/octopus/octopus-3.0.1-r1.ebuild,v 1.8 2007/11/13 12:27:27 opfer Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -41,14 +41,15 @@ src_unpack() {
 	mv xmls "${S}"/modules/Octopus
 
 	cd "${S}"/modules
-	cp ${FILESDIR}/${P}-gentoo-build.xml build.xml
+	cp "${FILESDIR}/${P}-gentoo-build.xml" build.xml
 	java-ant_rewrite-classpath build.xml
+	java-pkg_filter-compiler jikes
 }
 
 EANT_GENTOO_CLASSPATH="xerces-2,rhino-1.6,ant-core,junit,log4j"
 
 src_compile() {
-	cd ${S}/modules
+	cd "${S}/modules"
 
 	use source && antflags="${antflags} sourcezip-all"
 
@@ -65,12 +66,12 @@ RESTRICT="test"
 src_install() {
 	dodoc ChangeLog.txt ReleaseNotes.txt
 
-	cd ${S}/modules
+	cd "${S}/modules"
 	java-pkg_dojar dist/*.jar
 
 	if use source; then
 		dodir /usr/share/doc/${PF}/source
-		cp dist/*-src.zip ${D}usr/share/doc/${PF}/source
+		cp dist/*-src.zip "${D}usr/share/doc/${PF}/source"
 	fi
 	if use doc; then
 		docinto html/api