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

Tue, 18 Jan 2022 01:51:30 -0800 

commit:     ace27ff4b5d966a6843f86da8f26710f1e8bcfcd
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 18 09:49:56 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Jan 18 09:51:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ace27ff4

dev-java/jakarta-regexp: eapi8 + min java 1.8 + https + cleanup

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild   |  4 ++--
 ...gexp-1.3-r5.ebuild => jakarta-regexp-1.3-r6.ebuild} | 18 +++++++++---------
 dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild   |  4 ++--
 ...gexp-1.3-r5.ebuild => jakarta-regexp-1.4-r3.ebuild} | 17 ++++++++---------
 ...gexp-1.3-r5.ebuild => jakarta-regexp-1.5-r1.ebuild} | 17 ++++++++---------
 dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild      |  4 ++--
 6 files changed, 31 insertions(+), 33 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 ddfe39278ff9..f5a39f4ca7d2 100644
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="100% Pure Java Regular Expression package"
 SRC_URI="mirror://apache/jakarta/regexp/source/${P}.tar.gz"
-HOMEPAGE="http://jakarta.apache.org/";
+HOMEPAGE="https://jakarta.apache.org/";
 
 SLOT="${PV}"
 IUSE=""

diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild 
b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r6.ebuild
similarity index 59%
copy from dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
copy to dev-java/jakarta-regexp/jakarta-regexp-1.3-r6.ebuild
index ddfe39278ff9..ab1d50e24403 100644
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 JAVA_PKG_IUSE="doc source"
 
@@ -9,25 +9,25 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="100% Pure Java Regular Expression package"
 SRC_URI="mirror://apache/jakarta/regexp/source/${P}.tar.gz"
-HOMEPAGE="http://jakarta.apache.org/";
+HOMEPAGE="https://jakarta.apache.org/";
 
 SLOT="${PV}"
 IUSE=""
 LICENSE="Apache-1.1"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="
-       >=virtual/jre-1.6"
+       >=virtual/jre-1.8:*"
 
 DEPEND="
-       >=virtual/jdk-1.6
-       source? ( app-arch/zip )"
+       >=virtual/jdk-1.8:*"
 
 S="${WORKDIR}/${P}"
 
 JAVA_SRC_DIR="src/java"
 
-java_prepare() {
+src_prepare() {
+       default
+
        java-pkg_clean
-       rm build.xml || 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 ddfe39278ff9..f5a39f4ca7d2 100644
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="100% Pure Java Regular Expression package"
 SRC_URI="mirror://apache/jakarta/regexp/source/${P}.tar.gz"
-HOMEPAGE="http://jakarta.apache.org/";
+HOMEPAGE="https://jakarta.apache.org/";
 
 SLOT="${PV}"
 IUSE=""

diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild 
b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r3.ebuild
similarity index 59%
copy from dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
copy to dev-java/jakarta-regexp/jakarta-regexp-1.4-r3.ebuild
index ddfe39278ff9..db72332f033f 100644
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.4-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 JAVA_PKG_IUSE="doc source"
 
@@ -9,25 +9,24 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="100% Pure Java Regular Expression package"
 SRC_URI="mirror://apache/jakarta/regexp/source/${P}.tar.gz"
-HOMEPAGE="http://jakarta.apache.org/";
+HOMEPAGE="https://jakarta.apache.org/";
 
 SLOT="${PV}"
 IUSE=""
 LICENSE="Apache-1.1"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="
-       >=virtual/jre-1.6"
+       >=virtual/jre-1.8:*"
 
 DEPEND="
-       >=virtual/jdk-1.6
-       source? ( app-arch/zip )"
+       >=virtual/jdk-1.8:*"
 
 S="${WORKDIR}/${P}"
 
 JAVA_SRC_DIR="src/java"
 
-java_prepare() {
+src_prepare() {
+       default
        java-pkg_clean
-       rm build.xml || die
 }

diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild 
b/dev-java/jakarta-regexp/jakarta-regexp-1.5-r1.ebuild
similarity index 59%
copy from dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
copy to dev-java/jakarta-regexp/jakarta-regexp-1.5-r1.ebuild
index ddfe39278ff9..db72332f033f 100644
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r5.ebuild
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.5-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
 JAVA_PKG_IUSE="doc source"
 
@@ -9,25 +9,24 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="100% Pure Java Regular Expression package"
 SRC_URI="mirror://apache/jakarta/regexp/source/${P}.tar.gz"
-HOMEPAGE="http://jakarta.apache.org/";
+HOMEPAGE="https://jakarta.apache.org/";
 
 SLOT="${PV}"
 IUSE=""
 LICENSE="Apache-1.1"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="
-       >=virtual/jre-1.6"
+       >=virtual/jre-1.8:*"
 
 DEPEND="
-       >=virtual/jdk-1.6
-       source? ( app-arch/zip )"
+       >=virtual/jdk-1.8:*"
 
 S="${WORKDIR}/${P}"
 
 JAVA_SRC_DIR="src/java"
 
-java_prepare() {
+src_prepare() {
+       default
        java-pkg_clean
-       rm build.xml || die
 }

diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild 
b/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild
index ddfe39278ff9..f5a39f4ca7d2 100644
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="100% Pure Java Regular Expression package"
 SRC_URI="mirror://apache/jakarta/regexp/source/${P}.tar.gz"
-HOMEPAGE="http://jakarta.apache.org/";
+HOMEPAGE="https://jakarta.apache.org/";
 
 SLOT="${PV}"
 IUSE=""

Reply via email to