Version bump to 1.9.18. Fixes bug #426382, reported by Manuel Rüger (mrueg) and contributed by Ivan Baidakou (dmol).

Package-Manager: portage-2.1.11.63/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

4 files changed, 93 insertions, 12 deletions

diff --git a/dev-java/nekohtml/ChangeLog b/dev-java/nekohtml/ChangeLog
index 3fc5d51765db..be957097522f 100644
--- a/dev-java/nekohtml/ChangeLog
+++ b/dev-java/nekohtml/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/nekohtml
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/nekohtml/ChangeLog,v 1.12 2012/07/05 19:50:21 sera Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/nekohtml/ChangeLog,v 1.13 2013/05/10 09:11:41 tomwij Exp $
+
+*nekohtml-1.9.18 (10 May 2013)
+
+  10 May 2013; Tom Wijsman <TomWij@gentoo.org>
+  +files/nekohtml-1.9.18-remove-obsolete-xerces-bridges.patch,
+  +nekohtml-1.9.18.ebuild:
+  Version bump to 1.9.18. Fixes bug #426382, reported by Manuel Rüger (mrueg)
+  and contributed by Ivan Baidakou (dmol).
 
   05 Jul 2012; Ralph Sennhauser <sera@gentoo.org> nekohtml-1.9.6.ebuild:
   Fix tests. Thanks to Ivan Baidakou <the.dmol@gmail.com> for the patch.
@@ -47,4 +55,3 @@
   12 Oct 2006; Joshua Nichols <nichoj@gentoo.org>
   +files/nekohtml-0.9.5-xerces.patch, +metadata.xml, +nekohtml-0.9.5.ebuild:
   Initial commit, from bug #88617.
-
diff --git a/dev-java/nekohtml/Manifest b/dev-java/nekohtml/Manifest
index 4b978ea8b6c7..1b14227930f6 100644
--- a/dev-java/nekohtml/Manifest
+++ b/dev-java/nekohtml/Manifest
@@ -1,19 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX nekohtml-0.9.5-xerces.patch 705 SHA256 32a7b1e79c9258905aab082237d10583fdf3e0e88a7c50349daac7c6c2222925 SHA512 7a7b0e342258dce436a332cfc6a65d559e5ff3930d3a5e4c1555a1c1aebcb446335966d2b8d0669d8764f76ea79acf04521e3dbab9ced56ccd6a8b9f0036caf2 WHIRLPOOL b2d0381fe56da8e5667cbc9bdbc7ef3bda151d6dbe802b04584257e60e5e90d735262e5f51e40627369256f3b7a45fc7d8f8b16b8f062a31badff557bd7e5f1b
+AUX nekohtml-1.9.18-remove-obsolete-xerces-bridges.patch 533 SHA256 9d72da5a1b4281fb83514db33c471e70dbf91c1e0c9bcdbb9e41a5049ffa2bed SHA512 21c077f13c5157928f6cdc1be45f729e05b42d5b33cae7394d0d8c1167045f27e8baab89a5aefe33b907d1c3e2146030ee54a48da6d1a3bdde6c75f729dc7937 WHIRLPOOL c15097c889a72e511d8c2e6306f35b54821a7c983a0d995aa4d11d739002f4a2bd5c1512eb1002014dd21fe80650181e3f8bfa4b1ce1370eacff39b1d22673bc
+DIST nekohtml-1.9.18.tar.gz 10471968 SHA256 fbb0dc6bdc07a1b4c4cc7ab32197f1aa431a506e33caf6cfb8130766c22475c0 SHA512 f7321ad853eb63e327ef8bada52892caf58372f11136df72f46d8a7cd6918492cc66243002955525ac05fd669b3c4389e9067421f749f99f928629cc7f88e0eb WHIRLPOOL 8b7208ba84bdce1da6fdca17548f5c8b98a85a6d39f2695ddf776508c5b0dc3a724fbe994f64c37b62a718a36e41b8dfe28c73bbb7da7c0347485ebf8b811336
 DIST nekohtml-1.9.6.tar.gz 395521 SHA256 b0b40e4facee1ce2afae6402172835b8d86984117e8e9fe1e201afa6c29940a5 SHA512 dfc4e647d5e92a915f67d9095ba17b69a04e42e15eb10cdfd63f270ba157044e99ff9cca4f99105303d30cd6d9d484b0dcdd1ae5411c92f0523bed0c557fce3b WHIRLPOOL df151e335894c3fd8ada2fa2f9b4cd0f133453d9ac9403bf5abf29b0e950d3d934db9f383712f39b346b73d9b5f1c691cd5a578b3d85ee22655442ee07ec5bec
