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 97D3B1384B4 for ; Mon, 4 Jan 2016 22:40:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1E955E0893; Mon, 4 Jan 2016 22:40:33 +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 5A2CDE0893 for ; Mon, 4 Jan 2016 22:40:32 +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 41BB834087E for ; Mon, 4 Jan 2016 22:40:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D850BC6A for ; Mon, 4 Jan 2016 22:40:29 +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: <1451947075.5f510f935a19cf86f1e890f540749d48d6b85813.chewi@gentoo> Subject: [gentoo-commits] proj/java:master commit in: dev-java/icedtea/ X-VCS-Repository: proj/java X-VCS-Files: dev-java/icedtea/icedtea-3.0.0_pre07.ebuild dev-java/icedtea/icedtea-7.2.6.3-r1.ebuild dev-java/icedtea/icedtea-7.2.7.0_pre00-r1.ebuild X-VCS-Directories: dev-java/icedtea/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 5f510f935a19cf86f1e890f540749d48d6b85813 X-VCS-Branch: master Date: Mon, 4 Jan 2016 22:40:29 +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: 4584ff36-8183-4af6-b460-a670a9807aa3 X-Archives-Hash: 1548c9dca230a36e447d5acaa25915ca commit: 5f510f935a19cf86f1e890f540749d48d6b85813 Author: James Le Cuirot gentoo org> AuthorDate: Mon Jan 4 22:37:55 2016 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Mon Jan 4 22:37:55 2016 +0000 URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=5f510f93 dev-java/icedtea: Allow usage of newer icedtea-web Package-Manager: portage-2.2.26 dev-java/icedtea/icedtea-3.0.0_pre07.ebuild | 10 ++++------ dev-java/icedtea/icedtea-7.2.6.3-r1.ebuild | 6 +++--- dev-java/icedtea/icedtea-7.2.7.0_pre00-r1.ebuild | 6 +++--- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dev-java/icedtea/icedtea-3.0.0_pre07.ebuild b/dev-java/icedtea/icedtea-3.0.0_pre07.ebuild index fd526e8..4cfa7fb 100644 --- a/dev-java/icedtea/icedtea-3.0.0_pre07.ebuild +++ b/dev-java/icedtea/icedtea-3.0.0_pre07.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) @@ -148,11 +148,9 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND} pax_kernel? ( sys-apps/elfix )" -PDEPEND="!ppc? ( !ppc64? ( !x86? ( - webstart? ( dev-java/icedtea-web:0[icedtea8] ) - nsplugin? ( dev-java/icedtea-web:0[icedtea8,nsplugin] ) ) - pulseaudio? ( dev-java/icedtea-sound ) -) )" +PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) + nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) + pulseaudio? ( dev-java/icedtea-sound )" S="${WORKDIR}"/${ICEDTEA_PKG} diff --git a/dev-java/icedtea/icedtea-7.2.6.3-r1.ebuild b/dev-java/icedtea/icedtea-7.2.6.3-r1.ebuild index 99e91ac..1cf5037 100644 --- a/dev-java/icedtea/icedtea-7.2.6.3-r1.ebuild +++ b/dev-java/icedtea/icedtea-7.2.6.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) @@ -152,8 +152,8 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_ virtual/pkgconfig pax_kernel? ( sys-apps/elfix )" -PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] ) - nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] ) +PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7(+)] ) + nsplugin? ( dev-java/icedtea-web:0[icedtea7(+),nsplugin] ) pulseaudio? ( dev-java/icedtea-sound )" S="${WORKDIR}"/${ICEDTEA_PKG} diff --git a/dev-java/icedtea/icedtea-7.2.7.0_pre00-r1.ebuild b/dev-java/icedtea/icedtea-7.2.7.0_pre00-r1.ebuild index 26209cb..9f8671c 100644 --- a/dev-java/icedtea/icedtea-7.2.7.0_pre00-r1.ebuild +++ b/dev-java/icedtea/icedtea-7.2.7.0_pre00-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) @@ -152,8 +152,8 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_ virtual/pkgconfig pax_kernel? ( sys-apps/elfix )" -PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] ) - nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] ) +PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7(+)] ) + nsplugin? ( dev-java/icedtea-web:0[icedtea7(+),nsplugin] ) pulseaudio? ( dev-java/icedtea-sound )" S="${WORKDIR}"/${ICEDTEA_PKG}