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
commit03d5d6b6aeb54e7cbfb56450ea8cc1247b5f8267 (patch)
treec80893d3920225af5a541fd2f4308ad652bc4fd9
parentStable on ppc64; bug #168907 (diff)
downloadgentoo-2-03d5d6b6aeb54e7cbfb56450ea8cc1247b5f8267.tar.gz
gentoo-2-03d5d6b6aeb54e7cbfb56450ea8cc1247b5f8267.tar.bz2
gentoo-2-03d5d6b6aeb54e7cbfb56450ea8cc1247b5f8267.zip
Add java-ant-2 to inherit to make JAVA_PKG_STRICT happy.
(Portage version: 2.1.2.3)
-rw-r--r--dev-java/xstream/ChangeLog7
-rw-r--r--dev-java/xstream/xstream-1.2.ebuild11
2 files changed, 10 insertions, 8 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/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