Add the source use flag, generate proper bytecode version and cleanup the ebuild.

Package-Manager: portage-2.1.2.1-r1

4 files changed, 86 insertions, 6 deletions

diff --git a/dev-java/nekohtml/ChangeLog b/dev-java/nekohtml/ChangeLog
index 437d5b096169..c4b4ae09a008 100644
--- a/dev-java/nekohtml/ChangeLog
+++ b/dev-java/nekohtml/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/nekohtml
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/nekohtml/ChangeLog,v 1.2 2006/11/30 15:50:50 caster Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/nekohtml/ChangeLog,v 1.3 2007/03/07 20:13:05 betelgeuse Exp $
+
+*nekohtml-0.9.5-r1 (07 Mar 2007)
+
+  07 Mar 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +nekohtml-0.9.5-r1.ebuild:
+  Add the source use flag, generate proper bytecode version and cleanup the
+  ebuild.
 
   30 Nov 2006; Vlastimil Babka <caster@gentoo.org> nekohtml-0.9.5.ebuild:
   Update xerces dep for upcoming 2.6 slotmove.
diff --git a/dev-java/nekohtml/Manifest b/dev-java/nekohtml/Manifest
index af0ddc808a86..0d4562367356 100644
--- a/dev-java/nekohtml/Manifest
+++ b/dev-java/nekohtml/Manifest
@@ -1,16 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX nekohtml-0.9.5-xerces.patch 705 RMD160 bff2753d3870fcd97af13cc7bf2aae1f4e2df389 SHA1 ef0f4aea182d2bb7d86c64a8895e76956569c4f5 SHA256 32a7b1e79c9258905aab082237d10583fdf3e0e88a7c50349daac7c6c2222925
 MD5 06ff0492f939b281c732da21cceb9940 files/nekohtml-0.9.5-xerces.patch 705
 RMD160 bff2753d3870fcd97af13cc7bf2aae1f4e2df389 files/nekohtml-0.9.5-xerces.patch 705
 SHA256 32a7b1e79c9258905aab082237d10583fdf3e0e88a7c50349daac7c6c2222925 files/nekohtml-0.9.5-xerces.patch 705
 DIST nekohtml-0.9.5.tar.gz 395953 RMD160 efaaf6df559de293f36e9debb16813347dc174ad SHA1 75ac445fda645cfa6ca4e96362d5d66f80d6a035 SHA256 028de8cd1776cced829e0fb95763b68ee8d536e493935a8e9c213584dd339d5b
+EBUILD nekohtml-0.9.5-r1.ebuild 1485 RMD160 198b3ab4e214876a6ca20f2be74066c210bffdee SHA1 094644b55963153582c4174b453cdb1e6276cc58 SHA256 f4b144ea7464a358e52984b23f6895cadd7e49f3f332c583610ef617102ffc7e
+MD5 9942be53a8403c44597e7c9a18ddb593 nekohtml-0.9.5-r1.ebuild 1485
+RMD160 198b3ab4e214876a6ca20f2be74066c210bffdee nekohtml-0.9.5-r1.ebuild 1485
+SHA256 f4b144ea7464a358e52984b23f6895cadd7e49f3f332c583610ef617102ffc7e nekohtml-0.9.5-r1.ebuild 1485
 EBUILD nekohtml-0.9.5.ebuild 1276 RMD160 7cfac7c43a0e65413393960a2941739218050840 SHA1 e5f774e9f9727eded1424ed8925d88bb0eb681b8 SHA256 19dd6715c51d0ac3bdf6ed2a3ed8130ec61132ad1be6c635e984bd8232199886
 MD5 240731ac59a582890bdac8bfac1528c5 nekohtml-0.9.5.ebuild 1276
 RMD160 7cfac7c43a0e65413393960a2941739218050840 nekohtml-0.9.5.ebuild 1276
 SHA256 19dd6715c51d0ac3bdf6ed2a3ed8130ec61132ad1be6c635e984bd8232199886 nekohtml-0.9.5.ebuild 1276
