Relaxed jmock dependency to allow 1.1.0 too and fixed the java5 use flag handling...

Package-Manager: portage-2.1.2_rc3-r9

diff --git a/dev-java/jmock/Manifest b/dev-java/jmock/Manifest
index 16299e1dc4c9af45ea3c25e398b81c9c44d9ed08..eb1a1371ade88e5d0bef5342467ac2a5a41647e4 100644 (file)
--- a/dev-java/jmock/Manifest
+++ b/dev-java/jmock/Manifest
@@ -1,15 +1,46 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 c7e432f48a9d747886a721183bcccb06 ChangeLog 637
-MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 096b9a1b56cbbfb868f108fd5bfb6cbc jmock-1.0.1.ebuild 1238
-MD5 0fd831ae4b7efbc9184522cf832aeb2f files/digest-jmock-1.0.1 64
+AUX 1.1.0-build.xml.patch 837 RMD160 8cd54912042c3bc82cfcd3a4c1da88e8f8fd0fa2 SHA1 2bdb27224974e5eed9e095156b700bb550116bb8 SHA256 257408d1b0cc1abbb3f7666736d3db5de514a00f49a2de66590770ac96a2769f
+MD5 18c71e9bbd03b860feb0d8d93f031b01 files/1.1.0-build.xml.patch 837
+RMD160 8cd54912042c3bc82cfcd3a4c1da88e8f8fd0fa2 files/1.1.0-build.xml.patch 837
+SHA256 257408d1b0cc1abbb3f7666736d3db5de514a00f49a2de66590770ac96a2769f files/1.1.0-build.xml.patch 837
+AUX 1.1.0-junit-3.8.2.patch 681 RMD160 f1ceef7919a8613673037ea0238be07de036010a SHA1 8f8f78d449c7ca2a105084c0da0f0345dc828101 SHA256 aef4c6713cac242e0da491bb7b92c243bf97d57c3f612f1433c84f2f050bca31
+MD5 a2a8806b03c6de5a72d2f803a0eb8c3a files/1.1.0-junit-3.8.2.patch 681
+RMD160 f1ceef7919a8613673037ea0238be07de036010a files/1.1.0-junit-3.8.2.patch 681
+SHA256 aef4c6713cac242e0da491bb7b92c243bf97d57c3f612f1433c84f2f050bca31 files/1.1.0-junit-3.8.2.patch 681
+AUX jmock-1.0.1-buildxml.patch 1816 RMD160 599171507a592917e707e5b030a2512cb7093681 SHA1 51063fdc86dcaf16f533678093dfb54f939df4bc SHA256 5c3cc35b3317a3a95648c890f08237bcb8f3506523dee54356b7bfc82cdd5316
 MD5 b69ef29942edee112378f7c04e0a0df1 files/jmock-1.0.1-buildxml.patch 1816
