Depend on dev-java/ant-tasks instead of dev-java/ant and cleanup ebuild a little.

Package-Manager: portage-2.1.2.2

diff --git a/dev-java/struts/ChangeLog b/dev-java/struts/ChangeLog
index ef0faf7c31c494e38c8c4326746e582eec8a4353..a855619ef78c51aec90d29cb7cfc1839679fd7e4 100644 (file)
--- a/dev-java/struts/ChangeLog
+++ b/dev-java/struts/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/struts
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.30 2006/12/09 09:25:00 flameeyes Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.31 2007/03/27 15:40:45 betelgeuse Exp $
+
+  27 Mar 2007; Petteri Räty <betelgeuse@gentoo.org> struts-1.2.9-r1.ebuild:
+  Depend on dev-java/ant-tasks instead of dev-java/ant and cleanup ebuild a
+  little.
 
   09 Dec 2006; Diego Pettenò <flameeyes@gentoo.org> struts-1.2.9-r1.ebuild:
   Add ~x86-fbsd keyword.

diff --git a/dev-java/struts/Manifest b/dev-java/struts/Manifest
index 6b19c1b10ad57dce21405682c0513db08bcfcd97..5609336362e874f1afec4e2bccaaf2a33663f32e 100644 (file)
--- a/dev-java/struts/Manifest
+++ b/dev-java/struts/Manifest
@@ -7,14 +7,14 @@ EBUILD struts-1.1-r4.ebuild 2354 RMD160 3617c2b04731731de1684f42965e3ba85004a482
 MD5 03e38a674123224f0669096e7bc4e866 struts-1.1-r4.ebuild 2354
 RMD160 3617c2b04731731de1684f42965e3ba85004a482 struts-1.1-r4.ebuild 2354
 SHA256 cdba4f045b17f517b3b80aba0f10f90af18181083e81b81343f31e9b5cb9cc91 struts-1.1-r4.ebuild 2354
-EBUILD struts-1.2.9-r1.ebuild 2659 RMD160 a9decbf40b58f06e1f9384b34e0b04658ff2bd41 SHA1 d0cf399f6293b1c6b689728aca9086bd6cb5247f SHA256 af064484a9d7bef54f533d26c3c879e699dcef70000ad0ccd60eb87fb1805554
-MD5 6a7b5003270376ba7a45e89a244d5e89 struts-1.2.9-r1.ebuild 2659
-RMD160 a9decbf40b58f06e1f9384b34e0b04658ff2bd41 struts-1.2.9-r1.ebuild 2659
-SHA256 af064484a9d7bef54f533d26c3c879e699dcef70000ad0ccd60eb87fb1805554 struts-1.2.9-r1.ebuild 2659
-MISC ChangeLog 5325 RMD160 5879c44c3b52ab83e4e9028bc9cf910a82ed2422 SHA1 307124162ca4b0a346b6d981f329c2289275597f SHA256 edf89cf6ea2d34e406381a5b198b6a9f2cc8e538ca065eba7361bc853467b5cb
-MD5 85d0e7e4fcb600d7c6a9f2bdd97beaac ChangeLog 5325
-RMD160 5879c44c3b52ab83e4e9028bc9cf910a82ed2422 ChangeLog 5325
-SHA256 edf89cf6ea2d34e406381a5b198b6a9f2cc8e538ca065eba7361bc853467b5cb ChangeLog 5325
+EBUILD struts-1.2.9-r1.ebuild 2655 RMD160 a388ca106bbeb4358a96bf5a64c4ac09cc3f8070 SHA1 9e13f6ae6f1cfe8dcc7d282833b1e100cb1f0d7c SHA256 fee2ef6d732c229c6abcd2fa4bc8c62b3daf4270b969792f06402fc37a58b75c
+MD5 68890a7ab78bcd0f68e03d18cf327009 struts-1.2.9-r1.ebuild 2655
+RMD160 a388ca106bbeb4358a96bf5a64c4ac09cc3f8070 struts-1.2.9-r1.ebuild 2655
+SHA256 fee2ef6d732c229c6abcd2fa4bc8c62b3daf4270b969792f06402fc37a58b75c struts-1.2.9-r1.ebuild 2655
+MISC ChangeLog 5490 RMD160 f50c7ba579d4627e54dc255afe092dc40a97022a SHA1 ff14b4747538c90c1aed016f1c6f7fe94e7b2d8a SHA256 554e2252853e6addf4b8763f9da83908cba8dbcc94673ae8f0938f82b71f9c7e
+MD5 4d50e215b6c9066b5cd6c1a3589ad06d ChangeLog 5490
+RMD160 f50c7ba579d4627e54dc255afe092dc40a97022a ChangeLog 5490
+SHA256 554e2252853e6addf4b8763f9da83908cba8dbcc94673ae8f0938f82b71f9c7e ChangeLog 5490
 MISC metadata.xml 446 RMD160 cef996f6ba3e4f162c7c3cb01f767fbf140fb77c SHA1 23aa61ce80aba8d36a44ab8b5716d2f938736f94 SHA256 ec0f1085c4de877f6864625a8a5d94aa7fb8589d1329c3113600210770e65c33
 MD5 78a33d5e50bccb529dda947894c83d5d metadata.xml 446
 RMD160 cef996f6ba3e4f162c7c3cb01f767fbf140fb77c metadata.xml 446
