Use recent icu4j

Cleanup ebuild, bump EAPI to 5
Remove old

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x3C5CF75A

5 files changed, 65 insertions, 110 deletions

diff --git a/dev-java/htmlparser/ChangeLog b/dev-java/htmlparser/ChangeLog
index 17bc2cd471da..1ec85b093a1c 100644
--- a/dev-java/htmlparser/ChangeLog
+++ b/dev-java/htmlparser/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/htmlparser
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/htmlparser/ChangeLog,v 1.9 2013/07/08 14:11:01 tomwij Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/htmlparser/ChangeLog,v 1.10 2014/07/30 18:35:05 sera Exp $
+
+*htmlparser-1.4-r1 (30 Jul 2014)
+
+  30 Jul 2014; Ralph Sennhauser <sera@gentoo.org> -htmlparser-1.3.1.ebuild,
+  -htmlparser-1.4.ebuild, +htmlparser-1.4-r1.ebuild:
+  Use recent icu4j
+  Cleanup ebuild, bump EAPI to 5
+  Remove old
 
 *htmlparser-1.4 (08 Jul 2013)
 
diff --git a/dev-java/htmlparser/Manifest b/dev-java/htmlparser/Manifest
index aae2f402b062..8f2c568fcb1f 100644
--- a/dev-java/htmlparser/Manifest
+++ b/dev-java/htmlparser/Manifest
@@ -2,20 +2,18 @@
 Hash: SHA256
 
 AUX build.xml 559 SHA256 dc9ff4e15a7735237897d560d34ee7aa82d46c3cd51793a9743185b203ed366a SHA512 87abca9840918f40261f87f7c157d23fabedb8141c80a097efb874e986bc6da00b319412cfadd41ed781f1d0d4b13259152347eb6d084c73c4fc867e830af65a WHIRLPOOL 55ecec03371a44d84f7fde5928a47ab67bee2e82f3599ecde304383be0bc62620f17290195257656f85344011b09ec9aaa54cb2ed4eadea8d53c27e96679cd5f
-DIST htmlparser-1.3.1.zip 1196979 SHA256 abe5ca8e226f4104adbe361551024d73b964a583217acbbf7020d69b5b733556 SHA512 20c958e1ed9aadba53a07744b5e567d18ca7d50303e912186c5d1a5e0059ca04bf6ab04cc88aa441671c6b62a3c73d6b523b9308669b56894fbbfe5c9e6af895 WHIRLPOOL 55c8a94166a386c83ef5f4f43260f7cb11659d2dbe380285edc2f633180dcabcf3725802ad62effa0c7a4e94a4a6e1b303400c6f2e9c756302d3ae2c8f58f448
 DIST htmlparser-1.4.zip 1425388 SHA256 4e696a17f25a6983c846bb72b8f4e1920659d6a1677d5620eff60417260b586c SHA512 eb0587c808b287bbb18acbba11e8efe5bd0dededd96f6bf34ef59b92144227cf8368bf76474a2c1d87a5d6b635a63057faa9d18e2a1a2d7dfeacbfaa64e57700 WHIRLPOOL ae5de0f11b294ce7c831c1e4e121e0f4d2fe354883de3f83ed33c930180bb73f4d224edfbf75754c0d560946b6cddc03d71551f7219472a71d8952a71cf7c8b9
