commit: 04bfef88f9e972f61de0ed0d2af27ff0ce0823bd
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Mon May 21 20:27:48 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue May 22 01:05:14 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04bfef88
x11-terms/*: Update dependencies (x11-proto/* -> x11-base/xorg-proto).
x11-terms/aterm/aterm-1.0.1-r3.ebuild | 2 +-
x11-terms/eterm/eterm-0.9.5.ebuild | 4 +---
x11-terms/mrxvt/mrxvt-0.5.4.ebuild | 2 +-
x11-terms/root-tail/root-tail-1.2-r3.ebuild | 6 +++---
x11-terms/rxvt-unicode/rxvt-unicode-9.21.ebuild | 4 ++--
x11-terms/rxvt-unicode/rxvt-unicode-9.22-r1.ebuild | 2 +-
x11-terms/rxvt-unicode/rxvt-unicode-9.22.ebuild | 4 ++--
x11-terms/rxvt-unicode/rxvt-unicode-9999.ebuild | 4 ++--
x11-terms/st/st-0.7.ebuild | 5 ++---
x11-terms/st/st-0.8.1.ebuild | 2 +-
x11-terms/st/st-0.8.ebuild | 2 +-
x11-terms/st/st-9999.ebuild | 2 +-
x11-terms/xterm/xterm-327.ebuild | 5 ++---
x11-terms/xterm/xterm-330.ebuild | 5 ++---
x11-terms/xterm/xterm-331.ebuild | 3 +--
x11-terms/xvt/xvt-2.1-r3.ebuild | 4 ++--
x11-terms/yeahconsole/yeahconsole-0.3.4-r1.ebuild | 2 +-
17 files changed, 26 insertions(+), 32 deletions(-)
diff --git a/x11-terms/aterm/aterm-1.0.1-r3.ebuild
b/x11-terms/aterm/aterm-1.0.1-r3.ebuild
index a05f6d3b8a0..43a38027bfe 100644
--- a/x11-terms/aterm/aterm-1.0.1-r3.ebuild
+++ b/x11-terms/aterm/aterm-1.0.1-r3.ebuild
@@ -23,8 +23,8 @@ RDEPEND="
x11-libs/libICE
"
DEPEND="${RDEPEND}
+ x11-base/xorg-proto
x11-libs/libXt
- x11-proto/xproto
"
src_prepare() {
diff --git a/x11-terms/eterm/eterm-0.9.5.ebuild
b/x11-terms/eterm/eterm-0.9.5.ebuild
index ecc9dfddd89..c0851088174 100644
--- a/x11-terms/eterm/eterm-0.9.5.ebuild
+++ b/x11-terms/eterm/eterm-0.9.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="2"
@@ -31,8 +31,6 @@ RDEPEND="x11-libs/libX11
x11-libs/libXt
x11-libs/libICE
x11-libs/libSM
- x11-proto/xextproto
- x11-proto/xproto
>=x11-libs/libast-0.6.1
media-libs/imlib2[X]
media-fonts/font-misc-misc
diff --git a/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
b/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
index 9bc62ba04fb..3355069ef63 100644
--- a/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
+++ b/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
@@ -28,7 +28,7 @@ RDEPEND="png? ( media-libs/libpng )
x11-libs/libXrender"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
src_prepare() {
epatch "${FILESDIR}"/${P}-001-fix-segfault-when-wd-empty.patch \
diff --git a/x11-terms/root-tail/root-tail-1.2-r3.ebuild
b/x11-terms/root-tail/root-tail-1.2-r3.ebuild
index db2c2f19a68..1a3e1a6ce02 100644
--- a/x11-terms/root-tail/root-tail-1.2-r3.ebuild
+++ b/x11-terms/root-tail/root-tail-1.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="2"
@@ -18,9 +18,9 @@ RDEPEND="x11-libs/libXext
x11-libs/libX11"
DEPEND="x11-misc/imake
app-text/rman
- x11-misc/gccmakedep
+ x11-base/xorg-proto
x11-libs/libX11
- x11-proto/xproto"
+ x11-misc/gccmakedep"
src_prepare() {
use kde && epatch "${FILESDIR}"/${P}-kde.patch
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.21.ebuild
b/x11-terms/rxvt-unicode/rxvt-unicode-9.21.ebuild
index 089a6cb89b4..91c9ca6b1e9 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.21.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 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="
DEPEND="
${RDEPEND}
virtual/pkgconfig
- x11-proto/xproto
+ x11-base/xorg-proto
"
RESTRICT="test"
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r1.ebuild
b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r1.ebuild
index 45473bda488..7757a64a964 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r1.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r1.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
DEPEND="
${RDEPEND}
virtual/pkgconfig
- x11-proto/xproto
+ x11-base/xorg-proto
"
PATCHES=(
"${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22.ebuild
b/x11-terms/rxvt-unicode/rxvt-unicode-9.22.ebuild
index d690b6b09cd..e60a08adddf 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.22.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 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="
DEPEND="
${RDEPEND}
virtual/pkgconfig
- x11-proto/xproto
+ x11-base/xorg-proto
"
RESTRICT="test"
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9999.ebuild
b/x11-terms/rxvt-unicode/rxvt-unicode-9999.ebuild
index 43645a40943..9a25833630e 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9999.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9999.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
@@ -33,7 +33,7 @@ RDEPEND="
DEPEND="
${RDEPEND}
virtual/pkgconfig
- x11-proto/xproto
+ x11-base/xorg-proto
"
S=${WORKDIR}/${PN}
diff --git a/x11-terms/st/st-0.7.ebuild b/x11-terms/st/st-0.7.ebuild
index 36d75e01407..22efcadcec5 100644
--- a/x11-terms/st/st-0.7.ebuild
+++ b/x11-terms/st/st-0.7.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
@@ -23,8 +23,7 @@ RDEPEND="
DEPEND="
${RDEPEND}
virtual/pkgconfig
- x11-proto/xextproto
- x11-proto/xproto
+ x11-base/xorg-proto
"
src_prepare() {
diff --git a/x11-terms/st/st-0.8.1.ebuild b/x11-terms/st/st-0.8.1.ebuild
index 185c4aa2643..46e232587d9 100644
--- a/x11-terms/st/st-0.8.1.ebuild
+++ b/x11-terms/st/st-0.8.1.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
DEPEND="
${RDEPEND}
virtual/pkgconfig
- x11-proto/xproto
+ x11-base/xorg-proto
"
src_prepare() {
diff --git a/x11-terms/st/st-0.8.ebuild b/x11-terms/st/st-0.8.ebuild
index 185c4aa2643..46e232587d9 100644
--- a/x11-terms/st/st-0.8.ebuild
+++ b/x11-terms/st/st-0.8.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
DEPEND="
${RDEPEND}
virtual/pkgconfig
- x11-proto/xproto
+ x11-base/xorg-proto
"
src_prepare() {
diff --git a/x11-terms/st/st-9999.ebuild b/x11-terms/st/st-9999.ebuild
index 6968b6d8c46..cd83a4f2325 100644
--- a/x11-terms/st/st-9999.ebuild
+++ b/x11-terms/st/st-9999.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
DEPEND="
${RDEPEND}
virtual/pkgconfig
- x11-proto/xproto
+ x11-base/xorg-proto
"
src_prepare() {
diff --git a/x11-terms/xterm/xterm-327.ebuild b/x11-terms/xterm/xterm-327.ebuild
index fa8a8dd0a68..d2834b8d077 100644
--- a/x11-terms/xterm/xterm-327.ebuild
+++ b/x11-terms/xterm/xterm-327.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
@@ -33,8 +33,7 @@ RDEPEND="${COMMON_DEPEND}
x11-apps/rgb"
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
- x11-proto/kbproto
- x11-proto/xproto"
+ x11-base/xorg-proto"
DOCS=( README{,.i18n} ctlseqs.txt )
diff --git a/x11-terms/xterm/xterm-330.ebuild b/x11-terms/xterm/xterm-330.ebuild
index 1dfbec154c2..9682b587b22 100644
--- a/x11-terms/xterm/xterm-330.ebuild
+++ b/x11-terms/xterm/xterm-330.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
@@ -33,8 +33,7 @@ RDEPEND="${COMMON_DEPEND}
x11-apps/rgb"
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
- x11-proto/kbproto
- x11-proto/xproto"
+ x11-base/xorg-proto"
DOCS=( README{,.i18n} ctlseqs.txt )
diff --git a/x11-terms/xterm/xterm-331.ebuild b/x11-terms/xterm/xterm-331.ebuild
index c9683e8dda7..9682b587b22 100644
--- a/x11-terms/xterm/xterm-331.ebuild
+++ b/x11-terms/xterm/xterm-331.ebuild
@@ -33,8 +33,7 @@ RDEPEND="${COMMON_DEPEND}
x11-apps/rgb"
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
- x11-proto/kbproto
- x11-proto/xproto"
+ x11-base/xorg-proto"
DOCS=( README{,.i18n} ctlseqs.txt )
diff --git a/x11-terms/xvt/xvt-2.1-r3.ebuild b/x11-terms/xvt/xvt-2.1-r3.ebuild
index 2720588b12f..51aaecb8326 100644
--- a/x11-terms/xvt/xvt-2.1-r3.ebuild
+++ b/x11-terms/xvt/xvt-2.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="2"
@@ -17,7 +17,7 @@ IUSE=""
RDEPEND="x11-libs/libX11"
DEPEND="${RDEPEND}
- x11-proto/xproto"
+ x11-base/xorg-proto"
S=${WORKDIR}/${PN}-1.0
diff --git a/x11-terms/yeahconsole/yeahconsole-0.3.4-r1.ebuild
b/x11-terms/yeahconsole/yeahconsole-0.3.4-r1.ebuild
index 5cbb5121559..53ef1c2a9f9 100644
--- a/x11-terms/yeahconsole/yeahconsole-0.3.4-r1.ebuild
+++ b/x11-terms/yeahconsole/yeahconsole-0.3.4-r1.ebuild
@@ -16,7 +16,7 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
- x11-proto/xproto
+ x11-base/xorg-proto
"
PATCHES=(
"${FILESDIR}"/${P}-make.patch
