summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2007-06-01 19:40:06 +0000
committerVlastimil Babka <caster@gentoo.org>2007-06-01 19:40:06 +0000
commite05fbca3a3d28bde6a82b6a1881395ec6dabffe7 (patch)
tree02ddf11690cd3a609ad591b1810ec501e6814f44 /dev-java/jdom/jdom-1.0-r2.ebuild
parentStable on ppc wrt bug 180572 (diff)
downloadgentoo-2-e05fbca3a3d28bde6a82b6a1881395ec6dabffe7.tar.gz
gentoo-2-e05fbca3a3d28bde6a82b6a1881395ec6dabffe7.tar.bz2
gentoo-2-e05fbca3a3d28bde6a82b6a1881395ec6dabffe7.zip
Add examples USE flag, prevent breakage with java-strict due to optional jaxen; prevent breakage with different slot brought by ant task.
(Portage version: 2.1.2.9)
Diffstat (limited to 'dev-java/jdom/jdom-1.0-r2.ebuild')
-rw-r--r--dev-java/jdom/jdom-1.0-r2.ebuild42
1 files changed, 22 insertions, 20 deletions
diff --git a/dev-java/jdom/jdom-1.0-r2.ebuild b/dev-java/jdom/jdom-1.0-r2.ebuild
index ae7bf50dcac8..fbf1691140b6 100644
--- a/dev-java/jdom/jdom-1.0-r2.ebuild
+++ b/dev-java/jdom/jdom-1.0-r2.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0-r2.ebuild,v 1.6 2007/05/09 15:16:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0-r2.ebuild,v 1.7 2007/06/01 19:40:06 caster Exp $
-inherit java-pkg-2 java-ant-2
+JAVA_PKG_IUSE="doc examples source"
-IUSE="doc source"
+inherit java-pkg-2 java-ant-2
DESCRIPTION="Java API to manipulate XML data"
SRC_URI="http://www.jdom.org/dist/source/${P}.tar.gz"
@@ -12,43 +12,45 @@ HOMEPAGE="http://www.jdom.org"
LICENSE="JDOM"
SLOT="${PV}"
KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
-
-COMMON_DEP="
- dev-java/saxpath
- dev-java/xalan
+COMMON_DEP="dev-java/saxpath
>=dev-java/xerces-2.7"
-
RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEP}"
+ ${COMMON_DEP}"
DEPEND=">=virtual/jdk-1.4
- dev-java/ant-core
- source? ( app-arch/zip )
- ${COMMON_DEP}"
+ ${COMMON_DEP}"
+IUSE=""
src_unpack() {
unpack ${A}
- cd ${S}
- rm -f build/*.jar lib/*.jar
+ cd "${S}"
+
+ rm -v build/*.jar lib/*.jar || die
+ rm -rf build/{apidocs,samples} || die
cd ${S}/lib
- java-pkg_jar-from saxpath
- java-pkg_jar-from xerces-2
+ java-pkg_jar-from saxpath,xerces-2
if has_version '=dev-java/jaxen-1.1*'; then
- java-pkg_jar-from jaxen-1.1
+ elog "jaxen detected - building jaxen support."
+ elog "you can ignore the warnings below"
+ elog "one day there will be better solution"
+ JAVA_PKG_STRICT="" java-pkg_jar-from jaxen-1.1
fi
}
src_compile() {
- eant package
+ # to prevent a newer jdom from going into cp
+ # (EANT_ANT_TASKS doesn't work with none)
+ ANT_TASKS="none" eant package $(use_doc)
}
src_install() {
java-pkg_dojar build/*.jar
- dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt
+ dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt || die
use doc && java-pkg_dojavadoc build/apidocs
- use source && java-pkg_dosrc src/java/*
+ use examples && java-pkg_doexamples samples
+ use source && java-pkg_dosrc src/java/org
}
pkg_postinst() {