1 |
commit: c4b322800759b39f8f0eeee98625217460e5ef14 |
2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
3 |
AuthorDate: Thu Apr 26 19:27:59 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=c4b32280 |
7 |
|
8 |
app-office/*: Update dependencies (x11-proto/* -> x11-base/xorg-proto). |
9 |
|
10 |
app-office/libreoffice/libreoffice-5.4.5.1.ebuild | 5 +---- |
11 |
app-office/libreoffice/libreoffice-6.0.3.2.ebuild | 5 +---- |
12 |
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 5 +---- |
13 |
app-office/libreoffice/libreoffice-9999.ebuild | 5 +---- |
14 |
app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild | 4 ++-- |
15 |
app-office/texmacs/texmacs-1.99.2-r1.ebuild | 4 ++-- |
16 |
app-office/texmacs/texmacs-1.99.5.ebuild | 4 ++-- |
17 |
app-office/texmacs/texmacs-1.99.6-r1.ebuild | 4 ++-- |
18 |
app-office/texmacs/texmacs-1.99.6-r2.ebuild | 2 +- |
19 |
app-office/texmacs/texmacs-1.99.6.ebuild | 4 ++-- |
20 |
10 files changed, 15 insertions(+), 27 deletions(-) |
21 |
|
22 |
diff --git a/app-office/libreoffice/libreoffice-5.4.5.1.ebuild b/app-office/libreoffice/libreoffice-5.4.5.1.ebuild |
23 |
index 2b32a98e6ca..a8b1cae3566 100644 |
24 |
--- a/app-office/libreoffice/libreoffice-5.4.5.1.ebuild |
25 |
+++ b/app-office/libreoffice/libreoffice-5.4.5.1.ebuild |
26 |
@@ -212,12 +212,9 @@ DEPEND="${COMMON_DEPEND} |
27 |
sys-devel/ucpp |
28 |
sys-libs/zlib |
29 |
virtual/pkgconfig |
30 |
+ x11-base/xorg-proto |
31 |
x11-libs/libXt |
32 |
x11-libs/libXtst |
33 |
- x11-proto/randrproto |
34 |
- x11-proto/xextproto |
35 |
- x11-proto/xineramaproto |
36 |
- x11-proto/xproto |
37 |
java? ( |
38 |
dev-java/ant-core |
39 |
>=virtual/jdk-1.6 |
40 |
|
41 |
diff --git a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild |
42 |
index 8ee18655d75..fd1f349a9f7 100644 |
43 |
--- a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild |
44 |
+++ b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild |
45 |
@@ -217,12 +217,9 @@ DEPEND="${COMMON_DEPEND} |
46 |
sys-devel/ucpp |
47 |
sys-libs/zlib |
48 |
virtual/pkgconfig |
49 |
+ x11-base/xorg-proto |
50 |
x11-libs/libXt |
51 |
x11-libs/libXtst |
52 |
- x11-proto/randrproto |
53 |
- x11-proto/xextproto |
54 |
- x11-proto/xineramaproto |
55 |
- x11-proto/xproto |
56 |
java? ( |
57 |
dev-java/ant-core |
58 |
>=virtual/jdk-1.6 |
59 |
|
60 |
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild |
61 |
index 9ac42f54a68..edf22ead40d 100644 |
62 |
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild |
63 |
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild |
64 |
@@ -217,12 +217,9 @@ DEPEND="${COMMON_DEPEND} |
65 |
sys-devel/ucpp |
66 |
sys-libs/zlib |
67 |
virtual/pkgconfig |
68 |
+ x11-base/xorg-proto |
69 |
x11-libs/libXt |
70 |
x11-libs/libXtst |
71 |
- x11-proto/randrproto |
72 |
- x11-proto/xextproto |
73 |
- x11-proto/xineramaproto |
74 |
- x11-proto/xproto |
75 |
java? ( |
76 |
dev-java/ant-core |
77 |
>=virtual/jdk-1.6 |
78 |
|
79 |
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild |
80 |
index 491edb6043a..3799a7815c0 100644 |
81 |
--- a/app-office/libreoffice/libreoffice-9999.ebuild |
82 |
+++ b/app-office/libreoffice/libreoffice-9999.ebuild |
83 |
@@ -216,12 +216,9 @@ DEPEND="${COMMON_DEPEND} |
84 |
sys-devel/ucpp |
85 |
sys-libs/zlib |
86 |
virtual/pkgconfig |
87 |
+ x11-base/xorg-proto |
88 |
x11-libs/libXt |
89 |
x11-libs/libXtst |
90 |
- x11-proto/randrproto |
91 |
- x11-proto/xextproto |
92 |
- x11-proto/xineramaproto |
93 |
- x11-proto/xproto |
94 |
java? ( |
95 |
dev-java/ant-core |
96 |
>=virtual/jdk-1.6 |
97 |
|
98 |
diff --git a/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild b/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild |
99 |
index e249940edd0..cb200d9236b 100644 |
100 |
--- a/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild |
101 |
+++ b/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild |
102 |
@@ -1,4 +1,4 @@ |
103 |
-# Copyright 1999-2016 Gentoo Foundation |
104 |
+# Copyright 1999-2018 Gentoo Foundation |
105 |
# Distributed under the terms of the GNU General Public License v2 |
106 |
|
107 |
EAPI=5 |
108 |
@@ -40,7 +40,7 @@ COMMON_DEPEND="x11-libs/libICE |
109 |
mng? ( media-libs/libmng )" |
110 |
DEPEND="${COMMON_DEPEND} |
111 |
sys-devel/autoconf |
112 |
- x11-proto/xextproto |
113 |
+ x11-base/xorg-proto |
114 |
x11-libs/libxkbfile |
115 |
app-text/rman |
116 |
x11-misc/imake" |
117 |
|
118 |
diff --git a/app-office/texmacs/texmacs-1.99.2-r1.ebuild b/app-office/texmacs/texmacs-1.99.2-r1.ebuild |
119 |
index f408b0358af..b699dc377ee 100644 |
120 |
--- a/app-office/texmacs/texmacs-1.99.2-r1.ebuild |
121 |
+++ b/app-office/texmacs/texmacs-1.99.2-r1.ebuild |
122 |
@@ -1,4 +1,4 @@ |
123 |
-# Copyright 1999-2017 Gentoo Foundation |
124 |
+# Copyright 1999-2018 Gentoo Foundation |
125 |
# Distributed under the terms of the GNU General Public License v2 |
126 |
|
127 |
EAPI=5 |
128 |
@@ -31,7 +31,7 @@ RDEPEND=" |
129 |
svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) ) |
130 |
" |
131 |
DEPEND="${RDEPEND} |
132 |
- x11-proto/xproto" |
133 |
+ x11-base/xorg-proto" |
134 |
|
135 |
S="${WORKDIR}/${MY_P}" |
136 |
|
137 |
|
138 |
diff --git a/app-office/texmacs/texmacs-1.99.5.ebuild b/app-office/texmacs/texmacs-1.99.5.ebuild |
139 |
index 38d576fe468..879508352d2 100644 |
140 |
--- a/app-office/texmacs/texmacs-1.99.5.ebuild |
141 |
+++ b/app-office/texmacs/texmacs-1.99.5.ebuild |
142 |
@@ -1,4 +1,4 @@ |
143 |
-# Copyright 1999-2017 Gentoo Foundation |
144 |
+# Copyright 1999-2018 Gentoo Foundation |
145 |
# Distributed under the terms of the GNU General Public License v2 |
146 |
|
147 |
EAPI=6 |
148 |
@@ -31,7 +31,7 @@ RDEPEND=" |
149 |
svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) ) |
150 |
" |
151 |
DEPEND="${RDEPEND} |
152 |
- x11-proto/xproto" |
153 |
+ x11-base/xorg-proto" |
154 |
|
155 |
S="${WORKDIR}/${MY_P}" |
156 |
|
157 |
|
158 |
diff --git a/app-office/texmacs/texmacs-1.99.6-r1.ebuild b/app-office/texmacs/texmacs-1.99.6-r1.ebuild |
159 |
index f30d4670bf1..22770bc0ecc 100644 |
160 |
--- a/app-office/texmacs/texmacs-1.99.6-r1.ebuild |
161 |
+++ b/app-office/texmacs/texmacs-1.99.6-r1.ebuild |
162 |
@@ -1,4 +1,4 @@ |
163 |
-# Copyright 1999-2017 Gentoo Foundation |
164 |
+# Copyright 1999-2018 Gentoo Foundation |
165 |
# Distributed under the terms of the GNU General Public License v2 |
166 |
|
167 |
EAPI=6 |
168 |
@@ -32,7 +32,7 @@ RDEPEND=" |
169 |
svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) ) |
170 |
" |
171 |
DEPEND="${RDEPEND} |
172 |
- x11-proto/xproto" |
173 |
+ x11-base/xorg-proto" |
174 |
|
175 |
S="${WORKDIR}/${MY_P}" |
176 |
|
177 |
|
178 |
diff --git a/app-office/texmacs/texmacs-1.99.6-r2.ebuild b/app-office/texmacs/texmacs-1.99.6-r2.ebuild |
179 |
index f7586e26e7c..d033045a79f 100644 |
180 |
--- a/app-office/texmacs/texmacs-1.99.6-r2.ebuild |
181 |
+++ b/app-office/texmacs/texmacs-1.99.6-r2.ebuild |
182 |
@@ -34,7 +34,7 @@ RDEPEND=" |
183 |
svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) ) |
184 |
" |
185 |
DEPEND="${RDEPEND} |
186 |
- x11-proto/xproto" |
187 |
+ x11-base/xorg-proto" |
188 |
|
189 |
S="${WORKDIR}/${MY_P}" |
190 |
|
191 |
|
192 |
diff --git a/app-office/texmacs/texmacs-1.99.6.ebuild b/app-office/texmacs/texmacs-1.99.6.ebuild |
193 |
index bd65c285bdb..c4e5c3f4e6f 100644 |
194 |
--- a/app-office/texmacs/texmacs-1.99.6.ebuild |
195 |
+++ b/app-office/texmacs/texmacs-1.99.6.ebuild |
196 |
@@ -1,4 +1,4 @@ |
197 |
-# Copyright 1999-2017 Gentoo Foundation |
198 |
+# Copyright 1999-2018 Gentoo Foundation |
199 |
# Distributed under the terms of the GNU General Public License v2 |
200 |
|
201 |
EAPI=6 |
202 |
@@ -31,7 +31,7 @@ RDEPEND=" |
203 |
svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) ) |
204 |
" |
205 |
DEPEND="${RDEPEND} |
206 |
- x11-proto/xproto" |
207 |
+ x11-base/xorg-proto" |
208 |
|
209 |
S="${WORKDIR}/${MY_P}" |