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 7BF04138359 for ; Tue, 25 Aug 2020 09:46:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 89837E0845; Tue, 25 Aug 2020 09:46:34 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 70B44E0845 for ; Tue, 25 Aug 2020 09:46:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 8060D33BE93 for ; Tue, 25 Aug 2020 09:46:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F111D26 for ; Tue, 25 Aug 2020 09:46:31 +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: <1598348782.785ec13ab2562c87ef4ab644d6eace7a8b740bfd.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/joda-time/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/joda-time/joda-time-2.7-r1.ebuild dev-java/joda-time/joda-time-2.7.ebuild X-VCS-Directories: dev-java/joda-time/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 785ec13ab2562c87ef4ab644d6eace7a8b740bfd X-VCS-Branch: master Date: Tue, 25 Aug 2020 09:46:31 +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: a0ee82b5-05e3-469a-9829-c29a1b896773 X-Archives-Hash: 180d7fb57213ad144818aeb22d2bd55b commit: 785ec13ab2562c87ef4ab644d6eace7a8b740bfd Author: Miroslav Šulc gentoo org> AuthorDate: Tue Aug 25 09:46:22 2020 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Tue Aug 25 09:46:22 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=785ec13a dev-java/joda-time: eapi7, min jdk 1.8 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Miroslav Šulc gentoo.org> .../{joda-time-2.7.ebuild => joda-time-2.7-r1.ebuild} | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dev-java/joda-time/joda-time-2.7.ebuild b/dev-java/joda-time/joda-time-2.7-r1.ebuild similarity index 95% rename from dev-java/joda-time/joda-time-2.7.ebuild rename to dev-java/joda-time/joda-time-2.7-r1.ebuild index 2f19a557d78..bbf0efca3a8 100644 --- a/dev-java/joda-time/joda-time-2.7.ebuild +++ b/dev-java/joda-time/joda-time-2.7-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 JAVA_PKG_IUSE="doc examples source test" JAVA_ANT_REWRITE_CLASSPATH="true" @@ -17,15 +17,17 @@ KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-s RESTRICT="test" -DEPEND=">=virtual/jdk-1.5 +DEPEND=">=virtual/jdk-1.8 dev-java/joda-convert:0 test? ( dev-java/junit:0 dev-java/ant-junit:0 )" -RDEPEND=">=virtual/jre-1.5" +RDEPEND=">=virtual/jre-1.8" + +src_prepare() { + default -java_prepare() { rm -v *.jar || die "Failed to remove bundled jars." cp "${FILESDIR}"/${P}-build.xml "${S}"/build.xml || die "Failed to copy build file."