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

[Patrice Clement]

commit:     4aefee58fb83b894bb4a09000b8f564e1f362b0c
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 31 22:07:57 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Mar 31 22:26:54 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aefee58

dev-java/jlex: Stable for amd64. Retroactively mark stable for the remaining 
arches using the ALLARCHES policy.

Package-Manager: portage-2.2.26

 dev-java/jlex/jlex-1.2.6-r2.ebuild | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/dev-java/jlex/jlex-1.2.6-r2.ebuild 
b/dev-java/jlex/jlex-1.2.6-r2.ebuild
index 27c5782..3babb82 100644
--- a/dev-java/jlex/jlex-1.2.6-r2.ebuild
+++ b/dev-java/jlex/jlex-1.2.6-r2.ebuild
@@ -11,13 +11,19 @@ inherit java-pkg-2
 DESCRIPTION="JLex: a lexical analyzer generator for Java"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 HOMEPAGE="http://www.cs.princeton.edu/~appel/modern/java/JLex/";
-KEYWORDS="~amd64 ~x86"
+
+KEYWORDS="amd64 x86"
 LICENSE="jlex"
 SLOT="0"
-DEPEND=">=virtual/jdk-1.4"
-RDEPEND=">=virtual/jre-1.4"
 IUSE=""
 
+RDEPEND="
+       >=virtual/jre-1.6"
+
+DEPEND="
+       >=virtual/jdk-1.6
+       source? ( app-arch/zip )"
+
 src_compile() {
        ejavac -nowarn Main.java
 }
@@ -25,17 +31,19 @@ src_compile() {
 src_install() {
        dodoc README Bugs
 
-       if use doc ; then
+       if use doc; then
                dohtml manual.html
                dodoc sample.lex
        fi
 
-       mkdir JLex && mv *.class JLex/
+       mkdir JLex || die
+       mv *.class JLex/ || die
        jar cf jlex.jar JLex/ || die "failed to jar"
-       java-pkg_dojar jlex.jar
-       java-pkg_dolauncher jlex --main JLex.Main jlex.jar
 
-       if use source ; then
+       java-pkg_dojar "${PN}.jar"
+       java-pkg_dolauncher "${PN}" --main JLex.Main "${PN}.jar"
+
+       if use source; then
                rm JLex/*
                cp Main.java JLex
                java-pkg_dosrc JLex