Revision bump. dev-java/jdom-jaxen:1.0 added as a common dependency because dev-java/jdom:1.0 needs it, fixes bug #481112 reported by Patrick Lauer (bonsaikitten).

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

3 files changed, 71 insertions, 6 deletions

diff --git a/dev-java/jaxen/ChangeLog b/dev-java/jaxen/ChangeLog
index ef154cd253c4..138161d864ea 100644
--- a/dev-java/jaxen/ChangeLog
+++ b/dev-java/jaxen/ChangeLog
@@ -1,6 +1,13 @@
 # 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.59 2013/07/28 09:40:22 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/ChangeLog,v 1.60 2013/08/15 08:53:59 tomwij Exp $
+
+*jaxen-1.1.4-r1 (15 Aug 2013)
+
+  15 Aug 2013; Tom Wijsman <TomWij@gentoo.org> +jaxen-1.1.4-r1.ebuild:
+  Revision bump. dev-java/jdom-jaxen:1.0 added as a common dependency because
+  dev-java/jdom:1.0 needs it, fixes bug #481112 reported by Patrick Lauer
+  (bonsaikitten).
 
   28 Jul 2013; Fabian Groffen <grobian@gentoo.org> jaxen-1.1.4.ebuild:
   Marked ~x64-macos, bug #435528
diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest
index 7a9b70a530c7..23d31d25d149 100644
--- a/dev-java/jaxen/Manifest
+++ b/dev-java/jaxen/Manifest
@@ -5,13 +5,18 @@ AUX jaxen-1.1.4_maven1-build.xml 13148 SHA256 494368debe33ffdf60b93c393319940b36
 DIST jaxen-1.1.1-src.tar.gz 271343 SHA256 f24ae604a20da87e3716bb1d441c483e56479eaef4e99888f41be06059790bca SHA512 095523a1600324a2d2f748717c6af0ffe216120b834c1157912b57ea076c639aa3e47fe87da0316cae491ba838765e5e06bc304cdb610789101a54192d976940 WHIRLPOOL 2fec877f4b3e565304a7cd8bc7b5b391eaa74068c6bf241d8b2ef0fe5973273164247ec1166fedfbf92f082aa1120a4a3f0ce47e0e13a15add75ac00c128810a
 DIST jaxen-1.1.4-src.tar.gz 268493 SHA256 97d039a029ccaddf5ef301cafd1da8549b8360fe3ca0c15d65fc57162cd4433e SHA512 11c1c744af030c50579f872d8c8bf437e48ab4a01e6dd34529f2d9039c154533edaa9b5a367a866e2b57f311f1111717be300db8f80423c5492be38e0cffc031 WHIRLPOOL 44e3449ec8c0c15496c9528c668593d3dde67da67108e5927aee630df6ee3803999f812ab7597f37a68829e95a435fe6699bc9681583f6a500cd55cc51fbd6dc
 EBUILD jaxen-1.1.1.ebuild 1393 SHA256 2de1a3556d954222e216c64db6f5f103e43c51f33ef68a5decf433a90f8f2ca8 SHA512 86556b8cac5d37996ed4a1037baf434760d05aa1154237916e47c54d764b6df8291f7effc7ccaf282e752d1803a74cebb28dc75a65bb2a4076c10950f8cc2958 WHIRLPOOL 403f7f15e84151150956d6eae7f19d2a8016563f2b049df5ca33e51bf6182e809b6b034d7441b24c34731610048ea3580d2ce5feef35b9152d1556b1b035d1bd
+EBUILD jaxen-1.1.4-r1.ebuild 1431 SHA256 c4f233035ce90b9bf7d7f158f1efa1a09300d0068aafe8f8ee216ae7fc5b8d2e SHA512 535d2077089c44cf2637a878828b9c73e0f82dde5c62e0e043d16f071a682e5e73fb1b9aec694e81711ec6f14b2a77033292e7c8a1005d62b6c3048a1a83653b WHIRLPOOL 5730f7e1fdf2f9e3d56a08ee88e631d0f0e7a8ce469f36db0984e3f1dbc7c051ad402a028246a85deaf2696779167d258a63edaa4674994f7822ec50ac2c8d46
 EBUILD jaxen-1.1.4.ebuild 1253 SHA256 96c844c9e3f159d7349add1045196fcf7b96fdf9ccbdd9fcd55dc5869ebf13fb SHA512 83053b36197f17541648a0bf6ad804bb0a69f0bf1ed679b314edb842ceb7547ec7a65ac0354d5f89165b0b189a7ef3c56f0c5c9e40e239258c03ffdaf8e77125 WHIRLPOOL af7c28270e16437a6c0e83b5215364c7afa7ee55d9ce39dfe82adc200acc3428995d23a83af07d031e059a2a0b990ae3ba41d04ac358e40ed1e2613d5bde4194
-MISC ChangeLog 8349 SHA256 790823ed21c417dbd1592f6b45dccb9777dfad65b079d6f6566dbfa37b4f8daf SHA512 edf698377494f4c325dd7c63966f40fda99bf588131b611c0c140951352759484d75d766b06649882e248fb97f4f48a31baf99276cbbdf516f39314f9ab20564 WHIRLPOOL 49881d815bbd9a0e4b39b7a87e05c27460054ec186c83dbb8edf79e393bff37e14a1dbca2bd374919e6fd31c4bc47d9f146165ea5d3401a9e7f744fccba90244
+MISC ChangeLog 8621 SHA256 134b3a9b53cd025fba57cc7cc385c73303f07ff90fc159f1ed23e2869435888d SHA512 9722277455bc85b5c3f030223ddeda7c80d9ab487294a3c0ab10257bd38fffc8eef53f3f9e99801217f1ab4e4d534bb5aa9fb42398ebe9ec792fb992ef44be96 WHIRLPOOL 323ec4d7977bad964a2e18b48dc0ae2a5cd47fa634e9a83ba4df177a8d19cfbbd7579623ca87cd38a0ec9f8e6e77a881077db7cf99aa918e5a4c1ede1588b0cd
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (SunOS)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlH05wgACgkQX3X2B8XHTomHiQCZAbMbqFJbVlM9vS52H8Ru/6O3
-63sAn3obUXrw2un24yk5uRyTzQVoTq8F
-=Rzci
+iQEcBAEBCAAGBQJSDJcrAAoJEJWyH81tNOV97zQH/1916UXkRVoOI9oLhAZo9+Gz
+8DgYf0DqKCUcRMHLBJTvsg3s/OMyu9670rhuDyfrjon6qUTtPJpsAL2meP4BPxCj
+U4vrTWDPiQRtHFyRiPwVTd2C4fp8j+QtYb4z6+c2rRF3gMWjm8Hno6mmjF0DCVP6
+yLpzTLSHVgyYgQAQ8kVT6qE2A3iGWFXxKn9/iz9EUgCvIQ4AbgdxO8x2sKqjWG/1
+GcIe4/+lC7bb6smaIjslFlZFk3zerdeRh5Ncf51HwkKsZQLNv/bGXuVocqXZG4TU
+PXNuSXXpd96ZpxpBI1tc+KcKAmTq+F/MXXXVEnkzNu/9yF1BEqy6yagC7oCY8i8=
+=OXQT
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jaxen/jaxen-1.1.4-r1.ebuild b/dev-java/jaxen/jaxen-1.1.4-r1.ebuild
new file mode 100644
index 000000000000..3121f56eca3c
--- /dev/null
+++ b/dev-java/jaxen/jaxen-1.1.4-r1.ebuild
@@ -0,0 +1,53 @@
+# 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/*
+}