Always needs junit and commons-logging to compile. Relaxed commons-jexl dependency...

Package-Manager: portage-2.1.2_rc4-r1

diff --git a/dev-java/commons-jelly/ChangeLog b/dev-java/commons-jelly/ChangeLog
index 80a7699e54aff647424b8ad625c5f0bac96bc333..97f643474f99a9666ede23a1cd4e830e73c00b74 100644 (file)
--- a/dev-java/commons-jelly/ChangeLog
+++ b/dev-java/commons-jelly/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/commons-jelly
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/ChangeLog,v 1.4 2006/11/30 15:30:43 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/ChangeLog,v 1.5 2006/12/26 18:12:06 betelgeuse Exp $
+
+  26 Dec 2006; Petteri Räty <betelgeuse@gentoo.org>
+  commons-jelly-1.0-r1.ebuild:
+  Always needs junit and commons-logging to compile. Relaxed commons-jexl
+  dependency for upcoming version bump and cleaned the ebuild.
 
   30 Nov 2006; Vlastimil Babka <caster@gentoo.org>
   -commons-jelly-1.0.ebuild, commons-jelly-1.0-r1.ebuild:

diff --git a/dev-java/commons-jelly/Manifest b/dev-java/commons-jelly/Manifest
index c4011ccf6af03afdf6cd17e5f133b529aad64e6f..7ecaa1d5fd9efbb25a152f083cfb260f4fee60ee 100644 (file)
--- a/dev-java/commons-jelly/Manifest
+++ b/dev-java/commons-jelly/Manifest
@@ -1,16 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX commons-jelly-1.0-gentoo.patch 2224 RMD160 ab9179ac39196b1dbe6fc8f9bffdc498ad363697 SHA1 9509b52e2841561c7ee50ff2bc96884764a4d55b SHA256 0e064c87ae4a2a91f7c98c546e0f3bf9f9ff4caf877e0c2f28a6b3443e6f3533
 MD5 54a1c7c1840da66a583e5ec54ddb94c1 files/commons-jelly-1.0-gentoo.patch 2224
 RMD160 ab9179ac39196b1dbe6fc8f9bffdc498ad363697 files/commons-jelly-1.0-gentoo.patch 2224
 SHA256 0e064c87ae4a2a91f7c98c546e0f3bf9f9ff4caf877e0c2f28a6b3443e6f3533 files/commons-jelly-1.0-gentoo.patch 2224
 DIST commons-jelly-1.0-src.tar.gz 174769 RMD160 c273e80fb10327a833d192e89500a08302d68c58 SHA1 a0aedfa7ce69288277cc3c06b1d832a7a97affe5 SHA256 113d606361845d08dab69f187690bf5dcfb5e9ca8fab780135898eb6d0a8d7d1
