fix deps, and source useflag support, cleanups

(Portage version: 2.0.51.22-r1)

6 files changed, 72 insertions, 63 deletions

diff --git a/dev-java/jdom/ChangeLog b/dev-java/jdom/ChangeLog
index 9bb253474585..0d15f2f131ad 100644
--- a/dev-java/jdom/ChangeLog
+++ b/dev-java/jdom/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jdom
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/ChangeLog,v 1.24 2005/05/29 15:57:00 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/ChangeLog,v 1.25 2005/07/09 16:04:38 axxo Exp $
+
+  09 Jul 2005; Thomas Matthijs <axxo@gentoo.org> jdom-1.0_beta6.ebuild,
+  jdom-1.0_beta9-r1.ebuild, jdom-1.0_beta10-r3.ebuild, jdom-1.0.ebuild:
+  fix deps, and source useflag support, cleanups
 
   29 May 2005; Markus Rothe <corsair@gentoo.org> jdom-1.0_beta9-r1.ebuild:
   Stable on ppc64
diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index 3fda813c7090..7bb75e98c838 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -1,10 +1,10 @@
-MD5 b1bd1fab8b9c0de2f056f053c2a7cd72 ChangeLog 3868
-MD5 e724cc3dffa094f7814322f56587a033 jdom-1.0.ebuild 1585
-MD5 f9e167ea3c7f3948d442a42cd33d8d53 jdom-1.0_beta10-r3.ebuild 1593
-MD5 29b4970f94782257d2503fcf84952978 jdom-1.0_beta6.ebuild 1613
-MD5 18d26ecd3b92f104ca4052108eaba234 jdom-1.0_beta9-r1.ebuild 1539
+MD5 077c206b130bf1e665bd71312dad61db jdom-1.0.ebuild 1564
+MD5 179f73572793f4806c0a846ec18a93a4 jdom-1.0_beta10-r3.ebuild 1571
+MD5 2dafb6cf265abd3d5553debbd16db03c jdom-1.0_beta6.ebuild 1563
+MD5 666f5378303a8aaf0538bb13f33453ff jdom-1.0_beta9-r1.ebuild 1578
+MD5 dacb5cda0a46013d1f4ddf402fe9c8d4 ChangeLog 4062
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 8841cddf25b660d205766f7468ba608d files/digest-jdom-1.0 61
-MD5 cad484f43c69253a8823f7d668b6c0ab files/digest-jdom-1.0_beta10-r3 61
 MD5 bb9b91ebd19835161b889abf889afda2 files/digest-jdom-1.0_beta6 60
+MD5 cad484f43c69253a8823f7d668b6c0ab files/digest-jdom-1.0_beta10-r3 61
+MD5 8841cddf25b660d205766f7468ba608d files/digest-jdom-1.0 61
 MD5 5387342ae9576c96d6fab009ed1c306f files/digest-jdom-1.0_beta9-r1 60
diff --git a/dev-java/jdom/jdom-1.0.ebuild b/dev-java/jdom/jdom-1.0.ebuild
index dcc5c3a17815..b2cffc505cdd 100644
--- a/dev-java/jdom/jdom-1.0.ebuild
+++ b/dev-java/jdom/jdom-1.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0.ebuild,v 1.3 2005/04/06 19:16:45 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0.ebuild,v 1.4 2005/07/09 16:04:38 axxo Exp $
 
 inherit java-pkg
 
-IUSE="jikes doc"
+IUSE="jikes doc source"
 
 MY_PN="jdom"
 MY_PV="1.0"
@@ -16,12 +16,14 @@ HOMEPAGE="http://www.jdom.org"
 LICENSE="JDOM"
 SLOT="${PV}"
 KEYWORDS="~x86 ~sparc ~ppc ~amd64"
-RDEPEND=">=virtual/jdk-1.3"
-DEPEND=">=dev-java/ant-1.4.1
+RDEPEND=">=virtual/jre-1.3
 		dev-java/saxpath
 		dev-java/xalan
