From: Michael Haubenwallner Date: Wed, 19 May 2010 15:09:06 +0000 (+0000) Subject: No need to inherit java-pkg-2, java-utils-2 is enough. Register as odfdom (without... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5cec0cc20307cd192fff2e37bba338e88896523b;p=gentoo.git No need to inherit java-pkg-2, java-utils-2 is enough. Register as odfdom (without -bin). Register xerces-2 dependency. Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- diff --git a/dev-java/odfdom-bin/ChangeLog b/dev-java/odfdom-bin/ChangeLog index 8b23db53e8a7..1b35238b5ad5 100644 --- a/dev-java/odfdom-bin/ChangeLog +++ b/dev-java/odfdom-bin/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/odfdom-bin # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/odfdom-bin/ChangeLog,v 1.3 2010/05/19 14:18:32 haubi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/odfdom-bin/ChangeLog,v 1.4 2010/05/19 15:09:06 haubi Exp $ + + 19 May 2010; Michael Haubenwallner + odfdom-bin-0.8.ebuild: + No need to inherit java-pkg-2, java-utils-2 is enough. Register as odfdom + (without -bin). Register xerces-2 dependency. 19 May 2010; Michael Haubenwallner odfdom-bin-0.8.ebuild: diff --git a/dev-java/odfdom-bin/Manifest b/dev-java/odfdom-bin/Manifest index d0fe5770a1c7..8dd00fa70e16 100644 --- a/dev-java/odfdom-bin/Manifest +++ b/dev-java/odfdom-bin/Manifest @@ -1,5 +1,5 @@ DIST odfdom-0.8-binary.zip 3412144 RMD160 b4392ab28fce1559518e1bde2ed3d8615dc695fd SHA1 6651ade74ec378fdf59d1e44bd1b6538e7eb6b6a SHA256 2559e177b80da9249b67dd7d36b02eb5f9a9edda5ee871e8a49581b4cb155c5f DIST odfdom-0.8-javadoc.zip 26337438 RMD160 b7ebebf1d45e1e6fd319a05d373478d755137676 SHA1 4d0f102dc93c6a353b16b4c59176f4b5a78aecc3 SHA256 1354d6bf5ef7b3678ac0eec98fa63332ccf701b13dccf245cabc9ca9383841f2 -EBUILD odfdom-bin-0.8.ebuild 1127 RMD160 3a178c31db07a6d333aa885e3896d3f8468e94de SHA1 d741c96ef936cb171211d29307808b23af80b996 SHA256 b77a9d6b7d3ac16eae5107e4b0f0e75e4a1d66e26b6d2913816306bf75eab8fa -MISC ChangeLog 546 RMD160 975de9d0af0f7160ecdf0364e301b01b59c6a51b SHA1 6b47ed278a2a2c817721f0600fec2d30efe65d5e SHA256 cf25de62dcc99a8f39853949018b56ab5f7c4c8bf2a7abe34179691c60ff63d7 +EBUILD odfdom-bin-0.8.ebuild 1223 RMD160 f5ebe76cb0be924696291e54730a3c8e615718cc SHA1 e9a456506455742a37091824df22cb31e4244b1e SHA256 d0ab18b1a0ace30ad3e341d632912cc88a0b205f11a494e49c4f03aef6bb00a8 +MISC ChangeLog 752 RMD160 e0bb1fcf92c378ab908b0b7412e3eab35c0282b7 SHA1 18806e509eaf1e39fe929a6fc5f9863320d68bbb SHA256 5e225f72097df015853242dcaa3378584d6ceb52ac54b2916ceb56410addd43b MISC metadata.xml 698 RMD160 124b5bc833cc7efac227a806e3477478d3ee8979 SHA1 f04406beffe0d47cd3d6e5ff33af15f0e58c5463 SHA256 24122fa5040f5972d8df33ce274b987b5e6ad90a52106d847bafcdcf0fb3547f diff --git a/dev-java/odfdom-bin/odfdom-bin-0.8.ebuild b/dev-java/odfdom-bin/odfdom-bin-0.8.ebuild index d1f3bd8e61e6..286041358160 100644 --- a/dev-java/odfdom-bin/odfdom-bin-0.8.ebuild +++ b/dev-java/odfdom-bin/odfdom-bin-0.8.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/odfdom-bin/odfdom-bin-0.8.ebuild,v 1.3 2010/05/19 14:18:32 haubi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/odfdom-bin/odfdom-bin-0.8.ebuild,v 1.4 2010/05/19 15:09:06 haubi Exp $ EAPI=3 -JAVA_PKG_IUSE="doc" -inherit java-pkg-2 +inherit java-utils-2 +MY_PN=${PN/-bin} MY_P=${P/-bin} DESCRIPTION="The ODFDOM reference implementation, written in Java." HOMEPAGE="http://odftoolkit.org/projects/odfdom" @@ -17,7 +17,7 @@ SRC_URI="http://odftoolkit.org/projects/odfdom/downloads/download/current-versio LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~ppc-aix ~hppa-hpux ~ia64-hpux ~x86-linux ~sparc-solaris ~x86-solaris" -IUSE="" +IUSE="doc" RDEPEND=" >=virtual/jre-1.5 @@ -36,6 +36,8 @@ src_unpack() { } src_install() { + local PN=${MY_PN} # no way to override JAVA_PKG_NAME? + java-pkg_register-dependency xerces-2 java-pkg_dojar odfdom.jar dodoc README.txt LICENSE.txt || die