Fix build, thanks to Ivan Baidakou (dmol) in #432514

Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64

4 files changed, 70 insertions, 6 deletions

diff --git a/dev-java/odfdom/ChangeLog b/dev-java/odfdom/ChangeLog
index 65c57b372bee..bb0ac623c15f 100644
--- a/dev-java/odfdom/ChangeLog
+++ b/dev-java/odfdom/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/odfdom
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/odfdom/ChangeLog,v 1.2 2011/01/17 02:12:47 fordfrog Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/odfdom/ChangeLog,v 1.3 2012/08/26 14:04:54 thev00d00 Exp $
+
+*odfdom-0.8.6-r1 (26 Aug 2012)
+
+  26 Aug 2012; Ian Whyman <thev00d00@gentoo.org> +odfdom-0.8.6-r1.ebuild:
+  Fix build, thanks to Ivan Baidakou (dmol) in #432514
 
 *odfdom-0.8.6 (17 Jan 2011)
 
diff --git a/dev-java/odfdom/Manifest b/dev-java/odfdom/Manifest
index 212bcfbb43ba..b49c622ad7f9 100644
--- a/dev-java/odfdom/Manifest
+++ b/dev-java/odfdom/Manifest
@@ -1,5 +1,6 @@
 AUX build-0.8.6.xml 11328 SHA256 ed8145817949c8a58f41cc2f06879ef113c80a0b6586390f2f3524ef838bb376 SHA512 6db30e3cf5b154e07bba0374beed2781c0aceb4000d73d1e44c9041f876c2aad3510f9d07d7838c7d427755819cb7e57907843a52140755bfdf8818bb15664ef WHIRLPOOL 7f2db1f7a2dadff382f79c9234837be772b8bdf332cf1bc33ef192e554c3f585cce165ade0136f8acd5c5eb1704335c6443e2a9c045f8d20606f1c59e180017f
 DIST odfdom-0.8.6-sources.zip 33171275 SHA256 fcb5ecefd07081073b50c023e2b49090400e8d152d5f06ea93c87f5db012bfd2 SHA512 7b71d55da01d604d89c5e0c7b9efcfd67e926db6807c885cb34cb9bd2e1fb1dc4a38d8e75967e08913b7ab1dcd85e7165d561fd3585a3d0c63df35a1a12c44e0 WHIRLPOOL b14ec321387b96b0df96d78a204e999548e671b023750efbdbbaae633babbee54a924dd9a20bb6c1e1888aa9c397cd9d0ea8946c8109767ab0918ef0e085ff7d
