summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2008-03-05 20:57:43 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2008-03-05 20:57:43 +0000
commitbe3716366afa15aabb575d0d67e39d2aeda8691b (patch)
tree7290343163a37e92f79b15ebf20b75b70c939d55 /dev-java/xerces
parentppc stable, bug #209927 (diff)
downloadgentoo-2-be3716366afa15aabb575d0d67e39d2aeda8691b.tar.gz
gentoo-2-be3716366afa15aabb575d0d67e39d2aeda8691b.tar.bz2
gentoo-2-be3716366afa15aabb575d0d67e39d2aeda8691b.zip
Use EANT_ variables, slot deps and restrict tests so that the upcoming generic src_test works.
(Portage version: 2.1.4.4)
Diffstat (limited to 'dev-java/xerces')
-rw-r--r--dev-java/xerces/ChangeLog6
-rw-r--r--dev-java/xerces/xerces-2.9.1.ebuild22
2 files changed, 17 insertions, 11 deletions
diff --git a/dev-java/xerces/ChangeLog b/dev-java/xerces/ChangeLog
index a020e4b17fcc..78814fff624d 100644
--- a/dev-java/xerces/ChangeLog
+++ b/dev-java/xerces/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/xerces
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/ChangeLog,v 1.103 2008/01/17 14:39:12 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/ChangeLog,v 1.104 2008/03/05 20:57:43 betelgeuse Exp $
+
+ 05 Mar 2008; Petteri Räty <betelgeuse@gentoo.org> xerces-2.9.1.ebuild:
+ Use EANT_ variables, slot deps and restrict tests so that the upcoming
+ generic src_test works.
17 Jan 2008; Vlastimil Babka <caster@gentoo.org>
-files/xerces-2.8.1-gentoo.patch, -files/xerces-2.8.1-no_dom3.patch,
diff --git a/dev-java/xerces/xerces-2.9.1.ebuild b/dev-java/xerces/xerces-2.9.1.ebuild
index f6f6dc645204..0cbbf1f226c2 100644
--- a/dev-java/xerces/xerces-2.9.1.ebuild
+++ b/dev-java/xerces/xerces-2.9.1.ebuild
@@ -1,7 +1,8 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.9.1.ebuild,v 1.2 2008/01/17 14:39:12 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.9.1.ebuild,v 1.3 2008/03/05 20:57:43 betelgeuse Exp $
+EAPI=1
JAVA_PKG_IUSE="doc examples source"
inherit eutils versionator java-pkg-2 java-ant-2
@@ -17,8 +18,7 @@ SLOT="2"
KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
IUSE=""
-# ships with external-1.3.04, need slot dep with lower limit
-COMMON_DEP="=dev-java/xml-commons-external-1.3*
+COMMON_DEP="dev-java/xml-commons-external:1.3
>=dev-java/xml-commons-resolver-1.2
dev-java/xalan-serializer"
RDEPEND=">=virtual/jre-1.4
@@ -29,6 +29,9 @@ DEPEND=">=virtual/jdk-1.4
S="${WORKDIR}/${PN}-${SRC_PV}"
+# they are missing from the upstream tarball"
+RESTRICT="test"
+
src_unpack() {
unpack ${A}
cd "${S}"
@@ -38,13 +41,12 @@ src_unpack() {
java-ant_rewrite-classpath
}
-src_compile() {
- # known small bug - javadocs use custom taglets, which come as bundled jar in xerces-J-tools.2.8.0.tar.gz
- # ommiting them causes non-fatal errors in javadocs generation
- # need to either find the taglets source, use the bundled jars as it's only compile-time or remove the taglet defs from build.xml
- ANT_TASKS="xjavac-1" eant -Dgentoo.classpath="$(java-pkg_getjars xml-commons-resolver,xml-commons-external-1.3,xalan-serializer)" \
- jar $(use_doc javadocs)
-}
+# known small bug - javadocs use custom taglets, which come as bundled jar in xerces-J-tools.2.8.0.tar.gz
+# ommiting them causes non-fatal errors in javadocs generation
+# need to either find the taglets source, use the bundled jars as it's only compile-time or remove the taglet defs from build.xml
+EANT_ANT_TASKS="xjavac-1"
+EANT_GENTOO_CLASSPATH="xml-commons-resolver,xml-commons-external-1.3,xalan-serializer"
+EANT_DOC_TARGET="javadocs"
src_install() {
java-pkg_dojar build/xercesImpl.jar