Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/osgi-foundation/
Date: Sat, 01 May 2021 17:45:23
Message-Id: 1619891100.61963e5df74244a8c600ebab773098dd8717910f.fordfrog@gentoo
1 commit: 61963e5df74244a8c600ebab773098dd8717910f
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 1 17:45:00 2021 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Sat May 1 17:45:00 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61963e5d
7
8 dev-java/osgi-foundation: eapi7 + java 1.8
9
10 Closes: https://bugs.gentoo.org/786765
11 Package-Manager: Portage-3.0.18, Repoman-3.0.3
12 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
13
14 ...dation-1.2.0-r1.ebuild => osgi-foundation-1.2.0-r2.ebuild} | 11 ++++++-----
15 1 file changed, 6 insertions(+), 5 deletions(-)
16
17 diff --git a/dev-java/osgi-foundation/osgi-foundation-1.2.0-r1.ebuild b/dev-java/osgi-foundation/osgi-foundation-1.2.0-r2.ebuild
18 similarity index 80%
19 rename from dev-java/osgi-foundation/osgi-foundation-1.2.0-r1.ebuild
20 rename to dev-java/osgi-foundation/osgi-foundation-1.2.0-r2.ebuild
21 index ee652a6205c..3e37ca69434 100644
22 --- a/dev-java/osgi-foundation/osgi-foundation-1.2.0-r1.ebuild
23 +++ b/dev-java/osgi-foundation/osgi-foundation-1.2.0-r2.ebuild
24 @@ -1,7 +1,7 @@
25 -# Copyright 1999-2020 Gentoo Authors
26 +# Copyright 1999-2021 Gentoo Authors
27 # Distributed under the terms of the GNU General Public License v2
28
29 -EAPI="5"
30 +EAPI=7
31
32 JAVA_PKG_IUSE="doc source"
33
34 @@ -15,10 +15,11 @@ LICENSE="Apache-2.0 OSGi-Specification-2.0"
35 SLOT="0"
36 KEYWORDS="amd64 ~ppc64 x86"
37
38 -DEPEND=">=virtual/jdk-1.5"
39 -RDEPEND=">=virtual/jre-1.5"
40 +DEPEND=">=virtual/jdk-1.8:*"
41 +RDEPEND=">=virtual/jre-1.8:*"
42
43 -java_prepare() {
44 +src_prepare() {
45 + default
46 cp "${FILESDIR}"/${P}-build.xml "${S}"/build.xml || die
47 }