Make this installable with sun-jdk-1.6.

Package-Manager: portage-2.1.2_rc4-r7

diff --git a/dev-java/nanoxml/ChangeLog b/dev-java/nanoxml/ChangeLog
index 8a50ea942049b5710902a4e679647b918ed4162b..75b384c16a88dfe7534c2385896dc2f3ad3d6664 100644 (file)
--- a/dev-java/nanoxml/ChangeLog
+++ b/dev-java/nanoxml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/nanoxml
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/nanoxml/ChangeLog,v 1.7 2006/08/04 03:31:04 nichoj Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/nanoxml/ChangeLog,v 1.8 2007/01/14 16:38:28 betelgeuse Exp $
+
+*nanoxml-2.2.3-r2 (14 Jan 2007)
+
+  14 Jan 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +nanoxml-2.2.3-r2.ebuild:
+  Make this installable with sun-jdk-1.6.
 
 *nanoxml-2.2.3-r1 (04 Aug 2006)
 

diff --git a/dev-java/nanoxml/Manifest b/dev-java/nanoxml/Manifest
index 65acbcb942196aa8a4cc4081bc6270d86c41aa4d..c1bd0ff308a59cf68ebf8e1183d9e4d1d4abf78e 100644 (file)
--- a/dev-java/nanoxml/Manifest
+++ b/dev-java/nanoxml/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST NanoXML-2.2.1.tar.gz 489476 RMD160 388a70217efe8485ebe3e8fe3d5959c3507eabf3 SHA1 6c29bb2d7b796f607f37ae584ef08b42d6048151 SHA256 391e6258aeb964865c2cf52ccb8336f5f8760e2a2d980cafd01c2c1c0bba53e8
 DIST NanoXML-2.2.3.tar.gz 426111 RMD160 6afeba1e37567fc9716292c5706052d77f82916a SHA1 d70075445dd8ccdc65bb0215525e0290128a5339 SHA256 df3bd3663b766851caffba963853383cff813695dca3e827ce6e00a920d544fa
 EBUILD nanoxml-2.2.1.ebuild 883 RMD160 2bff7c55de61c7fe1e8d00235405cb3dda1311be SHA1 335177f9cb6ee0635947c0f252b7778c522d2586 SHA256 0284f9c669e722e6a20bbc63e98f4cdecc3d1b9cf534464c96d145ee4a84ba3d
@@ -8,14 +11,18 @@ EBUILD nanoxml-2.2.3-r1.ebuild 1067 RMD160 e8ccac56f17b5bb85146cdb83ad42e5f5e164
 MD5 ac2f4d031eff850213e5f95297bbad05 nanoxml-2.2.3-r1.ebuild 1067
 RMD160 e8ccac56f17b5bb85146cdb83ad42e5f5e164013 nanoxml-2.2.3-r1.ebuild 1067
 SHA256 7d4316d8f13ad38b45970a23026b3fb085698dd5c3415ce5f12657406385a33e nanoxml-2.2.3-r1.ebuild 1067
+EBUILD nanoxml-2.2.3-r2.ebuild 1290 RMD160 e1d34a030b4f220108f74c68045d2282a1482c76 SHA1 2b84713066888cb920b03cdc946fd3a73ff27a64 SHA256 67c813e8c850e4f583f05b2962f756735182e27598f8370b1e76e35bfb636950
+MD5 6c219ee9e9c7dcf507f9d8939e98338c nanoxml-2.2.3-r2.ebuild 1290
+RMD160 e1d34a030b4f220108f74c68045d2282a1482c76 nanoxml-2.2.3-r2.ebuild 1290
+SHA256 67c813e8c850e4f583f05b2962f756735182e27598f8370b1e76e35bfb636950 nanoxml-2.2.3-r2.ebuild 1290
 EBUILD nanoxml-2.2.3.ebuild 894 RMD160 d67db4d24ed49c4872d2489a4405d72d35614f1b SHA1 36843eaf86a8aa716c92d389f31617bd0fa01306 SHA256 4e1bfc568e9a734c09d629b123652624f0e5b6095ae4c0998aa05cb7d3643a0b
 MD5 d16c6bc025e02ec667f0954dc0ec21c1 nanoxml-2.2.3.ebuild 894
 RMD160 d67db4d24ed49c4872d2489a4405d72d35614f1b nanoxml-2.2.3.ebuild 894
 SHA256 4e1bfc568e9a734c09d629b123652624f0e5b6095ae4c0998aa05cb7d3643a0b nanoxml-2.2.3.ebuild 894
