EAPI bump and general rewrite in the new style. Tests added but they

sadly fail. I wish we could kill this but it's in a string of ancient
dependencies.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x9C6D7DE4

3 files changed, 92 insertions, 7 deletions

diff --git a/dev-java/xpp2/ChangeLog b/dev-java/xpp2/ChangeLog
index c8297f820a22..7625df9192fa 100644
--- a/dev-java/xpp2/ChangeLog
+++ b/dev-java/xpp2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/xpp2
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xpp2/ChangeLog,v 1.30 2013/06/27 21:40:45 aballier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xpp2/ChangeLog,v 1.31 2015/06/23 23:12:46 chewi Exp $
+
+*xpp2-2.1.10-r2 (23 Jun 2015)
+
+  23 Jun 2015; James Le Cuirot <chewi@gentoo.org> +xpp2-2.1.10-r2.ebuild:
+  EAPI bump and general rewrite in the new style. Tests added but they sadly
+  fail. I wish we could kill this but it's in a string of ancient dependencies.
 
   27 Jun 2013; Alexis Ballier <aballier@gentoo.org> xpp2-2.1.10-r1.ebuild:
   keyword ~amd64-fbsd
diff --git a/dev-java/xpp2/Manifest b/dev-java/xpp2/Manifest
index 4fcadc8d86f0..ed297a73ac6c 100644
--- a/dev-java/xpp2/Manifest
+++ b/dev-java/xpp2/Manifest
@@ -3,12 +3,25 @@ Hash: SHA256
 
 DIST PullParser2.1.10.tgz 2310288 SHA256 ad82569b809e29c19b8223feaa12923f97bb4bbc942ff985857f9d853db489cf SHA512 87a091e415a31cde27ca1193735743b60f516feb336a9a3577792636e54ab8d671a22e74eb8aa41268f6251c688c68fe92a28f735ec78b96b919909f80c59590 WHIRLPOOL 983aa4f0b062b46d756857c60d3a3e4dab6c7914571d1c23cfb61be230cead82c89c3c41576390c3f6d1d7066059411cf06e2c1eaf6bd4d265033da90403ce0e
 EBUILD xpp2-2.1.10-r1.ebuild 1961 SHA256 6ded4c9b70f05e66b087c875793d9e3883211dcd20d4cd3c3cc92c486a37b6d0 SHA512 fd7127436ef3f1d232b9b4575ec7347bc22a3e0150f968dd89e4dc2a88660036b62fc1f2a2e846367ae3169a7ad1610c22d070d04156e09b4f94e0c65fe8e918 WHIRLPOOL 0dfe970a70407ad2b7c43fe74ffb16fe46695d422cfd26c39acd64650323560db07c3d4d9124f241b57f15df8cc1f6e88a3d5c5ac7e7afe63c4f334cde890d61
