Remove revision bump which causes a circular dependency as seen in bug #482750, bug reported by Camaron and Ted Tanberry; this revision bump was introduced for bug #481112 where the dependency should be indirectly installed because it is a dependency of the jdom dependency.

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

2 files changed, 7 insertions, 54 deletions

diff --git a/dev-java/jaxen/ChangeLog b/dev-java/jaxen/ChangeLog
index 138161d864ea..d229526716a1 100644
--- a/dev-java/jaxen/ChangeLog
+++ b/dev-java/jaxen/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jaxen
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/ChangeLog,v 1.60 2013/08/15 08:53:59 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/ChangeLog,v 1.61 2013/08/30 07:54:12 tomwij Exp $
+
+  30 Aug 2013; Tom Wijsman <TomWij@gentoo.org> -jaxen-1.1.4-r1.ebuild:
+  Remove revision bump which causes a circular dependency as seen in bug
+  #482750, bug reported by Camaron and Ted Tanberry; this revision bump was
+  introduced for bug #481112 where the dependency should be indirectly installed
+  because it is a dependency of the jdom dependency.
 
 *jaxen-1.1.4-r1 (15 Aug 2013)
 
diff --git a/dev-java/jaxen/jaxen-1.1.4-r1.ebuild b/dev-java/jaxen/jaxen-1.1.4-r1.ebuild
deleted file mode 100644
index 3121f56eca3c..000000000000
--- a/dev-java/jaxen/jaxen-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/jaxen-1.1.4-r1.ebuild,v 1.1 2013/08/15 08:53:59 tomwij Exp $
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A Java XPath Engine"
-HOMEPAGE="http://jaxen.codehaus.org/"
-SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P}-src.tar.gz"
-
-LICENSE="JDOM"
-SLOT="1.1"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-# jdom-jaxen is a PDEPEND of jdom that we explicitly list such that it is
-# emerged before emerging this package; for more details, see bug #481112.
-COMMON_DEP="
-	dev-java/dom4j:1
-	dev-java/jdom:1.0
-	dev-java/jdom-jaxen:1.0
-	dev-java/xom:0"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-
-DEPEND=">=virtual/jdk-1.4
-	test? ( dev-java/ant-junit:0 )
-	${COMMON_DEP}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="dom4j-1,jdom-1.0,xom"
-EANT_TEST_EXTRA_ARGS="-DJunit.present=true"
-
-java_prepare() {
-	cp -v "${FILESDIR}"/${P}_maven1-build.xml build.xml || die
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar
-
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use examples && java-pkg_doexamples src/java/samples
-	use source && java-pkg_dosrc src/java/main/*
-}