From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E66881382C5 for ; Sat, 1 May 2021 17:45:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2905EE0D08; Sat, 1 May 2021 17:45:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0DD76E0D08 for ; Sat, 1 May 2021 17:45:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B53FE335C8F for ; Sat, 1 May 2021 17:45:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0CA26729 for ; Sat, 1 May 2021 17:45:19 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1619891100.61963e5df74244a8c600ebab773098dd8717910f.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/osgi-foundation/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/osgi-foundation/osgi-foundation-1.2.0-r1.ebuild dev-java/osgi-foundation/osgi-foundation-1.2.0-r2.ebuild X-VCS-Directories: dev-java/osgi-foundation/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 61963e5df74244a8c600ebab773098dd8717910f X-VCS-Branch: master Date: Sat, 1 May 2021 17:45:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ac7a5f9b-9c12-4d1f-82ef-5e95b959c1d3 X-Archives-Hash: 2950faae6361eb6ea8bb95be768d1d15 commit: 61963e5df74244a8c600ebab773098dd8717910f Author: Miroslav Šulc gentoo org> AuthorDate: Sat May 1 17:45:00 2021 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Sat May 1 17:45:00 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61963e5d dev-java/osgi-foundation: eapi7 + java 1.8 Closes: https://bugs.gentoo.org/786765 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Miroslav Šulc gentoo.org> ...dation-1.2.0-r1.ebuild => osgi-foundation-1.2.0-r2.ebuild} | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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 similarity index 80% rename from dev-java/osgi-foundation/osgi-foundation-1.2.0-r1.ebuild rename to dev-java/osgi-foundation/osgi-foundation-1.2.0-r2.ebuild index ee652a6205c..3e37ca69434 100644 --- a/dev-java/osgi-foundation/osgi-foundation-1.2.0-r1.ebuild +++ b/dev-java/osgi-foundation/osgi-foundation-1.2.0-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 JAVA_PKG_IUSE="doc source" @@ -15,10 +15,11 @@ LICENSE="Apache-2.0 OSGi-Specification-2.0" SLOT="0" KEYWORDS="amd64 ~ppc64 x86" -DEPEND=">=virtual/jdk-1.5" -RDEPEND=">=virtual/jre-1.5" +DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" -java_prepare() { +src_prepare() { + default cp "${FILESDIR}"/${P}-build.xml "${S}"/build.xml || die }