+RMD160 599171507a592917e707e5b030a2512cb7093681 files/jmock-1.0.1-buildxml.patch 1816
+SHA256 5c3cc35b3317a3a95648c890f08237bcb8f3506523dee54356b7bfc82cdd5316 files/jmock-1.0.1-buildxml.patch 1816
+DIST jmock-1.0.1-src.jar 605139 RMD160 8e0ab4da5f142853204114cdd3746132a60807b4 SHA1 5457ef71930e3c8a17ca157bca152d8d41ef1292 SHA256 9f00a9907fecae2a45bd69a71d0b0b3c51c0ff3478a89c9c5b9d29a58c3f9a16
+DIST jmock-1.1.0-src.zip 579355 RMD160 0e8313e404c444ef84e2eebfb946e73bfac65b42 SHA1 f22b987e29a5dc6c1c23500720d7c3a0b7345d70 SHA256 3f9fbfe322e2e09878a9418c86c9f440bf135ea09487e117d151f12cfc93050e
+EBUILD jmock-1.0.1.ebuild 1238 RMD160 f6ae9670080e5d1463adc004e5f8048b8845e11e SHA1 60f33a2f4c8da2778d9a78cf784c32ccc2331233 SHA256 d80fd3aac7a79d3305eb4d60b012f4ec97fdaf62d385d40fa5bb8d5fb7b4af4e
+MD5 096b9a1b56cbbfb868f108fd5bfb6cbc jmock-1.0.1.ebuild 1238
+RMD160 f6ae9670080e5d1463adc004e5f8048b8845e11e jmock-1.0.1.ebuild 1238
+SHA256 d80fd3aac7a79d3305eb4d60b012f4ec97fdaf62d385d40fa5bb8d5fb7b4af4e jmock-1.0.1.ebuild 1238
+EBUILD jmock-1.1.0.ebuild 1397 RMD160 3617e66665f46d53398f8771a0160bac2d512594 SHA1 a94f9147a473ba13234346111e2ff4d605727584 SHA256 82147ed9f3c93e7e3ed23e8b9183698bb56150a6e904b4b737e1f6f912b7ab99
+MD5 70d9fcd5e3f7eb08e32afb662df116ad jmock-1.1.0.ebuild 1397
+RMD160 3617e66665f46d53398f8771a0160bac2d512594 jmock-1.1.0.ebuild 1397
+SHA256 82147ed9f3c93e7e3ed23e8b9183698bb56150a6e904b4b737e1f6f912b7ab99 jmock-1.1.0.ebuild 1397
+MISC ChangeLog 941 RMD160 456fd8e0fb5523080bebeae04d2142acda3a0e7b SHA1 6789840cf0f81a6a7d948e6ea62739341b9e9abe SHA256 0e5cb09f72f0959abc15d090fb0e964817edceba3de42f7c95451b39ab2a40e2
+MD5 f8551c6800c4ece142f53e2b01afc517 ChangeLog 941
+RMD160 456fd8e0fb5523080bebeae04d2142acda3a0e7b ChangeLog 941
+SHA256 0e5cb09f72f0959abc15d090fb0e964817edceba3de42f7c95451b39ab2a40e2 ChangeLog 941
+MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
+SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
+MD5 9a5ff970485061a6ec41bcaeb258d6bc files/digest-jmock-1.0.1 238
+RMD160 b472d018188a5815027851052069a83ca69dca73 files/digest-jmock-1.0.1 238
+SHA256 ac1d1a144a3c4142afefd7533fb60c596bd8af562388fc07d2a31b528bef9899 files/digest-jmock-1.0.1 238
+MD5 f09a56ee5710eea9a8e93e835f18a50c files/digest-jmock-1.1.0 238
+RMD160 c90136b4684091e9a71e159b72dfee5156b60d74 files/digest-jmock-1.1.0 238
+SHA256 2fd9eb714ae693f8bf77f49c9286f2dd1512bee34f53e1476331fe1ed05c493c files/digest-jmock-1.1.0 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFDIwbM/rLF9B432nYRArNRAJ9wN2kIVgeNZuWAYtvgKFlodTengQCaA/tG
-+1Sq3cGP3z7XAvCTXlxJr9Y=
-=/EwG
+iD8DBQFFjFvncxLzpIGCsLQRAk9aAJ9yYBBFzVUmihzkZzzlPxq07kFNmgCfTsWY
+eMbI9HWFi/JLMVf2UCAZprc=
+=FI4r
 -----END PGP SIGNATURE-----

diff --git a/dev-java/xstream/ChangeLog b/dev-java/xstream/ChangeLog
index 7cb4cc5882de260b3db9fdf55fe844b9fc76da1b..088b8b405a73badbad4c5952c0e1cee3db449587 100644 (file)
--- a/dev-java/xstream/ChangeLog
+++ b/dev-java/xstream/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/xstream
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/ChangeLog,v 1.3 2006/10/03 10:32:27 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/ChangeLog,v 1.4 2006/12/22 22:27:10 betelgeuse Exp $
+
+  22 Dec 2006; Petteri Räty <betelgeuse@gentoo.org> xstream-1.2.ebuild:
+  Relaxed jmock dependency to allow 1.1.0 too and fixed the java5 use flag
+  handling as 2.0.31 can handle it properly automatically.
 
   03 Oct 2006; Vlastimil Babka <caster@gentoo.org> xstream-1.2.ebuild:
   Fixed javadoc target name and raised version of joda-time dependency to