-MISC ChangeLog 523 RMD160 9a63f71a7646b5c21b066a818ebc66e87b6b5dee SHA1 3578d2a4d7f8a048555b22686e88f81b3921511a SHA256 1df443758acf27de9928b8ce546720ae33338a91382e824b5ed700504190346a
-MD5 185107f910beb952f14aed652b46e8cf ChangeLog 523
-RMD160 9a63f71a7646b5c21b066a818ebc66e87b6b5dee ChangeLog 523
-SHA256 1df443758acf27de9928b8ce546720ae33338a91382e824b5ed700504190346a ChangeLog 523
+MISC ChangeLog 730 RMD160 d22ff4b8a492231cb3cdb499d2d59be6ad9fad06 SHA1 d77f740a22fdc3bacb7f652c880af6ab08abb970 SHA256 f43865df72098914a75077ec5a064b3ebd57f754555e504772e8666552ae3f5d
+MD5 e37661307c15ab6b8ddb7013feeabdc0 ChangeLog 730
+RMD160 d22ff4b8a492231cb3cdb499d2d59be6ad9fad06 ChangeLog 730
+SHA256 f43865df72098914a75077ec5a064b3ebd57f754555e504772e8666552ae3f5d ChangeLog 730
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -18,3 +25,13 @@ SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata
 MD5 45cd6a33eb6c7439b1e1212c7f4e1af4 files/digest-nekohtml-0.9.5 244
 RMD160 eda4b62fcdce45a2578fd2ee8b9430553b2a380b files/digest-nekohtml-0.9.5 244
 SHA256 66e02180aba11892849e3f7683f15fb82543650a1eefaf61a7bf6e15abbde977 files/digest-nekohtml-0.9.5 244
+MD5 45cd6a33eb6c7439b1e1212c7f4e1af4 files/digest-nekohtml-0.9.5-r1 244
+RMD160 eda4b62fcdce45a2578fd2ee8b9430553b2a380b files/digest-nekohtml-0.9.5-r1 244
+SHA256 66e02180aba11892849e3f7683f15fb82543650a1eefaf61a7bf6e15abbde977 files/digest-nekohtml-0.9.5-r1 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF7xzWcxLzpIGCsLQRAgszAJ4ucQJvopzSoM3u6nabpqxqJdxshQCfSh1H
+cVH7V99y0Yc06BI/IDj+Qng=
+=gNRv
+-----END PGP SIGNATURE-----
diff --git a/dev-java/nekohtml/files/digest-nekohtml-0.9.5-r1 b/dev-java/nekohtml/files/digest-nekohtml-0.9.5-r1
new file mode 100644
index 000000000000..353098e9d0dd
--- /dev/null
+++ b/dev-java/nekohtml/files/digest-nekohtml-0.9.5-r1
@@ -0,0 +1,3 @@
+MD5 a5b22b189f23d0648eabc308fcfd4542 nekohtml-0.9.5.tar.gz 395953
+RMD160 efaaf6df559de293f36e9debb16813347dc174ad nekohtml-0.9.5.tar.gz 395953
+SHA256 028de8cd1776cced829e0fb95763b68ee8d536e493935a8e9c213584dd339d5b nekohtml-0.9.5.tar.gz 395953
diff --git a/dev-java/nekohtml/nekohtml-0.9.5-r1.ebuild b/dev-java/nekohtml/nekohtml-0.9.5-r1.ebuild
new file mode 100644
index 000000000000..c507fd121433
--- /dev/null
+++ b/dev-java/nekohtml/nekohtml-0.9.5-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/nekohtml/nekohtml-0.9.5-r1.ebuild,v 1.1 2007/03/07 20:13:05 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="A simple HTML scanner and tag balancer using standard XML interfaces."
+
+HOMEPAGE="http://people.apache.org/~andyc/neko/doc/html/"
+SRC_URI="http://www.apache.org/~andyc/neko/${P}.tar.gz"
+
+COMMON_DEP="
+		>=dev-java/xerces-2.7
+		dev-java/xalan"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+LICENSE="CyberNeko-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+JAVA_PKG_BSFIX_NAME="build-html.xml"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	rm -v lib/*.jar *.jar || die
+	# fixes compile errors due to API changes of xerces
+	# TODO report upstream and fix properly instead of throwing
+	# UnsupportedOperationException
+	epatch ${FILESDIR}/${P}-xerces.patch
+	# TODO sanify classpath for building, and submit upstream
+	java-ant_rewrite-classpath build-html.xml
+}
+
+src_compile() {
+	eant -f build-html.xml clean jar $(use_doc doc) \
+		-Dgentoo.classpath=$(java-pkg_getjars xerces-2,xalan)
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	# TODO maybe have a samples useflag and install ${PN}Samples.jar
+
+	dodoc README_html TODO_html || die
+	# has other docs than javadoc too
+	use doc && java-pkg_dohtml -r doc/html/*
+	use source && java-pkg_dosrc ./src/html/org
+}