-EBUILD htmlparser-1.3.1.ebuild 1095 SHA256 11ddc746186e0bc23d5cb1f006eb5e4741dd92efa866df20e317fe44afcbc748 SHA512 12310841dd16fc05447c84868e9b28f7ee19004e8d2582bb18c6055a7d1b5b9f4ed5f967992f74d832d3e9a2a604ba1a634f8c289fe39b2455e57a96ab3064f5 WHIRLPOOL 7a1618bf3f59ff4adae3ec1afb330bf6e924e186cd9eae49a5393cd7ace4a5613cfcb7e132a925a1ac277387ab3196569f1686bd23b129952e20fe90e9978060
-EBUILD htmlparser-1.4.ebuild 1091 SHA256 dc5983de3fbe1f8c92451c6292e50ec300dee46da280bd367e1952038f61a5b6 SHA512 d8ce0f108ae9296da1940718393e0a9c2a3f8f8203d7f8909b26d795e69452038dfc9d1b6a1c1018d8cbfa697317e0ae27b41dc8020a0d3789af112b2a506b4c WHIRLPOOL 909ea3e69d66a8601931bd9e4254a91b3657990e0a0bfa5ff341de96cd5994e487998b0529f0024b0ab19c009d94984eb9d736cb2dff79c535998958cbafdf6f
-MISC ChangeLog 669 SHA256 551fab562a1ff9eb83f0c18c2860c4e4876966c3a0e7c07841700f44c6aa4497 SHA512 626598fc20eb4dce5e20634948fde098cf716ad69aed79afdc4a9cd2f8096dbab5e0ef2f857ae310baca4775e1026dd52e38a7b75e0441dd769cfa53f0790636 WHIRLPOOL f96f5178992428c6cf125e3c58fc261495f526fc23e3086f6daf3d7f03e4dc37ec78139b730acc28e7565fb1ac5b4f5ada39a5f10715d5083078913db5b08b49
+EBUILD htmlparser-1.4-r1.ebuild 1043 SHA256 0ce04e9159b33c9362874a12cd040d19495c43ab25e227e5495087c407ee38f1 SHA512 fb5c7911a8a6a2bc21ce844655d1afe2f0e9ac48469b93e8fefc8698ef1fb140454d71b7d30d13e02edffa942dcd7f47f9e541056e1d415849874dd085d14a70 WHIRLPOOL 613960362b84ed0c113fd906db26ecfff87457a945b70de80d88785c1a20b7bf22787053bd694ff9049267521d742b57a9a9744e2ba9147a3590805a8451d946
+MISC ChangeLog 897 SHA256 7930056b9646f10586edfd4038f95131983521e172e6d41ecb193c5f072c8955 SHA512 dd4334d1edd8386cfca092c8cc7d9128d12744ff7eee4572eae7231b52240f3c755c21d5de1487240235fea9de04f5389595aa74d1692c5e0e1bac509abc98b9 WHIRLPOOL 3f10a3206a610907701a0e739a4c19fa834192aed73df6dd33ae2f7209fe2029f69bb5d505393ed1b5749affa187fd8728e9c6e1b634edee35b212aaae59d8c8
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJR2se8AAoJEJWyH81tNOV9410IAK9J9CFoButTgs3oqVvVTLRg
-ELHLo0U49A86q/yoszQ9Ec5M5feQoV9PAeqpR8EI1KK+6/UZI4Z7nWt8IDBESvPX
-J+mgUNww0qe7p0oJ+/bI0ke2djgkvKeRKtcOZoq9a+HQBNRuDbnSAYzEXPPGGwy3
-PoYUfd6K7nqC8U90xjDklrAvAUbNf0AYfe46Qng0CXTSOU/xfzUiBZSDsVjXO2mB
-6go303sMmWz6fh4QK3kMXJB1WedEdsrMR6CbjdYlE3HbZ7iF0Q0huMknHSHHRRcC
-BUeONje8VznJwYXH21ivptVaBhQhPtvv/O+CMoxZL3oc9ZeFuT1yqj1TUYUm4JA=
-=6LPh
+iQEcBAEBCAAGBQJT2TrkAAoJELjwI6Q8XPdaGEYH/AkqoIpx/Y9tdgqje/sS3knx
+lnk1JUKfxvSJBYCXP5qPp5c1D3hZYcDPlgpPY7r2EMIJK3tHt05is98a2PvNypIB
+jV4eeli+825w/Jemuq+cYJZ5S8y4Q9aNiAWi6+kiVebtrs/lPoPmG26KNvztya74
+fUgW4GqG5fal5we6CcTWzy29nmoNevHuJuWSDq2Ss8ptcZVBScAX87wS+m4AMfvH
+vP/mDNM0Wmp8xAe9YZfxlFGKr+PtmpDtlKGTjuXXKDMSf/jikrdxoi8Fi5HuC2Y4
+o3BJqUBOxE2kaA3YeteCwZg1T1I0DbSTinQZMdHFiaXcKubp65F8YpB7tvMpnHc=
+=NynD
 -----END PGP SIGNATURE-----