diff --git a/dev-java/xstream/Manifest b/dev-java/xstream/Manifest
index 37e40ce06fb65b44fcd21e147e384c72cc2f4a59..3df97acbb212395f78a03e3dcf830e7262a568f9 100644 (file)
--- a/dev-java/xstream/Manifest
+++ b/dev-java/xstream/Manifest
@@ -1,12 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST xstream-1.2.zip 5488349 RMD160 1f55cf75c8ed2cf2746727e3435b119c5caa1eff SHA1 e0713b355dea36be4951299e441ffd510eee6d19 SHA256 7536d9b1f2bf1c1b235d1a1114dbdae08a8ed5953b1fe7a2c760bf807770e26d
-EBUILD xstream-1.2.ebuild 1591 RMD160 bd11aff6c09e6e59e06cce316f54273fcae8b88a SHA1 d11e51e83f0ce092ac9d224deb5df217a9d27582 SHA256 5eb48ef26dea7f7e5de70e4bc5fb7fbd9d4d049f5bda494f221194730260e1df
-MD5 e732a290aba986c9488db9892f98d1aa xstream-1.2.ebuild 1591
-RMD160 bd11aff6c09e6e59e06cce316f54273fcae8b88a xstream-1.2.ebuild 1591
-SHA256 5eb48ef26dea7f7e5de70e4bc5fb7fbd9d4d049f5bda494f221194730260e1df xstream-1.2.ebuild 1591
-MISC ChangeLog 682 RMD160 77281ff9f87c78bf4a2b9685810eab41f058a075 SHA1 19490d599a11add4ef5b64bd23c606ae2c45210b SHA256 d4b543b3aaa4f2835fecd43df65f6659fbcba868b29e21df544005de8bfbceed
-MD5 45343846269a4daac88ea4b9450d905c ChangeLog 682
-RMD160 77281ff9f87c78bf4a2b9685810eab41f058a075 ChangeLog 682
-SHA256 d4b543b3aaa4f2835fecd43df65f6659fbcba868b29e21df544005de8bfbceed ChangeLog 682
+EBUILD xstream-1.2.ebuild 1529 RMD160 c771c289092f5af0faa078098b3828eb91f7b870 SHA1 3b939260f9f972b345ddba89273d1b9fe62ba276 SHA256 dffe3e2c4101d9bf6903e1a97090c98d5281a69c02b48a7733b433a48a4f3768
+MD5 be62d836ebf925f05abbdb553cc98987 xstream-1.2.ebuild 1529
+RMD160 c771c289092f5af0faa078098b3828eb91f7b870 xstream-1.2.ebuild 1529
+SHA256 dffe3e2c4101d9bf6903e1a97090c98d5281a69c02b48a7733b433a48a4f3768 xstream-1.2.ebuild 1529
+MISC ChangeLog 894 RMD160 1b47ccf5ac42f1577434f79101eba93125c0c9a8 SHA1 452eed519acfac6db1c2ae4cfe05dc684e08bf21 SHA256 f7a9bdc24c487864aa98f2616aaabbb2ce8bf5102d321abae46a1466df86ef2d
+MD5 72e0efbad44f60ce6cab5d8cbe2b1961 ChangeLog 894
+RMD160 1b47ccf5ac42f1577434f79101eba93125c0c9a8 ChangeLog 894
+SHA256 f7a9bdc24c487864aa98f2616aaabbb2ce8bf5102d321abae46a1466df86ef2d ChangeLog 894
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -14,3 +17,10 @@ SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata
 MD5 6d138d9666f6785f28e28165c66e23d0 files/digest-xstream-1.2 229
 RMD160 9d60b66396216af85c361aef31f3780db784d222 files/digest-xstream-1.2 229
 SHA256 0e41d935f72c2fdf5a134ce035cb5da96c42f26777e1df3e2f6b8559d3676bc0 files/digest-xstream-1.2 229
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFjFvIcxLzpIGCsLQRAtC+AJ437xTnQivFNRgYXLtwPkOukgDQxQCeIo5X
+eYQFp1OvzrrFEr4EIS+DbYk=
+=nIgn
+-----END PGP SIGNATURE-----

diff --git a/dev-java/xstream/xstream-1.2.ebuild b/dev-java/xstream/xstream-1.2.ebuild
index 9b0c0b987bb682a045e6a93580e4f9e21d219b37..3711cdf3852bbc64e023a3459be71088c368206d 100644 (file)
--- a/dev-java/xstream/xstream-1.2.ebuild
+++ b/dev-java/xstream/xstream-1.2.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/xstream/xstream-1.2.ebuild,v 1.3 2006/10/03 10:32:27 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/xstream-1.2.ebuild,v 1.4 2006/12/22 22:27:10 betelgeuse Exp $
 
 inherit java-pkg-2
 
@@ -19,7 +19,7 @@ COMMON_DEPS="
        >=dev-java/dom4j-1.3
        dev-java/jsr173
        ~dev-java/jdom-1.0
-       =dev-java/jmock-1.0*
+       =dev-java/jmock-1*
        >=dev-java/joda-time-1.2
        dev-java/xom
        >=dev-java/xpp3-1.1.3.4
@@ -27,6 +27,7 @@ COMMON_DEPS="
 "
 DEPEND="java5? ( >=virtual/jdk-1.5 )
        !java5? ( =virtual/jdk-1.4* )
+       >=dev-java/java-config-2.0.31
        dev-java/ant-core
        app-arch/unzip
        source? ( app-arch/zip )
@@ -35,8 +36,6 @@ RDEPEND=">=virtual/jre-1.4
        dev-java/jsr173
        ${COMMON_DEPS}"
 
-! use java5 && JAVA_PKG_NV_DEPEND="=virtual/jdk-1.4*"
-
 src_unpack() {
        unpack ${A}
        cd ${S}/lib
@@ -53,10 +52,6 @@ src_unpack() {
        java-pkg_jar-from xpp3
 }
 
-src_compile() {
-       eant jar $(use_doc)
-}
-
 src_install() {
        java-pkg_newjar ${P}.jar