+EBUILD nekohtml-1.9.18.ebuild 1351 SHA256 bdbcd7ceda3c675ac4b9aa19284631b5449aa8b48a86ccf6ea64f4ccecae405d SHA512 bec644726ad166c91c031d9584bb07ab171952d21e6fd50bf9a69896ae9a52c0e4ca1cfb3d06b1bdca96d85e9010999daaab834bc15d1eea3193dc8afeda6bcf WHIRLPOOL 46050812761d66e991b9bd4113eb73f602cf529f72ce05973138c62bf68282816efcf09f0e46d3e3bc26bb3ef76230d7ab8c8258beb2a4aea19f2b3b218b04b4
 EBUILD nekohtml-1.9.6.ebuild 1181 SHA256 16918f6c4721b8bc136954888b53ebb4be7ad8b3c36b8113b5bcac546398f10e SHA512 61618f9302a4a21dcdfe347fdd7070cc2b5dd6ab926165ae00c046113df3e15dea8edf2a6a45869514fd379718c818a9a44cf83f64ccc7b1dc496debdbc3cb61 WHIRLPOOL 8142e659b5aedcd4f0c2cacd32b66747e389655f7eb7a9c3be270dcb526b4d00e342264249e038cca9894a442480cd7c9480b8518a785d5a0328e9895eed4e19
-MISC ChangeLog 1658 SHA256 b437ed0275a379322128bf6494c35b5b037db8f663690b7c7d86011155966709 SHA512 19a2989967ce0919664a497db46a99d36a772dafc534ecefdef8a8e4497ae2afdad3fa7b18d76756df9a05d26d759d36a9f2137a81c019c426debb75878264db WHIRLPOOL 45976a379d430238da55f67c756ee4356970160382b191e1a86a3e35b53d914a013f64550dd60ef8fe65f7e19f313a53608115116600250855d191c4d7516e95
+MISC ChangeLog 1951 SHA256 00885664d1d8e10345bbbf588fcd0a5df4ccb118c40fc9d124d4ea740b728f3c SHA512 7151a2d0a4f2777334b0e5b41482c3b164230d25709f9c658f29f7c1780de434ba0052327c9bcbb80bada4af7abb918cd54b406142eef4bdcd520576cf67d065 WHIRLPOOL 9af02ae726e7736b16cf322a5000e505cdc2dc6814c40b0fe8e8ea6ae93247e07880083d9b690698f189c2f7f42fa2efe0cb28808b9cc72789eb1aaabb7d9589
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP9fALAAoJEIUJ+svaV163eVcIALCUGFcyogANBhV6opGol7pM
-JRuZ9Bh+P6fjt2Xc92YUIRjQsBQHdG3st627R0u2mIRaI/lbNkczgyAbAKJmiOjT
-C8Tw3BXPmKH/sMPDCeWjO2CXfbHjOPySV3j3TgUpdiHrySTU+MpU3q42gI3pJLst
-fbcr33zjZJEAPkleJK3IrqVAbvXKU7otJaLX2bRXvVsCDjYoc/cZhL7RV6EZ1lyZ
-SOtPBERPxOE5PoEjfCRuStyCgDGjHypu7iHgy5TXWTmR0AW7OaYU1Y/k+IAvsTkK
-M1peIBYRev3nKuerk91a6LPX3CvO1Wl0C9rQ+wvffMY0QTwtUllWVkcriKTKxFI=
-=m5iY
+iQEcBAEBCAAGBQJRjLlyAAoJEJWyH81tNOV9SiEH/0UM1UkFhcWtZ1+tm9Q+pxgP
+ebDK3rXoxJXjWqRutKec7ieHlOXBkB6WwCAk+G69WpInDHmrn85U/DIhou4CV5NT
+we/adIpRSUtQsMZZSdv+k7743DpO4TNIpH9TEeIMMcXtv92Lr7NvHk5QvZBEoUPy
+v1Z/6XH1d5DPX1+go+73z22EhYNrGOVbeirAu5JAsb5P2W/k/ezPJasT2aAJcGAN
+nCtsMGr2fi9AWxEe07jKrwYMrOwX7obXrkJtoK9rLr6jALe7WAopc3ck/vbnnZxp
+RlkDbyLvt08O8x80QL6LdaJcA+zGAuoa+J4kdlw9lqnnnPtDjtBpZ0QB1JytIyU=
+=pRWw
 -----END PGP SIGNATURE-----
