[gentoo-commits] repo/gentoo:master commit in: app-misc/oneko/, app-misc/sonypid/, app-misc/joymouse/, app-misc/joy2key/, ...

[Matt Turner]

commit:     0691ef073aa3f4181133cc862317976966b11519
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Mon Apr 30 19:16:48 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Apr 30 20:50:10 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0691ef07

app-misc/*: Update dependencies (x11-proto/* -> x11-base/xorg-proto).

 app-misc/g15mpd/g15mpd-1.0.0-r1.ebuild    | 5 ++---
 app-misc/joy2key/joy2key-1.6.3-r1.ebuild  | 4 ++--
 app-misc/joymouse/joymouse-0.5.ebuild     | 6 +++---
 app-misc/oneko/oneko-1.2-r2.ebuild        | 6 +++---
 app-misc/sonypid/sonypid-1.9.ebuild       | 4 ++--
 app-misc/workrave/workrave-1.10.20.ebuild | 4 +---
 6 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/app-misc/g15mpd/g15mpd-1.0.0-r1.ebuild b/app-misc/g15mpd/g15mpd-1.0.0-r1.ebuild
index 7cc98849f96..13ecc8900f6 100644
--- a/app-misc/g15mpd/g15mpd-1.0.0-r1.ebuild
+++ b/app-misc/g15mpd/g15mpd-1.0.0-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
@@ -23,8 +23,7 @@ RDEPEND="
 	x11-libs/libXtst
 "
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-libmpd.patch

diff --git a/app-misc/joy2key/joy2key-1.6.3-r1.ebuild b/app-misc/joy2key/joy2key-1.6.3-r1.ebuild
index 11f1f0f98d0..00ef6ed03b4 100644
--- a/app-misc/joy2key/joy2key-1.6.3-r1.ebuild
+++ b/app-misc/joy2key/joy2key-1.6.3-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
@@ -17,7 +17,7 @@ RDEPEND="
 	x11-apps/xwininfo )"
 DEPEND="
 	${RDEPEND}
-	X? ( x11-proto/xproto )"
+	X? ( x11-base/xorg-proto )"
 
 DOCS=( AUTHORS ChangeLog joy2keyrc.sample rawscancodes README TODO )
 

diff --git a/app-misc/joymouse/joymouse-0.5.ebuild b/app-misc/joymouse/joymouse-0.5.ebuild
index 7a1886e92a4..a34fee3f186 100644
--- a/app-misc/joymouse/joymouse-0.5.ebuild
+++ b/app-misc/joymouse/joymouse-0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,10 +11,10 @@ SLOT="0"
 KEYWORDS="amd64 ~mips ~ppc x86"
 IUSE=""
 
-DEPEND="x11-proto/xextproto
-	x11-proto/inputproto"
 RDEPEND="x11-libs/libX11
 	x11-libs/libXtst"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
 
 src_prepare() {
 	sed -i 's/printf(message/fputs(message, stdout/g' src/joymouse.c || die

diff --git a/app-misc/oneko/oneko-1.2-r2.ebuild b/app-misc/oneko/oneko-1.2-r2.ebuild
index f0847a294f5..9866e7ac296 100644
--- a/app-misc/oneko/oneko-1.2-r2.ebuild
+++ b/app-misc/oneko/oneko-1.2-r2.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
@@ -21,10 +21,10 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
+	app-text/rman
+	x11-base/xorg-proto
 	x11-misc/gccmakedep
 	x11-misc/imake
-	app-text/rman
-	x11-proto/xextproto
 "
 
 S=${WORKDIR}/oneko-${PV}.sakura.5

diff --git a/app-misc/sonypid/sonypid-1.9.ebuild b/app-misc/sonypid/sonypid-1.9.ebuild
index 26e9537b63e..cb8e02458bd 100644
--- a/app-misc/sonypid/sonypid-1.9.ebuild
+++ b/app-misc/sonypid/sonypid-1.9.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=5
@@ -16,7 +16,7 @@ IUSE=""
 
 RDEPEND="x11-libs/libXtst"
 DEPEND="${RDEPEND}
-	x11-proto/inputproto"
+	x11-base/xorg-proto"
 
 src_compile() {
 	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"

diff --git a/app-misc/workrave/workrave-1.10.20.ebuild b/app-misc/workrave/workrave-1.10.20.ebuild
index eb0accfb92a..84cbc53fece 100644
--- a/app-misc/workrave/workrave-1.10.20.ebuild
+++ b/app-misc/workrave/workrave-1.10.20.ebuild
@@ -55,9 +55,7 @@ DEPEND="${RDEPEND}
 	dev-python/cheetah
 	>=dev-util/intltool-0.40.0
 	sys-devel/autoconf-archive
-	x11-proto/xproto
-	x11-proto/inputproto
-	x11-proto/recordproto
+	x11-base/xorg-proto
 	virtual/pkgconfig
 	doc? (
 		app-text/docbook-sgml-utils