| 1 |
commit: ab64ece87805abd80eec035c2eeecff6b4d6b900 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 30 21:55:06 2017 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 30 21:55:06 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=ab64ece8 |
| 7 |
|
| 8 |
dev-java/icedtea: Be more consistent with dependency slots |
| 9 |
|
| 10 |
Opinions on this differ but let's only apply slot restrictions where |
| 11 |
sub-slots or non-0 slots are present. |
| 12 |
|
| 13 |
RDEPENDs do not benefit from sub-slot operators at all. |
| 14 |
|
| 15 |
Only slot 0 of dev-libs/openssl will work as 0.9.8 installs nothing |
| 16 |
but library files. |
| 17 |
|
| 18 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 19 |
|
| 20 |
dev-java/icedtea/icedtea-3.3.0.ebuild | 18 +++++++++--------- |
| 21 |
dev-java/icedtea/icedtea-3.3.0_pre00.ebuild | 18 +++++++++--------- |
| 22 |
2 files changed, 18 insertions(+), 18 deletions(-) |
| 23 |
|
| 24 |
diff --git a/dev-java/icedtea/icedtea-3.3.0.ebuild b/dev-java/icedtea/icedtea-3.3.0.ebuild |
| 25 |
index 3e50184..627a43f 100644 |
| 26 |
--- a/dev-java/icedtea/icedtea-3.3.0.ebuild |
| 27 |
+++ b/dev-java/icedtea/icedtea-3.3.0.ebuild |
| 28 |
@@ -78,7 +78,7 @@ ALSA_COMMON_DEP=" |
| 29 |
CUPS_COMMON_DEP=" |
| 30 |
>=net-print/cups-1.2.12" |
| 31 |
X_COMMON_DEP=" |
| 32 |
- >=media-libs/giflib-4.1.6:= |
| 33 |
+ >=media-libs/giflib-4.1.6:0= |
| 34 |
>=media-libs/libpng-1.2:0= |
| 35 |
>=x11-libs/libX11-1.1.3 |
| 36 |
>=x11-libs/libXext-1.1.1 |
| 37 |
@@ -97,12 +97,12 @@ X_DEPEND=" |
| 38 |
|
| 39 |
# The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn |
| 40 |
COMMON_DEP=" |
| 41 |
- >=dev-libs/glib-2.26:2 |
| 42 |
+ >=dev-libs/glib-2.26:2= |
| 43 |
>=dev-util/systemtap-1 |
| 44 |
- media-libs/fontconfig |
| 45 |
+ media-libs/fontconfig:1.0= |
| 46 |
>=media-libs/freetype-2.5.3:2= |
| 47 |
- >=media-libs/lcms-2.5 |
| 48 |
- >=sys-libs/zlib-1.2.3:= |
| 49 |
+ >=media-libs/lcms-2.5:2= |
| 50 |
+ >=sys-libs/zlib-1.2.3 |
| 51 |
virtual/jpeg:0= |
| 52 |
kerberos? ( virtual/krb5 ) |
| 53 |
sctp? ( net-misc/lksctp-tools ) |
| 54 |
@@ -120,9 +120,9 @@ RDEPEND="${COMMON_DEP} |
| 55 |
cups? ( ${CUPS_COMMON_DEP} ) |
| 56 |
gtk? ( |
| 57 |
>=dev-libs/atk-1.30.0 |
| 58 |
- >=x11-libs/cairo-1.8.8:= |
| 59 |
+ >=x11-libs/cairo-1.8.8 |
| 60 |
x11-libs/gdk-pixbuf:2 |
| 61 |
- >=x11-libs/gtk+-2.8:2= |
| 62 |
+ >=x11-libs/gtk+-2.8:2 |
| 63 |
>=x11-libs/pango-1.24.5 |
| 64 |
) |
| 65 |
!headless-awt? ( ${X_COMMON_DEP} ) |
| 66 |
@@ -146,8 +146,8 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_ |
| 67 |
app-arch/zip |
| 68 |
app-misc/ca-certificates |
| 69 |
dev-lang/perl |
| 70 |
- !libressl? ( dev-libs/openssl ) |
| 71 |
- libressl? ( dev-libs/libressl ) |
| 72 |
+ !libressl? ( dev-libs/openssl:0 ) |
| 73 |
+ libressl? ( dev-libs/libressl:0 ) |
| 74 |
sys-apps/attr |
| 75 |
sys-apps/lsb-release |
| 76 |
x11-libs/libXt |
| 77 |
|
| 78 |
diff --git a/dev-java/icedtea/icedtea-3.3.0_pre00.ebuild b/dev-java/icedtea/icedtea-3.3.0_pre00.ebuild |
| 79 |
index f668aef..b2b1c5a 100644 |
| 80 |
--- a/dev-java/icedtea/icedtea-3.3.0_pre00.ebuild |
| 81 |
+++ b/dev-java/icedtea/icedtea-3.3.0_pre00.ebuild |
| 82 |
@@ -78,7 +78,7 @@ ALSA_COMMON_DEP=" |
| 83 |
CUPS_COMMON_DEP=" |
| 84 |
>=net-print/cups-1.2.12" |
| 85 |
X_COMMON_DEP=" |
| 86 |
- >=media-libs/giflib-4.1.6:= |
| 87 |
+ >=media-libs/giflib-4.1.6:0= |
| 88 |
>=media-libs/libpng-1.2:0= |
| 89 |
>=x11-libs/libX11-1.1.3 |
| 90 |
>=x11-libs/libXext-1.1.1 |
| 91 |
@@ -98,11 +98,11 @@ X_DEPEND=" |
| 92 |
# The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn |
| 93 |
# Kerberos will be added following PR1537 |
| 94 |
COMMON_DEP=" |
| 95 |
- >=dev-libs/glib-2.26:2 |
| 96 |
+ >=dev-libs/glib-2.26:2= |
| 97 |
>=dev-util/systemtap-1 |
| 98 |
- media-libs/fontconfig |
| 99 |
- >=media-libs/lcms-2.5 |
| 100 |
- >=sys-libs/zlib-1.2.3:= |
| 101 |
+ media-libs/fontconfig:1.0= |
| 102 |
+ >=media-libs/lcms-2.5:2= |
| 103 |
+ >=sys-libs/zlib-1.2.3 |
| 104 |
virtual/jpeg:0= |
| 105 |
!infinality? ( >=media-libs/freetype-2.5.3:2= ) |
| 106 |
infinality? ( <media-libs/freetype-2.6.4:2=[infinality] ) |
| 107 |
@@ -121,9 +121,9 @@ RDEPEND="${COMMON_DEP} |
| 108 |
cups? ( ${CUPS_COMMON_DEP} ) |
| 109 |
gtk? ( |
| 110 |
>=dev-libs/atk-1.30.0 |
| 111 |
- >=x11-libs/cairo-1.8.8:= |
| 112 |
+ >=x11-libs/cairo-1.8.8 |
| 113 |
x11-libs/gdk-pixbuf:2 |
| 114 |
- >=x11-libs/gtk+-2.8:2= |
| 115 |
+ >=x11-libs/gtk+-2.8:2 |
| 116 |
>=x11-libs/pango-1.24.5 |
| 117 |
) |
| 118 |
!headless-awt? ( ${X_COMMON_DEP} ) |
| 119 |
@@ -147,8 +147,8 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_ |
| 120 |
app-arch/zip |
| 121 |
app-misc/ca-certificates |
| 122 |
dev-lang/perl |
| 123 |
- !libressl? ( dev-libs/openssl ) |
| 124 |
- libressl? ( dev-libs/libressl ) |
| 125 |
+ !libressl? ( dev-libs/openssl:0 ) |
| 126 |
+ libressl? ( dev-libs/libressl:0 ) |
| 127 |
sys-apps/attr |
| 128 |
sys-apps/lsb-release |
| 129 |
x11-libs/libXt |
Archives