diff --git a/dev-java/nekohtml/files/nekohtml-1.9.18-remove-obsolete-xerces-bridges.patch b/dev-java/nekohtml/files/nekohtml-1.9.18-remove-obsolete-xerces-bridges.patch
new file mode 100644
index 000000000000..2f4a6c655cac
--- /dev/null
+++ b/dev-java/nekohtml/files/nekohtml-1.9.18-remove-obsolete-xerces-bridges.patch
@@ -0,0 +1,12 @@
+diff -Nru /tmp/nekohtml-1.9.16.orig/build.xml ./build.xml
+--- /tmp/nekohtml-1.9.16.orig/build.xml	2012-07-31 18:12:48.559950104 +0300
++++ ./build.xml	2012-07-31 18:12:53.887883123 +0300
+@@ -103,8 +103,6 @@
+ 		unless="compile.skip">
+ 	<mkdir dir="${build.classes.dir}"/>
+ 	
+-	<compileWith xercesVersion="2.0.2" bridge="2_0"/>
+-	<compileWith xercesVersion="2.1.0" bridge="2_1"/>
+ 	<compileWith xercesVersion="2.2.1" bridge="2_2"/>
+ 	<compileWith xercesVersion="2.3.0" bridge="2_3"/>
+ 	<compileWith xercesVersion="2.8.1" bridge="2_3"/>
diff --git a/dev-java/nekohtml/nekohtml-1.9.18.ebuild b/dev-java/nekohtml/nekohtml-1.9.18.ebuild
new file mode 100644
index 000000000000..53b652d66eee
--- /dev/null
+++ b/dev-java/nekohtml/nekohtml-1.9.18.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/nekohtml/nekohtml-1.9.18.ebuild,v 1.1 2013/05/10 09:11:41 tomwij Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="A simple HTML scanner and tag balancer using standard XML interfaces."
+
+HOMEPAGE="http://nekohtml.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="Apache-2.0"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+COMMON_DEP=">=dev-java/xerces-2.7"
+DEPEND=">=virtual/jdk-1.4
+	test? (
+		dev-java/junit:0
+		dev-java/ant-junit:0
+	)
+	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} taskdef"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_GENTOO_CLASSPATH="xerces-2"
+EANT_TEST_GENTOO_CLASSPATH="ant-junit,junit,xerces-2"
+
+# Do not generate docs, use bundled.
+EANT_DOC_TARGET=""
+
+src_prepare() {
+	find . -iname '*.jar' -delete
+
+	epatch "${FILESDIR}"/${P}-remove-obsolete-xerces-bridges.patch
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar build/lib/${PN}.jar
+
+	if use doc; then
+		java-pkg_dojavadoc --symlink javadoc doc/javadoc
+		dohtml -r doc/*
+	fi
+
+	use source && java-pkg_dosrc src/org
+	use examples && java-pkg_doexamples src/sample
+}