@@ -26,9 +26,9 @@ MD5 13d4762881f165212ab229d51b6217f1 files/digest-struts-1.2.9-r1 253
 RMD160 8b2ae452c1acbfb02532d53e88eace3c71330008 files/digest-struts-1.2.9-r1 253
 SHA256 43e79b85ca106a5e434d5781e616ac42d843ad950aa24c25912455e10625a365 files/digest-struts-1.2.9-r1 253
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFFeoDzAiZjviIA2XgRAonEAKDZxW5H4Lans7QElNc05CA6TB/7cACg5LfZ
-oehl8CUUcb19krI+9s+8eYQ=
-=ST7v
+iD8DBQFGCTsFcxLzpIGCsLQRAiVsAJ9ie9LYCsXrSUiwCUhaWc39R19u9wCfYOss
+J3+CP625WpknRdYzSiLoQ6c=
+=Vmhh
 -----END PGP SIGNATURE-----

diff --git a/dev-java/struts/struts-1.2.9-r1.ebuild b/dev-java/struts/struts-1.2.9-r1.ebuild
index b9ca2ea15a2b9e8353b2fb4709bab33929ff4908..e49805ae8c92dd35e9ade3edb9694589124b226a 100644 (file)
--- a/dev-java/struts/struts-1.2.9-r1.ebuild
+++ b/dev-java/struts/struts-1.2.9-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.9-r1.ebuild,v 1.4 2006/12/09 09:25:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.9-r1.ebuild,v 1.5 2007/03/27 15:40:45 betelgeuse Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -24,7 +24,7 @@ RDEPEND=">=virtual/jre-1.4
        ${COMMON_DEPS}"
 DEPEND=">=virtual/jdk-1.4
        ${COMMON_DEPS}
-       >=dev-java/ant-1.6.0
+       >=dev-java/ant-tasks-1.6.0
        source? ( app-arch/zip )"
 IUSE="doc examples source"
 KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
@@ -35,8 +35,8 @@ src_unpack() {
        unpack ${A}
 
        # the build.xml expects this directory to exist
-       mkdir ${S}/lib
-       cd ${S}/lib
+       mkdir "${S}/lib"
+       cd "${S}/lib"
 
        # No property exists for this
        java-pkg_jar-from commons-collections
@@ -44,7 +44,6 @@ src_unpack() {
 
 src_compile() {
        local antflags="compile.library"
-       use doc && antflags="${antflags} compile.javadoc"
 
        # In the order the build process asks for these
        # They are copied in the build.xml to ${S}/target/library/
@@ -62,7 +61,7 @@ src_compile() {
        # only needed for contrib stuff which we don't currently build
 #      antflags="${antflags} -Dstruts-legacy.jar=$(java-pkg_getjars struts-legacy)"
 
-       eant ${antflags}
+       eant ${antflags} $(use_doc compile.javadoc)
 }
 
 src_install() {
@@ -72,11 +71,11 @@ src_install() {
        insinto /usr/share/${PN}-${SLOT}/lib
        doins target/library/*.tld
 
-       dodoc README STATUS.txt
+       dodoc README STATUS.txt || die
        use doc && java-pkg_dohtml -r target/documentation/
        if use examples; then
                dodir /usr/share/doc/${PF}/examples
-               cp -r src/example*/* ${D}/usr/share/doc/${PF}/examples
+               cp -r src/example*/* "${D}/usr/share/doc/${PF}/examples"
        fi
        use source && java-pkg_dosrc src/share/*
 }