Improve ebuild to meet java standards.

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 1b35238b5ad5f753a9432536161ec85bb550271d..a4095645b14899435bf64ca2eb92d0137052bafc 100644 (file)
--- a/dev-java/odfdom-bin/ChangeLog
+++ b/dev-java/odfdom-bin/ChangeLog
@@ -1,6 +1,9 @@
 # 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.4 2010/05/19 15:09:06 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/odfdom-bin/ChangeLog,v 1.5 2010/05/25 10:00:23 ali_bush Exp $
+
+  25 May 2010; Alistair Bush <ali_bush@gentoo.org> odfdom-bin-0.8.ebuild:
+  Improve and cleaning ebuild to confirm to java standards.
 
   19 May 2010; Michael Haubenwallner <haubi@gentoo.org>
   odfdom-bin-0.8.ebuild:

diff --git a/dev-java/odfdom-bin/Manifest b/dev-java/odfdom-bin/Manifest
index 8dd00fa70e163902701495d15332b0f69188484f..5ebf0ea4d1b06f8857ea6c49148a4203af83ac73 100644 (file)
--- 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 1223 RMD160 f5ebe76cb0be924696291e54730a3c8e615718cc SHA1 e9a456506455742a37091824df22cb31e4244b1e SHA256 d0ab18b1a0ace30ad3e341d632912cc88a0b205f11a494e49c4f03aef6bb00a8
-MISC ChangeLog 752 RMD160 e0bb1fcf92c378ab908b0b7412e3eab35c0282b7 SHA1 18806e509eaf1e39fe929a6fc5f9863320d68bbb SHA256 5e225f72097df015853242dcaa3378584d6ceb52ac54b2916ceb56410addd43b
+EBUILD odfdom-bin-0.8.ebuild 1187 RMD160 6cae922d9254a2864458a79743f8bf74207b67e4 SHA1 b4539ed57c08ef435916b53f6b77147be9d0fb12 SHA256 4cb7b464eb5798974427a6942947fa62318c4d86cd35a9144ce4e0ba8c31d9b9
+MISC ChangeLog 890 RMD160 801eda71e207167a056f22121c10564a9e4b1971 SHA1 13fc0847e1db2f514b81d0779b2ee188c2105374 SHA256 e2ed30f8509342dffa6b6a7b2f39c52a86c877ccf62cb9d4e0fa0b4bc394bf09
 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 2860413581609d5f3930ef7ec99dfccda0b052c0..14a5e3fbbbf954d90d13201956629884cea37340 100644 (file)
--- a/dev-java/odfdom-bin/odfdom-bin-0.8.ebuild
+++ b/dev-java/odfdom-bin/odfdom-bin-0.8.ebuild
@@ -1,27 +1,28 @@
 # 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.4 2010/05/19 15:09:06 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/odfdom-bin/odfdom-bin-0.8.ebuild,v 1.5 2010/05/25 10:00:23 ali_bush Exp $
 
 EAPI=3
 
-inherit java-utils-2
+JAVA_PKG_IUSE="doc"
+
+inherit java-pkg-2
 
 MY_PN=${PN/-bin}
 MY_P=${P/-bin}
 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${MY_P}-binary.zip  -> ${MY_P}-binary.zip
-  doc? ( http://odftoolkit.org/projects/odfdom/downloads/download/current-version%252F${MY_P}-javadoc.zip -> ${MY_P}-javadoc.zip )
+       doc? ( http://odftoolkit.org/projects/odfdom/downloads/download/current-version%252F${MY_P}-javadoc.zip -> ${MY_P}-javadoc.zip )
 "
-
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc-aix ~hppa-hpux ~ia64-hpux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="doc"
+IUSE=""
 
 RDEPEND="
        >=virtual/jre-1.5
-       dev-java/xerces
+       dev-java/xerces:2
 "
 DEPEND=""
 
@@ -36,7 +37,6 @@ 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