-		>=dev-java/xerces-2.6.2-r1
-		jikes? ( >=dev-java/jikes-1.15 )"
+		>=dev-java/xerces-2.6.2-r1"
+DEPEND=">=virtual/jdk-1.3
+		dev-java/ant-core
+		jikes? ( >=dev-java/jikes-1.15 )
+		${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -35,8 +37,7 @@ src_unpack() {
 	java-pkg_jar-from xerces-2
 
 	if has_version jaxen; then
-		jaxenlib="`best_version dev-java/jaxen | sed s/"dev-java\/"//|sed -e s/_beta.-r.//`"
-		java-pkg_jar-from ${jaxenlib}
+		java-pkg_jar-from jaxen-1.1
 	fi
 }
 
@@ -47,18 +48,18 @@ src_compile() {
 }
 
 src_install() {
-	java-pkg_dojar \
-		build/*.jar
+	java-pkg_dojar build/*.jar
 
-	dodoc CHANGES.txt COMMITTERS.txt LICENSE.txt README.txt TODO.txt
+	dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt
 	use doc && java-pkg_dohtml -r build/apidocs/*
+	use source && java-pkg_dosrc src/java/*
 }
 
 pkg_postinst() {
 	if ! has_version jaxen; then
 		einfo ""
 		einfo "If you want jaxen support for jdom then"
-		einfo "please emerge dev-java/jaxen first and"
+		einfo "please emerge =dev-java/jaxen-1.1* first and"
 		einfo "re-emerge jdom.  Sorry for the"
 		einfo "inconvenience, this is to break out of the"
 		einfo "circular dependencies."
diff --git a/dev-java/jdom/jdom-1.0_beta10-r3.ebuild b/dev-java/jdom/jdom-1.0_beta10-r3.ebuild
index 657b0eb9998b..12fd24e503f1 100644
--- a/dev-java/jdom/jdom-1.0_beta10-r3.ebuild
+++ b/dev-java/jdom/jdom-1.0_beta10-r3.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2005 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-r3.ebuild,v 1.4 2005/04/06 19:16:45 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0_beta10-r3.ebuild,v 1.5 2005/07/09 16:04:38 axxo Exp $
 
 inherit java-pkg
 
-IUSE="jikes doc"
-
 MY_PN="jdom"
 MY_PV="b10"
 MY_P="${MY_PN}-${MY_PV}"
@@ -16,12 +14,15 @@ HOMEPAGE="http://www.jdom.org"
 LICENSE="JDOM"
 SLOT="${PV}"
 KEYWORDS="x86 ~sparc ~ppc amd64"
-RDEPEND=">=virtual/jdk-1.3"
-DEPEND=">=dev-java/ant-1.4.1
+IUSE="jikes doc source"
+RDEPEND=">=virtual/jre-1.3
 		dev-java/saxpath
 		dev-java/xalan
-		>=dev-java/xerces-2.6.2-r1
-		jikes? ( >=dev-java/jikes-1.15 )"
+		>=dev-java/xerces-2.6.2-r1"
+DEPEND=">=virtual/jdk-1.3
+		dev-java/ant-core
+		jikes? ( >=dev-java/jikes-1.15 )
+		${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -35,8 +36,7 @@ src_unpack() {
 	java-pkg_jar-from xerces-2
 
 	if has_version jaxen; then
-		jaxenlib="`best_version dev-java/jaxen | sed s/"dev-java\/"//|sed -e s/_beta.-r.//`"
-		java-pkg_jar-from ${jaxenlib}
+		java-pkg_jar-from jaxen-1.1
 	fi
 }
 
@@ -47,18 +47,18 @@ src_compile() {
 }
 
 src_install() {
-	java-pkg_dojar \
-		build/*.jar
+	java-pkg_dojar build/*.jar
 
-	dodoc CHANGES.txt COMMITTERS.txt LICENSE.txt README.txt TODO.txt
+	dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt
 	use doc && java-pkg_dohtml -r build/apidocs/*
+	use source && java-pkg_dosrc src/java/*
 }
 
 pkg_postinst() {
 	if ! has_version jaxen; then
 		einfo ""
 		einfo "If you want jaxen support for jdom then"
-		einfo "please emerge dev-java/jaxen first and"
+		einfo "please emerge =dev-java/jaxen-1.1* first and"
 		einfo "re-emerge jdom.  Sorry for the"
 		einfo "inconvenience, this is to break out of the"
 		einfo "circular dependencies."
diff --git a/dev-java/jdom/jdom-1.0_beta6.ebuild b/dev-java/jdom/jdom-1.0_beta6.ebuild
index b575e9b38e20..01b252bc2488 100644
--- a/dev-java/jdom/jdom-1.0_beta6.ebuild
+++ b/dev-java/jdom/jdom-1.0_beta6.ebuild
@@ -1,29 +1,30 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0_beta6.ebuild,v 1.3 2005/04/06 19:16:45 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0_beta6.ebuild,v 1.4 2005/07/09 16:04:38 axxo Exp $
 
 inherit java-pkg
 
-IUSE="jikes doc"
+IUSE="jikes doc source"
 
 MY_PN="jdom"
 MY_PV="b6"
 MY_P="${MY_PN}-${MY_PV}"
 
 DESCRIPTION="Java API to manipulate XML data"
-SRC_URI="http://www.jdom.org/dist/source/archive/${MY_P}.tar.gz"
+SRC_URI="http://www.jdom.org/dist/source/${MY_P}.tar.gz"
 HOMEPAGE="http://www.jdom.org"
 LICENSE="JDOM"
 SLOT="${PV}"
 KEYWORDS="~x86 ~amd64"
-DEPEND=">=dev-java/ant-1.4.1
-		${RDEPEND}
-		>=virtual/jdk-1.3
-		jikes? ( >=dev-java/jikes-1.15 )"
+
 RDEPEND=">=virtual/jre-1.3
-		=dev-java/xerces-2.6.2*
 		dev-java/saxpath
-		dev-java/xalan"
+		dev-java/xalan
+		>=dev-java/xerces-2.6.2-r1"
+DEPEND=">=virtual/jdk-1.3
+		dev-java/ant-core
+		jikes? ( >=dev-java/jikes-1.15 )
+		${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -37,8 +38,7 @@ src_unpack() {
 	java-pkg_jar-from xerces-2
 
 	if has_version jaxen; then
-		jaxenlib="`best_version dev-java/jaxen | sed s/"dev-java\/"//|sed -e s/_beta.-r.//`"
-		java-pkg_jar-from ${jaxenlib}
+		java-pkg_jar-from jaxen-1.1
 	fi
 }
 
@@ -51,19 +51,19 @@ src_compile() {
 src_install() {
 	java-pkg_dojar build/*.jar
 
-	dodoc CHANGES.txt COMMITTERS.txt LICENSE.txt README.txt TODO.txt
+	dodoc CHANGES.txt COMMITTERS.txt  README.txt TODO.txt
 	use doc && java-pkg_dohtml -r build/apidocs/*
+	use source && java-pkg_dosrc src/java/*
 }
 
 pkg_postinst() {
 	if ! has_version jaxen; then
 		einfo ""
 		einfo "If you want jaxen support for jdom then"
-		einfo "please emerge dev-java/jaxen first and"
+		einfo "please emerge =dev-java/jaxen-1.1* first and"
 		einfo "re-emerge jdom.  Sorry for the"
 		einfo "inconvenience, this is to break out of the"
 		einfo "circular dependencies."
 		einfo ""
 	fi
 }
-
diff --git a/dev-java/jdom/jdom-1.0_beta9-r1.ebuild b/dev-java/jdom/jdom-1.0_beta9-r1.ebuild
index 9016e4da70d1..4da11bb05be3 100644
--- a/dev-java/jdom/jdom-1.0_beta9-r1.ebuild
+++ b/dev-java/jdom/jdom-1.0_beta9-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 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-r1.ebuild,v 1.6 2005/05/29 15:57:00 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0_beta9-r1.ebuild,v 1.7 2005/07/09 16:04:38 axxo Exp $
 
 inherit java-pkg
 
-IUSE="jikes doc"
+IUSE="jikes doc source"
 
 MY_PN="jdom"
 MY_PV="b9"
@@ -16,47 +16,51 @@ HOMEPAGE="http://www.jdom.org"
 LICENSE="JDOM"
 SLOT="${PV}"
 KEYWORDS="amd64 ~ppc ppc64 ~sparc x86"
-RDEPEND=">=virtual/jdk-1.3"
-DEPEND=">=dev-java/ant-1.4.1
+
+RDEPEND=">=virtual/jre-1.3
+		dev-java/saxpath
 		dev-java/xalan
-		=dev-java/xerces-2.6.2*
-		jikes? ( >=dev-java/jikes-1.15 )"
+		>=dev-java/xerces-2.6.2-r1"
+DEPEND=">=virtual/jdk-1.3
+		dev-java/ant-core
+		jikes? ( >=dev-java/jikes-1.15 )
+		${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}/lib
+	cd ${S}
+	rm -f build/*.jar lib/*.jar
 
-	rm -f *.jar
+	cd ${S}/lib
+	java-pkg_jar-from saxpath
 	java-pkg_jar-from xerces-2
-	java-pkg_jar-from xalan
 
 	if has_version jaxen; then
-		jaxenlib="`best_version dev-java/jaxen | sed s/"dev-java\/"//|sed -e s/_beta.-r.//`"
-		java-pkg_jar-from ${jaxenlib}
+		java-pkg_jar-from jaxen-1.1
 	fi
 }
 
 src_compile() {
-	local antflags=""
+	local antflags="package"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 	ant ${antflags} || die "compile problem"
 }
 
 src_install() {
-	java-pkg_dojar \
-		build/*.jar
+	java-pkg_dojar build/*.jar
 
-	dodoc CHANGES.txt COMMITTERS.txt LICENSE.txt README.txt TODO.txt
+	dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt
 	use doc && java-pkg_dohtml -r build/apidocs/*
+	use source && java-pkg_dosrc src/java/*
 }
 
 pkg_postinst() {
 	if ! has_version jaxen; then
 		einfo ""
 		einfo "If you want jaxen support for jdom then"
-		einfo "please emerge dev-java/jaxen first and"
+		einfo "please emerge =dev-java/jaxen-1.1* first and"
 		einfo "re-emerge jdom.  Sorry for the"
 		einfo "inconvenience, this is to break out of the"
 		einfo "circular dependencies."