summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2007-04-15 18:43:43 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2007-04-15 18:43:43 +0000
commitd655303773e7ef38235c2359ab513b734f36af7f (patch)
tree6b751872e5bb7fed473cfaee13971b6af3e3aca3 /dev-java/xstream
parentStable on ppc64; bug #168907 (diff)
downloadhistorical-d655303773e7ef38235c2359ab513b734f36af7f.tar.gz
historical-d655303773e7ef38235c2359ab513b734f36af7f.tar.bz2
historical-d655303773e7ef38235c2359ab513b734f36af7f.zip
Add java-ant-2 to inherit to make JAVA_PKG_STRICT happy.
Package-Manager: portage-2.1.2.3
Diffstat (limited to 'dev-java/xstream')
-rw-r--r--dev-java/xstream/ChangeLog7
-rw-r--r--dev-java/xstream/Manifest24
-rw-r--r--dev-java/xstream/xstream-1.2.ebuild11
3 files changed, 22 insertions, 20 deletions
diff --git a/dev-java/xstream/ChangeLog b/dev-java/xstream/ChangeLog
index 088b8b405a73..9d8c3607355f 100644
--- a/dev-java/xstream/ChangeLog
+++ b/dev-java/xstream/ChangeLog
@@ -1,6 +1,9 @@
# 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.4 2006/12/22 22:27:10 betelgeuse Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/ChangeLog,v 1.5 2007/04/15 18:43:43 betelgeuse Exp $
+
+ 15 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> xstream-1.2.ebuild:
+ Add java-ant-2 to inherit to make JAVA_PKG_STRICT happy.
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
diff --git a/dev-java/xstream/Manifest b/dev-java/xstream/Manifest
index 3df97acbb212..4fce03b856e0 100644
--- a/dev-java/xstream/Manifest
+++ b/dev-java/xstream/Manifest
@@ -2,14 +2,14 @@
Hash: SHA1
DIST xstream-1.2.zip 5488349 RMD160 1f55cf75c8ed2cf2746727e3435b119c5caa1eff SHA1 e0713b355dea36be4951299e441ffd510eee6d19 SHA256 7536d9b1f2bf1c1b235d1a1114dbdae08a8ed5953b1fe7a2c760bf807770e26d
-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
+EBUILD xstream-1.2.ebuild 1495 RMD160 8189ac184f8fc456bfa3457f1262eff47c296d44 SHA1 71eb19237fc9514968588a42da49d9d0e69d2073 SHA256 f9483a718fb0b5c0bdb1b4409a155f526517cdac3a6daf8309e98d30fd11fb06
+MD5 7a276cc413b7d461d3460b02b7d67348 xstream-1.2.ebuild 1495
+RMD160 8189ac184f8fc456bfa3457f1262eff47c296d44 xstream-1.2.ebuild 1495
+SHA256 f9483a718fb0b5c0bdb1b4409a155f526517cdac3a6daf8309e98d30fd11fb06 xstream-1.2.ebuild 1495
+MISC ChangeLog 1027 RMD160 4c85084241598e094aa9ee7b92416d7badf807f9 SHA1 4a5313d7bbbb0aca20a392ac448fb2685ccc3882 SHA256 b6a6fd322051245dca3da1d394c4767d1c5f000b061831e634dca280317bc2b8
+MD5 4a1be24aa90b8fa97d22fac2dc3dbb1f ChangeLog 1027
+RMD160 4c85084241598e094aa9ee7b92416d7badf807f9 ChangeLog 1027
+SHA256 b6a6fd322051245dca3da1d394c4767d1c5f000b061831e634dca280317bc2b8 ChangeLog 1027
MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -18,9 +18,9 @@ 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)
+Version: GnuPG v2.0.3 (GNU/Linux)
-iD8DBQFFjFvIcxLzpIGCsLQRAtC+AJ437xTnQivFNRgYXLtwPkOukgDQxQCeIo5X
-eYQFp1OvzrrFEr4EIS+DbYk=
-=nIgn
+iD8DBQFGInJncxLzpIGCsLQRAlFqAJ0dE1CK59WwB83uVobSUWfraJeQbgCfTdlC
+TQ3irFI5UAqRvpipi/Wgb4o=
+=ClPp
-----END PGP SIGNATURE-----
diff --git a/dev-java/xstream/xstream-1.2.ebuild b/dev-java/xstream/xstream-1.2.ebuild
index 3711cdf3852b..770fdd30dce3 100644
--- a/dev-java/xstream/xstream-1.2.ebuild
+++ b/dev-java/xstream/xstream-1.2.ebuild
@@ -1,8 +1,8 @@
-# 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/xstream/xstream-1.2.ebuild,v 1.4 2006/12/22 22:27:10 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xstream/xstream-1.2.ebuild,v 1.5 2007/04/15 18:43:43 betelgeuse Exp $
-inherit java-pkg-2
+inherit java-pkg-2 java-ant-2
DESCRIPTION="A text-processing Java classes that serialize objects to XML and back again."
HOMEPAGE="http://xstream.codehaus.org/index.html"
@@ -27,15 +27,14 @@ 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 )
${COMMON_DEPS}"
RDEPEND=">=virtual/jre-1.4
- dev-java/jsr173
${COMMON_DEPS}"
+JAVA_PKG_BSFIX="off"
+
src_unpack() {
unpack ${A}
cd ${S}/lib