diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2006-12-22 22:27:10 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2006-12-22 22:27:10 +0000 |
| commit | 17c45017e35ef2f2210692b191aa110faa5d1d17 (patch) | |
| tree | 61fac98f5a730d8a6a5cf519acd7db2d7c1d8638 /dev-java/xstream | |
| parent | Fix "shots not seen" with -fstrict-aliasing. Bug #140918 (diff) | |
| download | historical-17c45017e35ef2f2210692b191aa110faa5d1d17.tar.gz historical-17c45017e35ef2f2210692b191aa110faa5d1d17.tar.bz2 historical-17c45017e35ef2f2210692b191aa110faa5d1d17.zip | |
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.
Package-Manager: portage-2.1.2_rc3-r9
Diffstat (limited to 'dev-java/xstream')
| -rw-r--r-- | dev-java/xstream/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/xstream/Manifest | 26 | ||||
| -rw-r--r-- | dev-java/xstream/xstream-1.2.ebuild | 11 |
3 files changed, 26 insertions, 17 deletions
diff --git a/dev-java/xstream/ChangeLog b/dev-java/xstream/ChangeLog index 7cb4cc5882de..088b8b405a73 100644 --- 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 37e40ce06fb6..3df97acbb212 100644 --- 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 9b0c0b987bb6..3711cdf3852b 100644 --- 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 |