-MISC ChangeLog 3537 SHA256 99271940aaa959515b496c9a4c808f90514622165368ed77eb5f6d886ec73337 SHA512 b9d9fffe53a74f2caa4773ddfe719e44564c9cae45c87a550cab67ec700b9fec4fdc28e2e3de77d16cfeb86ddc6ff64c7c48b18e53a026a1d72d2c5ca94a279d WHIRLPOOL 1aaff70ac0d6027d5b21a0fa1e0cfeb6a29b7c04ce255482b7575544213a305b56d797fa3086a37ec16ebdc368d6eca6b479f44efc8b88c202914a241a55ae67
+EBUILD xpp2-2.1.10-r2.ebuild 1863 SHA256 b91b9c7c8d34d737f55a099e75b93e5dffd59712dd27726245b22575ae43cfb9 SHA512 50fae4317433424ece14b85c49727d36a95b86b2b945414d360b5cbf5430a6cebfc451ec70d5d665cc527a0fa7f2fef3bb54ca530f5cadd709b85dfc804e0fb3 WHIRLPOOL f27c2ebc692e87a9c998774de83c90c0280390ffe26bbcf6bf82d34ad8496df96727ebb4748dbace714bfa4880bf3e33524f9903d2f188fbf22295f3da85b9f3
+MISC ChangeLog 3797 SHA256 822282c455c6bf505a52f29f4f38d6ffef3b92c4666f30b37ce2718657be10f4 SHA512 39e09d045ac57b483121f23cd6d098c81a320254d730d8fc1a27fe2ed1527fccb2e4531d518fa35c1c0805de80018fcc1f7de1d09f4cb09881e2fefa075f4f6b WHIRLPOOL 5d18461fa06fac8ebcbdb06b13302003789d772769ff0bde7add97200f1b60c3c1b783a34fe7e3fed6d9b951a43c6f997b676c47aed4a1d2097461fd8ca64878
 MISC metadata.xml 383 SHA256 f374397f7f31d3a657df2bd45e94f531bb29d8a2b3314355b0507dbde906c603 SHA512 252b9f66d305457542baee4dac29b6f369ad0ff44d98917becba0f9b2c767a4dab404840f7405f2470ca481970653bd77c80faacb325a6ca674dd2153b351461 WHIRLPOOL e71773522a47b8f69b0cb43a61a3d9adcff85d58643dfd2f8ba2992ed05ffb8ddbc67ee46f0019b0c320819d497cce5782558a3ae52ffca7d44b850f28199cde
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlHMsV4ACgkQvFcC4BYPU0o4zgCfShVzMON/RQUuRz9pshVYbuqP
-g8gAoK/efnfqsxYYGYdJakMid4BGdg5G
-=cfT0
+iQJ8BAEBCABmBQJViefvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
+MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3k4DMP/2m6YVhVUPGUngRQen3LVnew
+DnkU5V9ETqxosSCx5hK318eQHyTLXuavGLivCydyOYVlytugbAfEfSxTbDdon3WS
+Iu8y2P8EVWK1QqzwiSsnfUKYuAr0KLYemQwcAWxOgWI5J74MW8rIbf/eHGsMlaSx
+SaSIlIiWFK1/jWDeePndwxYZNeK+Z3o/giHRz5THyR/D5u6oSsE3cfaqnEik0EHl
+t03oHQCVpBoJx78PqXeMAQrR4raBfwDti3gusse/xs688IMfVPCjU20j0wOp7ies
+ICoLWP3vOGQGZqIrJo2KeJRK7JsYWNJIS/eEPusF3uCznxqGpfG0isRAkkSyXjzA
+Wa30uCQZomnb/QT9pQt2irIZU6BcB/Yt4yAwPGm7vAlPOLMgotQqFHaTv6niS8j5
+tUz1dgZAtmH7pk89Venibw8rUWTZZjwqVfCKXXrueK4Xw6y1dpU/LjHup2v/PFbJ
+84jMvH+r3pLikWwaCsHHzJi5GP1okDV/C2ZdkRhwvUJB746q5/jLMGZXWjDA4MXP
+9h1J0WyPJMd7a+mYqok36W+8m3yXEF3qb6+UBvJNGKeVM6iwhvZsn7MGpfKEo6hv
+61qKc9h8VcKr6UDKE7FEo0UdQdXDK7MeQfMrvdvwGgKDzjFWiCXfORWE/zLtDWXk
+u2kMLBloHNvcqAhP6RyX
+=+bi5
 -----END PGP SIGNATURE-----
diff --git a/dev-java/xpp2/xpp2-2.1.10-r2.ebuild b/dev-java/xpp2/xpp2-2.1.10-r2.ebuild
new file mode 100644
index 000000000000..7148a6251bef
--- /dev/null
+++ b/dev-java/xpp2/xpp2-2.1.10-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xpp2/xpp2-2.1.10-r2.ebuild,v 1.1 2015/06/23 23:12:46 chewi Exp $
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="PullParser"
+MY_P="${MY_PN}${PV}"
+
+DESCRIPTION="A streaming pull XML parser used to quickly process input elements"
+HOMEPAGE="http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html"
+SRC_URI="http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/${MY_PN}2/${MY_P}.tgz"
+
+LICENSE="Apache-1.1 IBM"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+# Some failures, partly because we haven't patched Xerces but probably
+# also because this software is ancient. :(
+RESTRICT="test"
+
+CDEPEND="dev-java/xerces:2"
+DEPEND=">=virtual/jdk-1.3
+	test? ( dev-java/junit:4 )
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.3
+	${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+EANT_GENTOO_CLASSPATH="xerces-2"
+EANT_EXTRA_ARGS="-Dx2_present=true -Djunit.present=true"
+EANT_BUILD_TARGET="intf intf_jar impl x2impl"
+EANT_DOC_TARGET="api"
+EANT_TEST_TARGET="junit"
+
+java_prepare() {
+	rm -r build/ lib/ || die
+
+	# Our usual rewriting stomps over the existing classpath, which
+	# isn't helpful here.
+	sed -i -r \
+		-e 's/\bclasspath="/\0${gentoo.classpath}:/g' \
+		-e 's/\$\{java\.class\.path\}/${gentoo.classpath}/g' \
+		build.xml || die
+}
+
+src_install() {
+	local suffix
+
+	for suffix in "" -intf -standard -x2; do
+		java-pkg_newjar build/lib/${MY_PN}${suffix}-${PV}.jar ${MY_PN}${suffix}.jar
+	done
+
+	dodoc README.html
+	use doc && java-pkg_dojavadoc doc/api
+	use source && java-pkg_dosrc $(find src/java -name org -o -name javax)
+}
+
+src_test() {
+	java-pkg-2_src_test
+}