1 |
commit: 39444ca0b4b6e81586dc4cd9db3cc2328da053f3 |
2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
3 |
AuthorDate: Thu Apr 26 19:41:25 2018 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 27 01:04:41 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39444ca0 |
7 |
|
8 |
dev-java/*: Update dependencies (x11-proto/* -> x11-base/xorg-proto). |
9 |
|
10 |
dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild | 4 ++-- |
11 |
dev-java/icedtea/icedtea-3.7.0.ebuild | 7 ++----- |
12 |
dev-java/swt/swt-3.7.2-r2.ebuild | 2 +- |
13 |
dev-java/swt/swt-3.8.2-r2.ebuild | 2 +- |
14 |
dev-java/swt/swt-4.2-r3.ebuild | 4 ++-- |
15 |
5 files changed, 8 insertions(+), 11 deletions(-) |
16 |
|
17 |
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild |
18 |
index 465018f8f62..9229206c5f7 100644 |
19 |
--- a/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild |
20 |
+++ b/dev-java/gnu-classpath/gnu-classpath-0.98-r6.ebuild |
21 |
@@ -1,4 +1,4 @@ |
22 |
-# Copyright 1999-2017 Gentoo Foundation |
23 |
+# Copyright 1999-2018 Gentoo Foundation |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
|
26 |
EAPI=5 |
27 |
@@ -39,9 +39,9 @@ RDEPEND="alsa? ( media-libs/alsa-lib ) |
28 |
|
29 |
DEPEND="app-arch/zip |
30 |
gtk? ( |
31 |
+ x11-base/xorg-proto |
32 |
x11-libs/libXrender |
33 |
>=x11-libs/libXtst-1.1.0 |
34 |
- x11-proto/xproto |
35 |
) |
36 |
>=virtual/jdk-1.5 |
37 |
${RDEPEND}" |
38 |
|
39 |
diff --git a/dev-java/icedtea/icedtea-3.7.0.ebuild b/dev-java/icedtea/icedtea-3.7.0.ebuild |
40 |
index be3cb438b0b..8605d13cd9d 100644 |
41 |
--- a/dev-java/icedtea/icedtea-3.7.0.ebuild |
42 |
+++ b/dev-java/icedtea/icedtea-3.7.0.ebuild |
43 |
@@ -86,13 +86,10 @@ X_COMMON_DEP=" |
44 |
>=x11-libs/libXtst-1.0.3 |
45 |
x11-libs/libXcomposite" |
46 |
X_DEPEND=" |
47 |
+ x11-base/xorg-proto |
48 |
>=x11-libs/libXau-1.0.3 |
49 |
>=x11-libs/libXdmcp-1.0.2 |
50 |
- >=x11-libs/libXinerama-1.0.2 |
51 |
- x11-proto/inputproto |
52 |
- >=x11-proto/xextproto-7.1.1 |
53 |
- x11-proto/xineramaproto |
54 |
- x11-proto/xproto" |
55 |
+ >=x11-libs/libXinerama-1.0.2" |
56 |
|
57 |
# The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn |
58 |
COMMON_DEP=" |
59 |
|
60 |
diff --git a/dev-java/swt/swt-3.7.2-r2.ebuild b/dev-java/swt/swt-3.7.2-r2.ebuild |
61 |
index 63f3c11299f..aa38b1de065 100644 |
62 |
--- a/dev-java/swt/swt-3.7.2-r2.ebuild |
63 |
+++ b/dev-java/swt/swt-3.7.2-r2.ebuild |
64 |
@@ -40,11 +40,11 @@ COMMON=">=dev-libs/glib-2.6 |
65 |
|
66 |
DEPEND=">=virtual/jdk-1.4 |
67 |
app-arch/unzip |
68 |
+ x11-base/xorg-proto |
69 |
x11-libs/libX11 |
70 |
x11-libs/libXrender |
71 |
x11-libs/libXt |
72 |
>=x11-libs/libXtst-1.1.0 |
73 |
- x11-proto/inputproto |
74 |
virtual/pkgconfig |
75 |
${COMMON}" |
76 |
|
77 |
|
78 |
diff --git a/dev-java/swt/swt-3.8.2-r2.ebuild b/dev-java/swt/swt-3.8.2-r2.ebuild |
79 |
index 72289d11171..64b28cc018f 100644 |
80 |
--- a/dev-java/swt/swt-3.8.2-r2.ebuild |
81 |
+++ b/dev-java/swt/swt-3.8.2-r2.ebuild |
82 |
@@ -40,11 +40,11 @@ COMMON=">=dev-libs/glib-2.6 |
83 |
|
84 |
DEPEND=">=virtual/jdk-1.4 |
85 |
app-arch/unzip |
86 |
+ x11-base/xorg-proto |
87 |
x11-libs/libX11 |
88 |
x11-libs/libXrender |
89 |
x11-libs/libXt |
90 |
>=x11-libs/libXtst-1.1.0 |
91 |
- x11-proto/inputproto |
92 |
virtual/pkgconfig |
93 |
${COMMON}" |
94 |
|
95 |
|
96 |
diff --git a/dev-java/swt/swt-4.2-r3.ebuild b/dev-java/swt/swt-4.2-r3.ebuild |
97 |
index 40625a0c8c8..fdfce91451a 100644 |
98 |
--- a/dev-java/swt/swt-4.2-r3.ebuild |
99 |
+++ b/dev-java/swt/swt-4.2-r3.ebuild |
100 |
@@ -42,11 +42,11 @@ DEPEND="${COMMON_DEP} |
101 |
>=virtual/jdk-1.4 |
102 |
app-arch/unzip |
103 |
virtual/pkgconfig |
104 |
+ x11-base/xorg-proto |
105 |
x11-libs/libX11 |
106 |
x11-libs/libXrender |
107 |
x11-libs/libXt |
108 |
- >=x11-libs/libXtst-1.1.0 |
109 |
- x11-proto/inputproto" |
110 |
+ >=x11-libs/libXtst-1.1.0" |
111 |
RDEPEND="${COMMON_DEP} |
112 |
>=virtual/jre-1.4" |