-EBUILD commons-jelly-1.0-r1.ebuild 1898 RMD160 f692169d675ffb1be0dbb35ce5db62638c277afe SHA1 857cc351ce5b568e5f6039db9a76f6df6c681b63 SHA256 0586c7ef99e7210861e23ef0c69c9facb3926f61f89837f45c5e7fdd183e1c66
-MD5 64a0edee5788d4145655c8e0c49a63d5 commons-jelly-1.0-r1.ebuild 1898
-RMD160 f692169d675ffb1be0dbb35ce5db62638c277afe commons-jelly-1.0-r1.ebuild 1898
-SHA256 0586c7ef99e7210861e23ef0c69c9facb3926f61f89837f45c5e7fdd183e1c66 commons-jelly-1.0-r1.ebuild 1898
-MISC ChangeLog 839 RMD160 6c55b312c2bd38e6f68bd4706cde0eec7d6fc112 SHA1 acdd17e857c1042d2ce775641dd368385f1f9aea SHA256 bd5d1faeabdbc743a642dcaa232a376e3202eeea5d0ff4f7cdc7dc5eb9e8f489
-MD5 13cb44dd2d28f933b99c6a750b0f7d1b ChangeLog 839
-RMD160 6c55b312c2bd38e6f68bd4706cde0eec7d6fc112 ChangeLog 839
-SHA256 bd5d1faeabdbc743a642dcaa232a376e3202eeea5d0ff4f7cdc7dc5eb9e8f489 ChangeLog 839
+EBUILD commons-jelly-1.0-r1.ebuild 1788 RMD160 1aea302b1c0051d605310a1a15a2806ea681252f SHA1 7b4b51dc1b2f51fe431d20e365b72155d9d887d1 SHA256 01e49c22074f719a441038c5a1335239acfec33172ad7cd82a8d6c2cd1c8333c
+MD5 64f0bf2d52b19a4b2254164ae8a3069d commons-jelly-1.0-r1.ebuild 1788
+RMD160 1aea302b1c0051d605310a1a15a2806ea681252f commons-jelly-1.0-r1.ebuild 1788
+SHA256 01e49c22074f719a441038c5a1335239acfec33172ad7cd82a8d6c2cd1c8333c commons-jelly-1.0-r1.ebuild 1788
+MISC ChangeLog 1065 RMD160 e8d96a683868aa0bed9279dde4c1a60cccbe970c SHA1 a6cef9dc0e2a2b2b7bbef9795e091dc6c0047ba3 SHA256 23bcd8411ee32d6efd7a10ffd37b130bd66d56226124c4cecaaf1215fb340140
+MD5 d4e29dddfd883c61f8e827967d1c1319 ChangeLog 1065
+RMD160 e8d96a683868aa0bed9279dde4c1a60cccbe970c ChangeLog 1065
+SHA256 23bcd8411ee32d6efd7a10ffd37b130bd66d56226124c4cecaaf1215fb340140 ChangeLog 1065
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -18,3 +21,10 @@ SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata
 MD5 3744be2052ab79799a9e41563ba89d34 files/digest-commons-jelly-1.0-r1 265
 RMD160 038eb778e7c03b78590531801634d23690eaa86d files/digest-commons-jelly-1.0-r1 265
 SHA256 f60bf1dba04b835d8f1c15d2a3ca7034489e1364e604ee8f0df384485808529c files/digest-commons-jelly-1.0-r1 265
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFkWYCcxLzpIGCsLQRAtdHAJ9VqiURPxQUqXypU/5Mu0UOJS+CyACfX24T
+WFrPZgeQ5krjUW23VafvKdU=
+=mfXo
+-----END PGP SIGNATURE-----

diff --git a/dev-java/commons-jelly/commons-jelly-1.0-r1.ebuild b/dev-java/commons-jelly/commons-jelly-1.0-r1.ebuild
index 8ac699b3aaaa2f0790a1945a04e2c8beb335e65d..635a41e8e2d90421f6019c9c53d0401b918aa700 100644 (file)
--- a/dev-java/commons-jelly/commons-jelly-1.0-r1.ebuild
+++ b/dev-java/commons-jelly/commons-jelly-1.0-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/commons-jelly/commons-jelly-1.0-r1.ebuild,v 1.2 2006/11/30 15:30:43 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jelly/commons-jelly-1.0-r1.ebuild,v 1.3 2006/12/26 18:12:06 betelgeuse Exp $
 
 inherit java-pkg-2 java-ant-2 eutils
 
@@ -21,20 +21,18 @@ RDEPEND=">=virtual/jre-1.4
        dev-java/commons-discovery
        dev-java/forehead
        dev-java/jakarta-jstl
-       =dev-java/commons-jexl-1.0*
+       dev-java/commons-jexl
        =dev-java/commons-beanutils-1.6*
        dev-java/commons-collections
        =dev-java/dom4j-1*
        =dev-java/jaxen-1.1*
-       >=dev-java/xerces-2.7"
+       >=dev-java/xerces-2.7
+       dev-java/junit
+       dev-java/commons-logging"
 
 DEPEND=">=virtual/jdk-1.4
        dev-java/ant-core