-EBUILD odfdom-0.8.6.ebuild 1569 SHA256 d27d49617ccb24e78e2cbe45e84293bcb8e760313edabf29e63c4c02424feb33 SHA512 70ec4e31fd6525f6308493ba16a49623dbac497b3db66a83bcc22106f3cbe3316c658353803bdfdb034b2645ca29b302a60595d2383a7aa64db86d3287be5117 WHIRLPOOL 25dc3300142319fdc1c3bd77bbf32c2ffb887673dc942a1bf70926dfb030e055782836067631f62154d9db468bf6781577b7bb1895a2ca968b9cf4d2f9fb7281
-MISC ChangeLog 587 SHA256 ac27ef7c5adc8f933f7e36fdbc04c2040dcc5224f62ff9fc97c6357e10441bdd SHA512 2e2f309e5367e3dc7054513dd55100fd8cb249c2230d6686791b806d755ffe3f26c5b76ba6d73cf4befc5d727d7d655f46654e2a206a88987defdce595863d58 WHIRLPOOL 1f7343df3200f447ea00b065ddeaeec2f45eb60baa9637cb474805e6fc23ddba13fec2b1bddab07bcbe1ea3dd0b97a3c25adef635a2eb32605d5735e222daf03
+EBUILD odfdom-0.8.6-r1.ebuild 1479 SHA256 ca4992d9afe20ca4b303860b32331e534c77ea311fa9da75f4d72979bec8eafd SHA512 caa3b1096fa3b663d12598af9f915c93d8dfbb7b420690e2e7cf40757a1a49c0aac304fcb98770cb76fdd962558c089f2d565bdd9edbb071c748d256a2a35ddb WHIRLPOOL 18632be0ce3c1cc23879f0b40d486919e136af19b8eab3d6c2509b37829005597b1363d00529dabbeb71180d246aacb360497151ff2f49f15b34c3f50f10a534
+EBUILD odfdom-0.8.6.ebuild 1570 SHA256 3bced1ac91a563d06319975fb2c0e5610493c02b14b4e7144fef90f572ecf907 SHA512 555dfe54f37d7643b8d9b47bc128dab8526790ab6c56a20bc7004da72a7662b430948b1f6932733d9d4d974111bf52134d5753abc89f03bd1f7c337e1a62978a WHIRLPOOL 27b1068bf87deedc73cc840cf62e25047e2c11d0e44e4fcc251297b7b37ea5836b05feb6f4e55f0002fdadbefaff17725a9f8dbb0d0a21035267b18fc842a41a
+MISC ChangeLog 750 SHA256 abe832aa737cb7f8e540ee6eab2150c95c4bd4d79fbe86003325def65517d54b SHA512 26a7554edb676e7d77da9440d283ffe5c8b4663621ad8fc95860699921e8960a611efb75386b5ecbb29c883bc4046549b293a7ea61619c1ea004335193648b7c WHIRLPOOL f409eb27223f7536cc492547f888eac7d529684bddc8eff9f50a542d9560650a0fc00b5f3aa02b4f0e177acf6dba3357ff050b5c362a89e2acd547c0d7d57eaf
 MISC metadata.xml 159 SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b SHA512 269cf19c37f2d136b926f546ec83ffdbc1374b2b6e26f8a31f21854143380386c31bfc7b2a0b9c47fb1f7c02607ddbdd43e517cb5c3270515e465c4dd7788843 WHIRLPOOL afb402fec04cddb3184b69eb8a8d36b404edd2870fd06c8f5e99be39c341ea6fa7542e0b680fac05529522ed33838e8279381d7a6de9dbc58fe55841229d8a51
diff --git a/dev-java/odfdom/odfdom-0.8.6-r1.ebuild b/dev-java/odfdom/odfdom-0.8.6-r1.ebuild
new file mode 100644
index 000000000000..77da77d4c870
--- /dev/null
+++ b/dev-java/odfdom/odfdom-0.8.6-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/odfdom/odfdom-0.8.6-r1.ebuild,v 1.1 2012/08/26 14:04:54 thev00d00 Exp $
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="The ODFDOM reference implementation, written in Java."
+HOMEPAGE="http://odftoolkit.org/projects/odfdom"
+SRC_URI="http://odftoolkit.org/projects/odfdom/downloads/download/current-version%252F${P}-sources.zip -> ${P}-sources.zip"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc-aix ~hppa-hpux ~ia64-hpux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+CDEPEND="dev-java/xerces:2
+	dev-java/xml-commons-external:1.4"
+
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}
+	test? (
+		dev-java/ant-junit4:0
+		dev-java/hamcrest-core:0
+		dev-java/junit:4
+	)"
+
+S="${WORKDIR}/${P}-sources"
+
+EANT_GENTOO_CLASSPATH="xerces-2,xml-commons-external-1.4"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+src_prepare() {
+	cp "${FILESDIR}/build-${PV}.xml" build.xml || die
+
+	mkdir lib || die
+}
+
+EANT_BUILD_TARGET="package"
+EANT_JAVADOC_TARGET="javadoc"
+EANT_EXTRA_ARGS="-Dmaven.test.skip=true"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},hamcrest-core,junit-4"
+
+src_test() {
+	EANT_EXTRA_ARGS="" \
+		java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar target/odfdom.jar
+
+	dodoc README.txt LICENSE.txt || die
+	use doc && java-pkg_dojavadoc target/site/apidocs
+}
diff --git a/dev-java/odfdom/odfdom-0.8.6.ebuild b/dev-java/odfdom/odfdom-0.8.6.ebuild
index 840ad582c5c2..2a2475a81fb9 100644
--- a/dev-java/odfdom/odfdom-0.8.6.ebuild
+++ b/dev-java/odfdom/odfdom-0.8.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/odfdom/odfdom-0.8.6.ebuild,v 1.1 2011/01/17 02:12:47 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/odfdom/odfdom-0.8.6.ebuild,v 1.2 2012/08/26 14:04:54 thev00d00 Exp $
 
 EAPI="3"