Added missing --build-only and removed ebuilds improved by this one.

(Portage version: 2.1.2-r1)

5 files changed, 12 insertions, 67 deletions

diff --git a/dev-java/commons-jxpath/ChangeLog b/dev-java/commons-jxpath/ChangeLog
index a798fb053164..53cc38a204a4 100644
--- a/dev-java/commons-jxpath/ChangeLog
+++ b/dev-java/commons-jxpath/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/commons-jxpath
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/ChangeLog,v 1.12 2007/01/21 03:38:04 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/ChangeLog,v 1.13 2007/01/21 12:47:53 fordfrog Exp $
+
+*commons-jxpath-1.2-r2 (21 Jan 2007)
+
+  21 Jan 2007; Miroslav Šulc <fordfrog@gentoo.org>
+  -commons-jxpath-1.2.ebuild, -commons-jxpath-1.2-r1.ebuild,
+  +commons-jxpath-1.2-r2.ebuild:
+  Added missing --build-only and removed ebuilds improved by this one.
 
 *commons-jxpath-1.2-r1 (21 Jan 2007)
 
diff --git a/dev-java/commons-jxpath/commons-jxpath-1.2-r1.ebuild b/dev-java/commons-jxpath/commons-jxpath-1.2-r2.ebuild
index f6754f951212..9a12ae949154 100644
--- a/dev-java/commons-jxpath/commons-jxpath-1.2-r1.ebuild
+++ b/dev-java/commons-jxpath/commons-jxpath-1.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/commons-jxpath-1.2-r1.ebuild,v 1.1 2007/01/21 03:38:04 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/commons-jxpath-1.2-r2.ebuild,v 1.1 2007/01/21 12:47:53 fordfrog Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -42,9 +42,9 @@ src_unpack() {
 	java-pkg_jar-from servletapi-2.3
 	java-pkg_jar-from jdom-1.0
 	if use test ; then
-		java-pkg_jar-from commons-collections
-		java-pkg_jar-from commons-logging
-		java-pkg_jar-from junit
+		java-pkg_jar-from --build-only commons-collections
+		java-pkg_jar-from --build-only commons-logging
+		java-pkg_jar-from --build-only junit
 	fi
 }
 
diff --git a/dev-java/commons-jxpath/commons-jxpath-1.2.ebuild b/dev-java/commons-jxpath/commons-jxpath-1.2.ebuild
deleted file mode 100644
index c77d6ee9719c..000000000000
--- a/dev-java/commons-jxpath/commons-jxpath-1.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/commons-jxpath-1.2.ebuild,v 1.2 2007/01/21 03:38:04 nichoj Exp $
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Applies XPath expressions to graphs of objects of all kinds."
-HOMEPAGE="http://jakarta.apache.org/commons/jxpath/"
-SRC_URI="mirror://apache/jakarta/commons/jxpath/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc source test"
-
-COMMON_DEPEND="=dev-java/commons-beanutils-1.6*
-	=dev-java/servletapi-2.3*
-	>=dev-java/jdom-1.0"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEPEND}"
-# Java 1.6's javadoc doesn't like enums
-DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.5* )
-	!test? ( dev-java/ant-core )
-	test? (
-		dev-java/ant
-		dev-java/commons-collections
-		dev-java/commons-logging
-		=dev-java/junit-3.8*
-	)
-	${COMMON_DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Don't automatically run tests
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-
-	mkdir -p ${S}/target/lib
-	cd ${S}/target/lib
-	java-pkg_jar-from commons-beanutils-1.6
-	java-pkg_jar-from servletapi-2.3
-	java-pkg_jar-from jdom-1.0
-	if use test ; then
-		java-pkg_jar-from commons-collections
-		java-pkg_jar-from commons-logging
-		java-pkg_jar-from junit
-	fi
-}
-
-src_test() {
-	eant test
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}.jar
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/commons-jxpath/files/digest-commons-jxpath-1.2-r1 b/dev-java/commons-jxpath/files/digest-commons-jxpath-1.2-r1
deleted file mode 100644
index da372825b8a2..000000000000
--- a/dev-java/commons-jxpath/files/digest-commons-jxpath-1.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e3a6201ca1d967717a196940ec6362fc commons-jxpath-1.2-src.tar.gz 184231
-RMD160 77d39147a9c17cc044bb0ad080c183d36ce8038e commons-jxpath-1.2-src.tar.gz 184231
-SHA256 85b6cb3d5cfb92dbf4ace9ddd8d6880ccf86ba521039ff0e75483e3a86783b40 commons-jxpath-1.2-src.tar.gz 184231
diff --git a/dev-java/commons-jxpath/files/digest-commons-jxpath-1.2 b/dev-java/commons-jxpath/files/digest-commons-jxpath-1.2-r2
index da372825b8a2..da372825b8a2 100644
--- a/dev-java/commons-jxpath/files/digest-commons-jxpath-1.2
+++ b/dev-java/commons-jxpath/files/digest-commons-jxpath-1.2-r2