commit: c4b322800759b39f8f0eeee98625217460e5ef14
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Apr 26 19:27:59 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 27 01:04:41 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4b32280
app-office/*: Update dependencies (x11-proto/* -> x11-base/xorg-proto).
app-office/libreoffice/libreoffice-5.4.5.1.ebuild | 5 +----
app-office/libreoffice/libreoffice-6.0.3.2.ebuild | 5 +----
app-office/libreoffice/libreoffice-6.0.9999.ebuild | 5 +----
app-office/libreoffice/libreoffice-9999.ebuild | 5 +----
app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild | 4 ++--
app-office/texmacs/texmacs-1.99.2-r1.ebuild | 4 ++--
app-office/texmacs/texmacs-1.99.5.ebuild | 4 ++--
app-office/texmacs/texmacs-1.99.6-r1.ebuild | 4 ++--
app-office/texmacs/texmacs-1.99.6-r2.ebuild | 2 +-
app-office/texmacs/texmacs-1.99.6.ebuild | 4 ++--
10 files changed, 15 insertions(+), 27 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-5.4.5.1.ebuild
b/app-office/libreoffice/libreoffice-5.4.5.1.ebuild
index 2b32a98e6ca..a8b1cae3566 100644
--- a/app-office/libreoffice/libreoffice-5.4.5.1.ebuild
+++ b/app-office/libreoffice/libreoffice-5.4.5.1.ebuild
@@ -212,12 +212,9 @@ DEPEND="${COMMON_DEPEND}
sys-devel/ucpp
sys-libs/zlib
virtual/pkgconfig
+ x11-base/xorg-proto
x11-libs/libXt
x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
java? (
dev-java/ant-core
>=virtual/jdk-1.6
diff --git a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
index 8ee18655d75..fd1f349a9f7 100644
--- a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
@@ -217,12 +217,9 @@ DEPEND="${COMMON_DEPEND}
sys-devel/ucpp
sys-libs/zlib
virtual/pkgconfig
+ x11-base/xorg-proto
x11-libs/libXt
x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
java? (
dev-java/ant-core
>=virtual/jdk-1.6
diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index 9ac42f54a68..edf22ead40d 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -217,12 +217,9 @@ DEPEND="${COMMON_DEPEND}
sys-devel/ucpp
sys-libs/zlib
virtual/pkgconfig
+ x11-base/xorg-proto
x11-libs/libXt
x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
java? (
dev-java/ant-core
>=virtual/jdk-1.6
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild
b/app-office/libreoffice/libreoffice-9999.ebuild
index 491edb6043a..3799a7815c0 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -216,12 +216,9 @@ DEPEND="${COMMON_DEPEND}
sys-devel/ucpp
sys-libs/zlib
virtual/pkgconfig
+ x11-base/xorg-proto
x11-libs/libXt
x11-libs/libXtst
- x11-proto/randrproto
- x11-proto/xextproto
- x11-proto/xineramaproto
- x11-proto/xproto
java? (
dev-java/ant-core
>=virtual/jdk-1.6
diff --git a/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild
b/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild
index e249940edd0..cb200d9236b 100644
--- a/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild
+++ b/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -40,7 +40,7 @@ COMMON_DEPEND="x11-libs/libICE
mng? ( media-libs/libmng )"
DEPEND="${COMMON_DEPEND}
sys-devel/autoconf
- x11-proto/xextproto
+ x11-base/xorg-proto
x11-libs/libxkbfile
app-text/rman
x11-misc/imake"
diff --git a/app-office/texmacs/texmacs-1.99.2-r1.ebuild
b/app-office/texmacs/texmacs-1.99.2-r1.ebuild
index f408b0358af..b699dc377ee 100644
--- a/app-office/texmacs/texmacs-1.99.2-r1.ebuild
+++ b/app-office/texmacs/texmacs-1.99.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -31,7 +31,7 @@ RDEPEND="
svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
S="${WORKDIR}/${MY_P}"
diff --git a/app-office/texmacs/texmacs-1.99.5.ebuild
b/app-office/texmacs/texmacs-1.99.5.ebuild
index 38d576fe468..879508352d2 100644
--- a/app-office/texmacs/texmacs-1.99.5.ebuild
+++ b/app-office/texmacs/texmacs-1.99.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -31,7 +31,7 @@ RDEPEND="
svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
S="${WORKDIR}/${MY_P}"
diff --git a/app-office/texmacs/texmacs-1.99.6-r1.ebuild
b/app-office/texmacs/texmacs-1.99.6-r1.ebuild
index f30d4670bf1..22770bc0ecc 100644
--- a/app-office/texmacs/texmacs-1.99.6-r1.ebuild
+++ b/app-office/texmacs/texmacs-1.99.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -32,7 +32,7 @@ RDEPEND="
svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
S="${WORKDIR}/${MY_P}"
diff --git a/app-office/texmacs/texmacs-1.99.6-r2.ebuild
b/app-office/texmacs/texmacs-1.99.6-r2.ebuild
index f7586e26e7c..d033045a79f 100644
--- a/app-office/texmacs/texmacs-1.99.6-r2.ebuild
+++ b/app-office/texmacs/texmacs-1.99.6-r2.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
S="${WORKDIR}/${MY_P}"
diff --git a/app-office/texmacs/texmacs-1.99.6.ebuild
b/app-office/texmacs/texmacs-1.99.6.ebuild
index bd65c285bdb..c4e5c3f4e6f 100644
--- a/app-office/texmacs/texmacs-1.99.6.ebuild
+++ b/app-office/texmacs/texmacs-1.99.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -31,7 +31,7 @@ RDEPEND="
svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
S="${WORKDIR}/${MY_P}"