diff --git a/dev-java/htmlparser/htmlparser-1.3.1.ebuild b/dev-java/htmlparser/htmlparser-1.3.1.ebuild
deleted file mode 100644
index 8d85e7e4c961..000000000000
--- a/dev-java/htmlparser/htmlparser-1.3.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/htmlparser/htmlparser-1.3.1.ebuild,v 1.1 2012/02/23 20:15:28 nelchael Exp $
-
-EAPI=4
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Implementation of the HTML5 parsing algorithm in Java"
-HOMEPAGE="http://about.validator.nu/htmlparser/"
-SRC_URI="http://about.validator.nu/${PN}/${P}.zip"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-COMMON_DEP="dev-java/icu4j:4
-	dev-java/xom
-	dev-java/jchardet"
-
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-	${COMMON_DEP}"
-
-src_prepare() {
-	rm -f *.jar
-	mkdir -p "${S}/build" || die "mkdir failed"
-	mkdir -p "${S}/lib" || die "mkdir failed"
-
-	cp "${FILESDIR}/build.xml" "${S}" || die "cp failed"
-
-	java-pkg_jarfrom --into lib/ icu4j-4
-	java-pkg_jarfrom --into lib/ xom
-	java-pkg_jarfrom --into lib/ jchardet
-}
-
-src_install() {
-	java-pkg_dojar htmlparser.jar
-
-	use source && java-pkg_dosrc src/*
-	use doc && java-pkg_dojavadoc docs
-}
diff --git a/dev-java/htmlparser/htmlparser-1.4-r1.ebuild b/dev-java/htmlparser/htmlparser-1.4-r1.ebuild
new file mode 100644
index 000000000000..47b7ec7ee013
--- /dev/null
+++ b/dev-java/htmlparser/htmlparser-1.4-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/htmlparser/htmlparser-1.4-r1.ebuild,v 1.1 2014/07/30 18:35:05 sera Exp $
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Implementation of the HTML5 parsing algorithm in Java"
+HOMEPAGE="http://about.validator.nu/htmlparser/"
+SRC_URI="http://about.validator.nu/${PN}/${P}.zip"
+
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/icu4j:52
+	dev-java/jchardet:0
+	dev-java/xom:0"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	app-arch/unzip"
+
+java_prepare() {
+	find "${WORKDIR}" -name '*.jar' -delete || die
+	mkdir -p build lib || die
+	cp "${FILESDIR}/build.xml" build.xml || die "cp failed"
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_GENTOO_CLASSPATH="icu4j-52,xom,jchardet"
+
+src_install() {
+	java-pkg_dojar htmlparser.jar
+
+	use source && java-pkg_dosrc src/*
+	use doc && java-pkg_dojavadoc docs
+}
diff --git a/dev-java/htmlparser/htmlparser-1.4.ebuild b/dev-java/htmlparser/htmlparser-1.4.ebuild
deleted file mode 100644
index a43e82b57937..000000000000
--- a/dev-java/htmlparser/htmlparser-1.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/htmlparser/htmlparser-1.4.ebuild,v 1.6 2013/07/08 14:11:01 tomwij Exp $
-
-EAPI=4
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Implementation of the HTML5 parsing algorithm in Java"
-HOMEPAGE="http://about.validator.nu/htmlparser/"
-SRC_URI="http://about.validator.nu/${PN}/${P}.zip"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-COMMON_DEP="dev-java/icu4j:4
-	dev-java/xom
-	dev-java/jchardet"
-
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-	${COMMON_DEP}"
-
-src_prepare() {
-	rm -f *.jar
-	mkdir -p "${S}/build" || die "mkdir failed"
-	mkdir -p "${S}/lib" || die "mkdir failed"
-
-	cp "${FILESDIR}/build.xml" "${S}" || die "cp failed"
-
-	java-pkg_jarfrom --into lib/ icu4j-4
-	java-pkg_jarfrom --into lib/ xom
-	java-pkg_jarfrom --into lib/ jchardet
-}
-
-src_install() {
-	java-pkg_dojar htmlparser.jar
-
-	use source && java-pkg_dosrc src/*
-	use doc && java-pkg_dojavadoc docs
-}