-MISC ChangeLog 1116 RMD160 0d64160bffff51f37e4ca277dca49ce6f84eb6e5 SHA1 e4b0ef3f7defd4b836b9ebbc81721c4a172a6088 SHA256 7992593ba18dc93e7f854110a150406d6f3778fc023b18796d8e9e355519210a
-MD5 b1a2590c5d9e095a8d00ecc0d8c124e3 ChangeLog 1116
-RMD160 0d64160bffff51f37e4ca277dca49ce6f84eb6e5 ChangeLog 1116
-SHA256 7992593ba18dc93e7f854110a150406d6f3778fc023b18796d8e9e355519210a ChangeLog 1116
+MISC ChangeLog 1277 RMD160 5814792f896ae6cfbfa691681f9fe412f01bc4fc SHA1 e13c3b3a1f776dd1ae61883db4434b5fb2e8b57a SHA256 ce294d36a4510e1a82620302c0ca937c678382add50e8cc250755c797e468ee2
+MD5 877478cdd0beeb009ab649379ea30b2d ChangeLog 1277
+RMD160 5814792f896ae6cfbfa691681f9fe412f01bc4fc ChangeLog 1277
+SHA256 ce294d36a4510e1a82620302c0ca937c678382add50e8cc250755c797e468ee2 ChangeLog 1277
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -29,3 +36,13 @@ SHA256 03b276d0f2c11b1a04ccd3933b8b2b284c3805280d2c5cf73389f1dc3fc2a8c4 files/di
 MD5 e6da425903c1c81464c70eac33c70b49 files/digest-nanoxml-2.2.3-r1 241
 RMD160 735054fe498572365f4d908b2f77078fcaac3205 files/digest-nanoxml-2.2.3-r1 241
 SHA256 03b276d0f2c11b1a04ccd3933b8b2b284c3805280d2c5cf73389f1dc3fc2a8c4 files/digest-nanoxml-2.2.3-r1 241
+MD5 e6da425903c1c81464c70eac33c70b49 files/digest-nanoxml-2.2.3-r2 241
+RMD160 735054fe498572365f4d908b2f77078fcaac3205 files/digest-nanoxml-2.2.3-r2 241
+SHA256 03b276d0f2c11b1a04ccd3933b8b2b284c3805280d2c5cf73389f1dc3fc2a8c4 files/digest-nanoxml-2.2.3-r2 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFqlyOcxLzpIGCsLQRAgSWAJoDGu+lW8RxHHVWkgtLm8AUAeElngCgh5Sc
+DN4uPKWthhogAf1a2+TGnzg=
+=TLEK
+-----END PGP SIGNATURE-----

diff --git a/dev-java/nanoxml/files/digest-nanoxml-2.2.3-r2 b/dev-java/nanoxml/files/digest-nanoxml-2.2.3-r2
new file mode 100644 (file)
index 0000000..6aa1ac7
--- /dev/null
+++ b/dev-java/nanoxml/files/digest-nanoxml-2.2.3-r2
@@ -0,0 +1,3 @@
+MD5 357c7136417ea996cf714278ea84f2df NanoXML-2.2.3.tar.gz 426111
+RMD160 6afeba1e37567fc9716292c5706052d77f82916a NanoXML-2.2.3.tar.gz 426111
+SHA256 df3bd3663b766851caffba963853383cff813695dca3e827ce6e00a920d544fa NanoXML-2.2.3.tar.gz 426111

diff --git a/dev-java/nanoxml/nanoxml-2.2.3-r2.ebuild b/dev-java/nanoxml/nanoxml-2.2.3-r2.ebuild
new file mode 100644 (file)
index 0000000..15fa4a9
--- /dev/null
+++ b/dev-java/nanoxml/nanoxml-2.2.3-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/nanoxml/nanoxml-2.2.3-r2.ebuild,v 1.1 2007/01/14 16:38:28 betelgeuse Exp $
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="NanoXML is a small non-validating parser for Java. "
+
+HOMEPAGE="http://nanoxml.sourceforge.net/"
+MY_P=NanoXML-${PV}
+SRC_URI="http://nanoxml.cyberelf.be/downloads/${MY_P}.tar.gz"
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc source"
+DEPEND="
+       !doc? ( >=virtual/jdk-1.4 )
+       doc? ( || ( =virtual/jdk-1.4* =virtual/jdk-1.5* ) )
+       ${RDEPEND}"
+RDEPEND=">=virtual/jre-1.4
+               dev-java/sax"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}/ThirdParty/SAX
+       java-pkg_jar-from sax
+       cd ${S}
+
+       local docsed
+       if use doc; then
+               docsed="javadoc -source $(java-pkg_get-source)"
+       else
+               docsed="true"
+       fi
+
+       # Use the right arguments for javac/javadoc
+       sed -e "s:/tmp/:${T}/:g" \
+               -e "s/javac/javac $(java-pkg_javac-args)/" \
+               -e "s/-target 1.1//" \
+               -e "s/javadoc/${docsed}/" \
+               -i build.sh || die "failed to sed"
+}
+
+src_compile() {
+       ./build.sh || die "failed to build"
+}
+
+src_install() {
+       java-pkg_dojar Output/*.jar
+
+       dohtml -r Documentation/NanoXML-*
+       use doc && java-pkg_dojavadoc Documentation/JavaDoc
+}