[gentoo-commits] repo/gentoo:master commit in: dev-java/htmlparser/

[Patrice Clement]

commit:     f36635a30e122c1351e4096037f3e1f6677c59e7
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 14 15:02:51 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Oct 14 17:43:59 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f36635a3

dev-java/htmlparser: Stable for amd64. Stable for x86 using the ALLARCHES 
policy.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-java/htmlparser/htmlparser-1.4-r1.ebuild | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/dev-java/htmlparser/htmlparser-1.4-r1.ebuild 
b/dev-java/htmlparser/htmlparser-1.4-r1.ebuild
index b0b8767..21ac42e 100644
--- a/dev-java/htmlparser/htmlparser-1.4-r1.ebuild
+++ b/dev-java/htmlparser/htmlparser-1.4-r1.ebuild
@@ -17,29 +17,27 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-COMMON_DEP="
+CDEPEND="
        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
+RDEPEND="${CDEPEND}
+       >=virtual/jre-1.6"
+DEPEND="${CDEPEND}
+       >=virtual/jdk-1.6
        app-arch/unzip"
 
 java_prepare() {
-       find "${WORKDIR}" -name '*.jar' -delete || die
+       java-pkg_clean
        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
-
+       java-pkg_dojar "${PN}.jar"
        use source && java-pkg_dosrc src/*
        use doc && java-pkg_dojavadoc docs
 }