[gentoo-commits] proj/java:master commit in: dev-java/icedtea/

[James Le Cuirot]

commit:     5f510f935a19cf86f1e890f540749d48d6b85813
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  4 22:37:55 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> 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_and...@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_and...@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_and...@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}