| 1 |
commit: 5f510f935a19cf86f1e890f540749d48d6b85813 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 4 22:37:55 2016 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 4 22:37:55 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=5f510f93 |
| 7 |
|
| 8 |
dev-java/icedtea: Allow usage of newer icedtea-web |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.26 |
| 11 |
|
| 12 |
dev-java/icedtea/icedtea-3.0.0_pre07.ebuild | 10 ++++------ |
| 13 |
dev-java/icedtea/icedtea-7.2.6.3-r1.ebuild | 6 +++--- |
| 14 |
dev-java/icedtea/icedtea-7.2.7.0_pre00-r1.ebuild | 6 +++--- |
| 15 |
3 files changed, 10 insertions(+), 12 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-java/icedtea/icedtea-3.0.0_pre07.ebuild b/dev-java/icedtea/icedtea-3.0.0_pre07.ebuild |
| 18 |
index fd526e8..4cfa7fb 100644 |
| 19 |
--- a/dev-java/icedtea/icedtea-3.0.0_pre07.ebuild |
| 20 |
+++ b/dev-java/icedtea/icedtea-3.0.0_pre07.ebuild |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 1999-2015 Gentoo Foundation |
| 23 |
+# Copyright 1999-2016 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
# $Id$ |
| 26 |
# Build written by Andrew John Hughes (gnu_andrew@××××××××××.org) |
| 27 |
@@ -148,11 +148,9 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} |
| 28 |
${X_DEPEND} |
| 29 |
pax_kernel? ( sys-apps/elfix )" |
| 30 |
|
| 31 |
-PDEPEND="!ppc? ( !ppc64? ( !x86? ( |
| 32 |
- webstart? ( dev-java/icedtea-web:0[icedtea8] ) |
| 33 |
- nsplugin? ( dev-java/icedtea-web:0[icedtea8,nsplugin] ) ) |
| 34 |
- pulseaudio? ( dev-java/icedtea-sound ) |
| 35 |
-) )" |
| 36 |
+PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) |
| 37 |
+ nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) |
| 38 |
+ pulseaudio? ( dev-java/icedtea-sound )" |
| 39 |
|
| 40 |
S="${WORKDIR}"/${ICEDTEA_PKG} |
| 41 |
|
| 42 |
|
| 43 |
diff --git a/dev-java/icedtea/icedtea-7.2.6.3-r1.ebuild b/dev-java/icedtea/icedtea-7.2.6.3-r1.ebuild |
| 44 |
index 99e91ac..1cf5037 100644 |
| 45 |
--- a/dev-java/icedtea/icedtea-7.2.6.3-r1.ebuild |
| 46 |
+++ b/dev-java/icedtea/icedtea-7.2.6.3-r1.ebuild |
| 47 |
@@ -1,4 +1,4 @@ |
| 48 |
-# Copyright 1999-2015 Gentoo Foundation |
| 49 |
+# Copyright 1999-2016 Gentoo Foundation |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
# $Id$ |
| 52 |
# Build written by Andrew John Hughes (gnu_andrew@××××××××××.org) |
| 53 |
@@ -152,8 +152,8 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_ |
| 54 |
virtual/pkgconfig |
| 55 |
pax_kernel? ( sys-apps/elfix )" |
| 56 |
|
| 57 |
-PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] ) |
| 58 |
- nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] ) |
| 59 |
+PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7(+)] ) |
| 60 |
+ nsplugin? ( dev-java/icedtea-web:0[icedtea7(+),nsplugin] ) |
| 61 |
pulseaudio? ( dev-java/icedtea-sound )" |
| 62 |
|
| 63 |
S="${WORKDIR}"/${ICEDTEA_PKG} |
| 64 |
|
| 65 |
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 |
| 66 |
index 26209cb..9f8671c 100644 |
| 67 |
--- a/dev-java/icedtea/icedtea-7.2.7.0_pre00-r1.ebuild |
| 68 |
+++ b/dev-java/icedtea/icedtea-7.2.7.0_pre00-r1.ebuild |
| 69 |
@@ -1,4 +1,4 @@ |
| 70 |
-# Copyright 1999-2015 Gentoo Foundation |
| 71 |
+# Copyright 1999-2016 Gentoo Foundation |
| 72 |
# Distributed under the terms of the GNU General Public License v2 |
| 73 |
# $Id$ |
| 74 |
# Build written by Andrew John Hughes (gnu_andrew@××××××××××.org) |
| 75 |
@@ -152,8 +152,8 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_ |
| 76 |
virtual/pkgconfig |
| 77 |
pax_kernel? ( sys-apps/elfix )" |
| 78 |
|
| 79 |
-PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] ) |
| 80 |
- nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] ) |
| 81 |
+PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7(+)] ) |
| 82 |
+ nsplugin? ( dev-java/icedtea-web:0[icedtea7(+),nsplugin] ) |
| 83 |
pulseaudio? ( dev-java/icedtea-sound )" |
| 84 |
|
| 85 |
S="${WORKDIR}"/${ICEDTEA_PKG} |
Archives