From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 95E8158973 for ; Sun, 24 Jan 2016 20:34:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 20B0721C020; Sun, 24 Jan 2016 20:34:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 69BBD21C020 for ; Sun, 24 Jan 2016 20:34:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7E46C340775 for ; Sun, 24 Jan 2016 20:34:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A4140102E for ; Sun, 24 Jan 2016 20:34:10 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1453667544.317b6668b829f623fe4cc2deccba7dbbaedf6627.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: virtual/jdk/ X-VCS-Repository: repo/gentoo X-VCS-Files: virtual/jdk/jdk-1.7.0-r1.ebuild virtual/jdk/jdk-1.8.0-r1.ebuild virtual/jdk/jdk-1.8.0.ebuild X-VCS-Directories: virtual/jdk/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 317b6668b829f623fe4cc2deccba7dbbaedf6627 X-VCS-Branch: master Date: Sun, 24 Jan 2016 20:34:10 +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-Archives-Salt: 08a27f80-53a6-447b-ad06-a45c9d51f0ac X-Archives-Hash: 6f3c05aeb2c37469576b469598a81d3c commit: 317b6668b829f623fe4cc2deccba7dbbaedf6627 Author: James Le Cuirot gentoo org> AuthorDate: Sun Jan 24 20:26:12 2016 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Sun Jan 24 20:32:24 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=317b6668 virtual/jdk: It's 2016, let's use EAPI 6 and SLOT dependencies Ignoring 1.6 because it's about to die. Package-Manager: portage-2.2.27 virtual/jdk/jdk-1.7.0-r1.ebuild | 16 ++++++++++++++++ virtual/jdk/{jdk-1.8.0.ebuild => jdk-1.8.0-r1.ebuild} | 8 +++----- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/virtual/jdk/jdk-1.7.0-r1.ebuild b/virtual/jdk/jdk-1.7.0-r1.ebuild new file mode 100644 index 0000000..2ab126f --- /dev/null +++ b/virtual/jdk/jdk-1.7.0-r1.ebuild @@ -0,0 +1,16 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="6" + +DESCRIPTION="Virtual for Java Development Kit (JDK)" +SLOT="1.7" +KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +RDEPEND="|| ( + dev-java/icedtea-bin:7 + dev-java/icedtea:7 + dev-java/oracle-jdk-bin:1.7 + dev-java/soylatte-jdk-bin:1.7 + )" diff --git a/virtual/jdk/jdk-1.8.0.ebuild b/virtual/jdk/jdk-1.8.0-r1.ebuild similarity index 52% rename from virtual/jdk/jdk-1.8.0.ebuild rename to virtual/jdk/jdk-1.8.0-r1.ebuild index 73c1d41..03f73ae 100644 --- a/virtual/jdk/jdk-1.8.0.ebuild +++ b/virtual/jdk/jdk-1.8.0-r1.ebuild @@ -1,13 +1,11 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="6" DESCRIPTION="Virtual for Java Development Kit (JDK)" SLOT="1.8" -# TODO: Temporarily dropped ~sparc-solaris and ~x86-solaris as oracle-jdk-bin -# no longer provides them. Also temporarily dropped ~ia64. KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris" -RDEPEND="=dev-java/oracle-jdk-bin-1.8.0*" +RDEPEND="dev-java/oracle-jdk-bin:1.8"