-       test? (
-               dev-java/junit
-               dev-java/ant-tasks
-               dev-java/commons-logging
-       )
+       test? ( dev-java/ant-tasks )
        ${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
@@ -51,18 +49,15 @@ src_unpack() {
        java-pkg_jar-from commons-discovery,forehead,jakarta-jstl,commons-jexl-1.0
        java-pkg_jar-from commons-beanutils-1.6,commons-collections
        java-pkg_jar-from dom4j-1,jaxen-1.1,xerces-2
-
-       if use test; then
-               java-pkg_jar-from commons-logging
-       fi
+       java-pkg_jar-from commons-logging,junit
 }
 
 src_compile() {
-       local antflags="-Dlibdir=lib jar"
-       use doc && antflags="${antflags} javadoc"
-       use test && antflags="${antflags} test"
+       eant -Dlibdir=lib jar $(use_doc)
+}
 
-       eant ${antflags} || die "Ant failed"
+src_test() {
+       eant test -Dlibdir=lib
 }
 
 src_install() {
@@ -70,6 +65,6 @@ src_install() {
 
        dodoc NOTICE.txt README.txt RELEASE-NOTES.txt
 
-       use doc && java-pkg_dohtml -r dist/docs/api
+       use doc && java-pkg_dojavadoc dist/docs/api
        use source && java-pkg_dosrc src/java/*
 }

diff --git a/dev-java/commons-jexl/Manifest b/dev-java/commons-jexl/Manifest
index a23e6825b50030ac0d114666efc581b743c1de2f..589f369b20ea5037e0e0117468c72e2bc95e9c31 100644 (file)
--- a/dev-java/commons-jexl/Manifest
+++ b/dev-java/commons-jexl/Manifest
@@ -1,11 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 1.1-test-target.patch 607 RMD160 b71e3fd8fb9978db9cde5b8d79a42292c32be346 SHA1 8e6cd7727888c5d396a8930bca3ca3b69852a574 SHA256 1483e77c6ae7a0ca1f12ac95074392b925543b2009693dbaa02d6dbd7571868a
+MD5 9b93ee14b97a3e742a32c5ab9e139489 files/1.1-test-target.patch 607
+RMD160 b71e3fd8fb9978db9cde5b8d79a42292c32be346 files/1.1-test-target.patch 607
+SHA256 1483e77c6ae7a0ca1f12ac95074392b925543b2009693dbaa02d6dbd7571868a files/1.1-test-target.patch 607
 AUX commons-jexl-1.0-gentoo.diff 1266 RMD160 079a1ff85ea01b1bc46b81928fe65953713ed61c SHA1 b72d2f0c63676a0733f42c09f9aa7af3a6c528e8 SHA256 9ec22d4c6cddd92d7a1bd39d1513fb77977fee372baddb67cb83c43618dc3429
 MD5 3e457dd4759eb9454f73ffc9dd4e5fb1 files/commons-jexl-1.0-gentoo.diff 1266
 RMD160 079a1ff85ea01b1bc46b81928fe65953713ed61c files/commons-jexl-1.0-gentoo.diff 1266
 SHA256 9ec22d4c6cddd92d7a1bd39d1513fb77977fee372baddb67cb83c43618dc3429 files/commons-jexl-1.0-gentoo.diff 1266
 DIST commons-jexl-1.0-src.tar.gz 72093 RMD160 36e44c95bb6fdb3abdd6df0ea7d09340f7a8947a SHA1 21714627fe36484dd46f907393c5227e01a96fe4 SHA256 9e1036e1f333af1f4c065fabb14720d671c20d867e689dd454bde181be3bcade
+DIST commons-jexl-1.1-src.tar.gz 128030 RMD160 bcfae643fc473cb6258f0d6c0cfd2124a7e0591f SHA1 f82cffe583c9d84ba75db31fbda3e5f4dc7c3512 SHA256 62026d0cb3edecaadfdee1cf3dfe70a27b7f7ae70a219d7cb7c0f37db57877d5
 EBUILD commons-jexl-1.0-r1.ebuild 1379 RMD160 7b26ab07eec17bff2ebe72c685ffb8c2d4344b90 SHA1 51b14858bf0d13dfa6eb511a9d4e5bd004091781 SHA256 8b5f4a5b4ad9d8fe49bbd6a55e75d9effcbde57b56cb7a2ca37fd7252f523f1d
 MD5 2bbf4375ca2e6ed46bf166ff3e5621ee commons-jexl-1.0-r1.ebuild 1379
 RMD160 7b26ab07eec17bff2ebe72c685ffb8c2d4344b90 commons-jexl-1.0-r1.ebuild 1379
@@ -14,10 +19,14 @@ EBUILD commons-jexl-1.0.ebuild 1456 RMD160 ab9af80a5e700178162a05e8bd580e2166ad7
 MD5 3e267644c17605b1b3888e395331c3d1 commons-jexl-1.0.ebuild 1456
 RMD160 ab9af80a5e700178162a05e8bd580e2166ad7be3 commons-jexl-1.0.ebuild 1456
 SHA256 a3b9a77ee6eb1aadfefd005966e595f53183e0e374b3b509444aedc9964a5b8a commons-jexl-1.0.ebuild 1456
-MISC ChangeLog 728 RMD160 184228c48ce5d930e2374f7b5e3e2b10d09544f9 SHA1 ae02644926015333cd6d09355c3915e357687318 SHA256 eb3d3e505c37ab1d5f5b6f0439784bff7e8ee680f468fe9f86aecc96f0bd3496
-MD5 65bafbc8e8b7d0fc024d934c3c2590d1 ChangeLog 728
-RMD160 184228c48ce5d930e2374f7b5e3e2b10d09544f9 ChangeLog 728
-SHA256 eb3d3e505c37ab1d5f5b6f0439784bff7e8ee680f468fe9f86aecc96f0bd3496 ChangeLog 728
+EBUILD commons-jexl-1.1.ebuild 1204 RMD160 b227034ce959b4340c4346ccdd28cac46787611c SHA1 7cd547def50bcf103683a765ec126959eab97fb5 SHA256 d0c4204f3fef42be30ab9c4e8de02d00e132923820d9c0c4636df5180f0a432b
+MD5 1a64d4ddd8be9064ed0899ceb012eba0 commons-jexl-1.1.ebuild 1204
+RMD160 b227034ce959b4340c4346ccdd28cac46787611c commons-jexl-1.1.ebuild 1204
+SHA256 d0c4204f3fef42be30ab9c4e8de02d00e132923820d9c0c4636df5180f0a432b commons-jexl-1.1.ebuild 1204
+MISC ChangeLog 891 RMD160 b425d95bedecaaecbc83dd3a9336475d96fbedb3 SHA1 be2deb7a46630f835a6873413d57cc8228c28514 SHA256 c84f60a93f21155b20d2af4f2d20fb34997b053bb218bfea1b3d26a691cd195b
+MD5 1e231e12f1b87c119306cc90b40fa111 ChangeLog 891
+RMD160 b425d95bedecaaecbc83dd3a9336475d96fbedb3 ChangeLog 891
+SHA256 c84f60a93f21155b20d2af4f2d20fb34997b053bb218bfea1b3d26a691cd195b ChangeLog 891
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -28,10 +37,13 @@ SHA256 19de978e98c3aa46958468168fecbf8e2dc24314ea318051f8b5677d4a70fc10 files/di
 MD5 59fed9c67160fc866090c7763fd8e581 files/digest-commons-jexl-1.0-r1 259
 RMD160 12d3b63574fea876a53f36aed116c117451c3dc0 files/digest-commons-jexl-1.0-r1 259
 SHA256 19de978e98c3aa46958468168fecbf8e2dc24314ea318051f8b5677d4a70fc10 files/digest-commons-jexl-1.0-r1 259
+MD5 49be28a12afcaa17a068eb9abe3dcf1e files/digest-commons-jexl-1.1 262
+RMD160 0d5f099672dd4d994e45d789ea43779c39cd3204 files/digest-commons-jexl-1.1 262
+SHA256 9bcddb415e419446d2c8d1634824e88b48c94521a6255bbb92a4deab39172dc6 files/digest-commons-jexl-1.1 262
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFEwq0sgo/w9rxVVVERAmzQAKCuftPuFlo/sdagJLrp6uVXCPFBqACfQ9Dw
-PN1H1bx9Ng2o0ugOcWTq0Ro=
-=TEV8
+iD8DBQFFkWadcxLzpIGCsLQRAslXAJ9/FOBoE9fDi2ded7auRhFB2RXzvgCgk6NZ
+Iv4+keJeczjO1HX41COetP4=
+=4fD5
 -----END PGP SIGNATURE-----