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@gentoo.org>

diff --git a/dev-java/htmlparser/htmlparser-1.4-r1.ebuild b/dev-java/htmlparser/htmlparser-1.4-r1.ebuild
index b0b8767c5f36e90128aa59bd9c3724a44f532a93..21ac42eee0f691437817d7b0d3469d735ccc00ad 100644 (file)
--- 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
 }