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

[Patrice Clement]

commit:     abf467a371b6bc0ba83c9041f58bff46cd646bab
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 14 08:08:03 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Apr 14 13:18:14 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abf467a3

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

Package-Manager: portage-2.2.26

 dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild | 14 +++++++++-----
 dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild | 14 +++++++++-----
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild 
b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
index 0b15f47..6bfb2d1 100644
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
@@ -12,19 +12,23 @@ DESCRIPTION="100% Pure Java Regular Expression package"
 SRC_URI="mirror://apache/jakarta/regexp/source/${P}.tar.gz"
 HOMEPAGE="http://jakarta.apache.org/";
 
-SLOT="1.3"
+SLOT="${PV}"
 IUSE=""
 LICENSE="Apache-1.1"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux 
~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux 
~ppc-macos ~x86-macos ~x86-solaris"
 
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
+RDEPEND="
+       >=virtual/jre-1.6"
+
+DEPEND="
+       >=virtual/jdk-1.6
+       source? ( app-arch/zip )"
 
 S="${WORKDIR}/${P}"
 
 JAVA_SRC_DIR="src/java"
 
 java_prepare() {
+       java-pkg_clean
        rm build.xml || die
-       find -name "*.jar" -delete || die
 }

diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild 
b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild
index 8c7486c..6bfb2d1 100644
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild
@@ -12,19 +12,23 @@ DESCRIPTION="100% Pure Java Regular Expression package"
 SRC_URI="mirror://apache/jakarta/regexp/source/${P}.tar.gz"
 HOMEPAGE="http://jakarta.apache.org/";
 
-SLOT="1.4"
+SLOT="${PV}"
 IUSE=""
 LICENSE="Apache-1.1"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux 
~ppc-macos ~x86-macos ~x86-solaris"
 
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
+RDEPEND="
+       >=virtual/jre-1.6"
+
+DEPEND="
+       >=virtual/jdk-1.6
+       source? ( app-arch/zip )"
 
 S="${WORKDIR}/${P}"
 
 JAVA_SRC_DIR="src/java"
 
 java_prepare() {
+       java-pkg_clean
        rm build.xml || die
-       find -name "*.jar" -delete || die
 }