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)

4 files changed, 78 insertions, 58 deletions

diff --git a/dev-java/jdom/ChangeLog b/dev-java/jdom/ChangeLog
index d1f452b8692a..965d0212bb37 100644
--- a/dev-java/jdom/ChangeLog
+++ b/dev-java/jdom/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jdom
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/ChangeLog,v 1.47 2007/05/25 09:24:07 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/ChangeLog,v 1.48 2007/06/01 19:40:06 caster Exp $
+
+  01 Jun 2007; Vlastimil Babka <caster@gentoo.org> jdom-1.0_beta9-r2.ebuild,
+  jdom-1.0_beta10-r4.ebuild, jdom-1.0-r2.ebuild:
+  Add examples USE flag, prevent breakage with java-strict due to optional
+  jaxen; prevent breakage with different slot brought by ant task.
 
   25 May 2007; Petteri Räty <betelgeuse@gentoo.org>
   jdom-1.0_beta9-r2.ebuild:
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() {
diff --git a/dev-java/jdom/jdom-1.0_beta10-r4.ebuild b/dev-java/jdom/jdom-1.0_beta10-r4.ebuild
index dfee5e33e230..596ef337ca7f 100644
--- a/dev-java/jdom/jdom-1.0_beta10-r4.ebuild
+++ b/dev-java/jdom/jdom-1.0_beta10-r4.ebuild
@@ -1,6 +1,8 @@
 # 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_beta10-r4.ebuild,v 1.5 2007/01/05 23:31:51 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0_beta10-r4.ebuild,v 1.6 2007/06/01 19:40:06 caster Exp $
+
+JAVA_PKG_IUSE="doc examples source"
 
 inherit java-pkg-2 java-ant-2
 
@@ -14,43 +16,47 @@ HOMEPAGE="http://www.jdom.org"
 LICENSE="JDOM"
 SLOT="${PV}"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc source"
-RDEPEND=">=virtual/jre-1.4
-		dev-java/saxpath
-		dev-java/xalan
+COMMON_DEP="dev-java/saxpath
 		>=dev-java/xerces-2.7"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
 DEPEND=">=virtual/jdk-1.4
-		dev-java/ant-core
-		${RDEPEND}"
+	${COMMON_DEP}"
+IUSE=""
 
 S="${WORKDIR}/${MY_P}"
 
 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 || die "compile problem"
-
+	# 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
-	use doc && java-pkg_dohtml -r build/apidocs/*
-	use source && java-pkg_dosrc src/java/*
+	dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt || die
+	use doc && java-pkg_dojavadoc build/apidocs
+	use examples && java-pkg_doexamples samples
+	use source && java-pkg_dosrc src/java/org
 }
 
 pkg_postinst() {
diff --git a/dev-java/jdom/jdom-1.0_beta9-r2.ebuild b/dev-java/jdom/jdom-1.0_beta9-r2.ebuild
index 8afe378e7a02..008ff3ae07c5 100644
--- a/dev-java/jdom/jdom-1.0_beta9-r2.ebuild
+++ b/dev-java/jdom/jdom-1.0_beta9-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_beta9-r2.ebuild,v 1.6 2007/05/25 09:24:07 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0_beta9-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
 
 MY_PN="jdom"
 MY_PV="b9"
@@ -17,40 +17,47 @@ LICENSE="JDOM"
 SLOT="${PV}"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
-RDEPEND=">=virtual/jre-1.4
-		dev-java/saxpath
-		dev-java/xalan
+COMMON_DEP="dev-java/saxpath
 		>=dev-java/xerces-2.7"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
 DEPEND=">=virtual/jdk-1.4
-		${RDEPEND}"
+	${COMMON_DEP}"
+IUSE=""
 
 S="${WORKDIR}/${MY_P}"
 
 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 || 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
 }
 
-EANT_BUILD_TARGET="package"
-EANT_DOC_TARGET=""
-# to prevent a newer jdom from going into cp
-ANT_TASKS="none"
+src_compile() {
+	# 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
-	use doc && java-pkg_dohtml -r build/apidocs/*
-	use source && java-pkg_dosrc src/java/*
+	dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt || die
+	use doc && java-pkg_dojavadoc build/apidocs
+	use examples && java-pkg_doexamples samples
+	use source && java-pkg_dosrc src/java/org
 }
 
 pkg_postinst() {