gnome-extra/*: Update dependencies (x11-proto/* -> x11-base/xorg-proto).

Asgavar · May 12, 2018 · 9b1ee33 · 9b1ee33
1 parent 3711850
commit 9b1ee33
Show file tree

Hide file tree

Showing 37 changed files with 68 additions and 115 deletions.
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.0.1.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.0.1.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
@@ -60,9 +60,7 @@ RDEPEND="${COMMON_DEPEND}
 
 DEPEND="${COMMON_DEPEND}
 	app-text/iso-codes
-	x11-proto/xproto
-	x11-proto/xf86miscproto
-	x11-proto/kbproto
+	x11-base/xorg-proto
 
 	dev-libs/libxslt
 	>=dev-util/intltool-0.40.1

diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.0.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.0.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=6
@@ -60,9 +60,7 @@ RDEPEND="${COMMON_DEPEND}
 
 DEPEND="${COMMON_DEPEND}
 	app-text/iso-codes
-	x11-proto/xproto
-	x11-proto/xf86miscproto
-	x11-proto/kbproto
+	x11-base/xorg-proto
 
 	dev-libs/libxslt
 	>=dev-util/intltool-0.40.1

diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.1.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.1.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
@@ -60,9 +60,7 @@ RDEPEND="${COMMON_DEPEND}
 
 DEPEND="${COMMON_DEPEND}
 	app-text/iso-codes
-	x11-proto/xproto
-	x11-proto/xf86miscproto
-	x11-proto/kbproto
+	x11-base/xorg-proto
 
 	dev-libs/libxslt
 	>=dev-util/intltool-0.40.1

diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.6.5.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.6.5.ebuild
@@ -60,9 +60,7 @@ RDEPEND="${COMMON_DEPEND}
 
 DEPEND="${COMMON_DEPEND}
 	app-text/iso-codes
-	x11-proto/xproto
-	x11-proto/xf86miscproto
-	x11-proto/kbproto
+	x11-base/xorg-proto
 
 	dev-libs/libxslt
 	>=dev-util/intltool-0.40.1

diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.1.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.1.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
@@ -36,8 +36,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-doc-am-1.4
 	>=dev-util/intltool-0.40.6
 	gnome-base/gnome-common
-	x11-proto/randrproto
-	x11-proto/xproto
+	x11-base/xorg-proto
 	virtual/pkgconfig
 "
 

diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.0.2.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.0.2.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
@@ -37,8 +37,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-doc-am-1.4
 	>=dev-util/intltool-0.40.6
 	gnome-base/gnome-common
-	x11-proto/randrproto
-	x11-proto/xproto
+	x11-base/xorg-proto
 	virtual/pkgconfig
 "
 

diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.0.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.0.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
@@ -37,8 +37,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-doc-am-1.4
 	>=dev-util/intltool-0.40.6
 	gnome-base/gnome-common
-	x11-proto/randrproto
-	x11-proto/xproto
+	x11-base/xorg-proto
 	virtual/pkgconfig
 "
 

diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.4.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.4.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
@@ -37,8 +37,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-doc-am-1.4
 	>=dev-util/intltool-0.40.6
 	gnome-base/gnome-common
-	x11-proto/randrproto
-	x11-proto/xproto
+	x11-base/xorg-proto
 	virtual/pkgconfig
 "
 

diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.4.2.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.4.2.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
@@ -38,8 +38,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-doc-am-1.4
 	>=dev-util/intltool-0.40.6
 	gnome-base/gnome-common
-	x11-proto/randrproto
-	x11-proto/xproto
+	x11-base/xorg-proto
 	virtual/pkgconfig
 "
 

diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild
@@ -38,8 +38,7 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-doc-am-1.4
 	>=dev-util/intltool-0.40.6
 	gnome-base/gnome-common
-	x11-proto/randrproto
-	x11-proto/xproto
+	x11-base/xorg-proto
 	virtual/pkgconfig
 "
 

diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.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"
@@ -54,10 +54,7 @@ DEPEND="${COMMON_DEPEND}
 	gnome-base/gnome-common
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/randrproto
-	x11-proto/scrnsaverproto
-	x11-proto/xf86miscproto
+	x11-base/xorg-proto
 	doc? (
 		app-text/xmlto
 		app-text/docbook-xml-dtd:4.1.2

diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.0.1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.0.1.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
@@ -52,10 +52,7 @@ DEPEND="${COMMON_DEPEND}
 	gnome-base/gnome-common
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/randrproto
-	x11-proto/scrnsaverproto
-	x11-proto/xf86miscproto
+	x11-base/xorg-proto
 	doc? (
 		app-text/xmlto
 		app-text/docbook-xml-dtd:4.1.2

diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-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
@@ -54,10 +54,7 @@ DEPEND="${COMMON_DEPEND}
 	gnome-base/gnome-common
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/randrproto
-	x11-proto/scrnsaverproto
-	x11-proto/xf86miscproto
+	x11-base/xorg-proto
 	doc? (
 		app-text/xmlto
 		app-text/docbook-xml-dtd:4.1.2

diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r2.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r2.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
@@ -54,10 +54,7 @@ DEPEND="${COMMON_DEPEND}
 	gnome-base/gnome-common
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/randrproto
-	x11-proto/scrnsaverproto
-	x11-proto/xf86miscproto
+	x11-base/xorg-proto
 	doc? (
 		app-text/xmlto
 		app-text/docbook-xml-dtd:4.1.2

diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2-r1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.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=6
@@ -53,10 +53,7 @@ DEPEND="${COMMON_DEPEND}
 	gnome-base/gnome-common
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/randrproto
-	x11-proto/scrnsaverproto
-	x11-proto/xf86miscproto
+	x11-base/xorg-proto
 	doc? (
 		app-text/xmlto
 		app-text/docbook-xml-dtd:4.1.2

diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2.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
@@ -52,10 +52,7 @@ DEPEND="${COMMON_DEPEND}
 	gnome-base/gnome-common
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/randrproto
-	x11-proto/scrnsaverproto
-	x11-proto/xf86miscproto
+	x11-base/xorg-proto
 	doc? (
 		app-text/xmlto
 		app-text/docbook-xml-dtd:4.1.2

diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.6.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.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
@@ -54,10 +54,7 @@ DEPEND="${COMMON_DEPEND}
 	gnome-base/gnome-common
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/randrproto
-	x11-proto/scrnsaverproto
-	x11-proto/xf86miscproto
+	x11-base/xorg-proto
 	doc? (
 		app-text/xmlto
 		app-text/docbook-xml-dtd:4.1.2

diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.4.1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.4.1.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
@@ -57,10 +57,7 @@ DEPEND="${COMMON_DEPEND}
 	gnome-base/gnome-common
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/randrproto
-	x11-proto/scrnsaverproto
-	x11-proto/xf86miscproto
+	x11-base/xorg-proto
 	doc? (
 		app-text/xmlto
 		app-text/docbook-xml-dtd:4.1.2

diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.4.2.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.4.2.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
@@ -57,10 +57,7 @@ DEPEND="${COMMON_DEPEND}
 	gnome-base/gnome-common
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/randrproto
-	x11-proto/scrnsaverproto
-	x11-proto/xf86miscproto
+	x11-base/xorg-proto
 	doc? (
 		app-text/xmlto
 		app-text/docbook-xml-dtd:4.1.2

diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild
@@ -57,10 +57,7 @@ DEPEND="${COMMON_DEPEND}
 	gnome-base/gnome-common
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/randrproto
-	x11-proto/scrnsaverproto
-	x11-proto/xf86miscproto
+	x11-base/xorg-proto
 	doc? (
 		app-text/xmlto
 		app-text/docbook-xml-dtd:4.1.2

diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1.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
@@ -56,10 +56,7 @@ DEPEND="${COMMON_DEPEND}
 	gnome-base/gnome-common
 	sys-devel/gettext
 	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/randrproto
-	x11-proto/scrnsaverproto
-	x11-proto/xf86miscproto
+	x11-base/xorg-proto
 	doc? (
 		app-text/xmlto
 		app-text/docbook-xml-dtd:4.1.2

diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.3.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.3.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"
@@ -52,7 +52,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-libs/libxml2:2
 	>=dev-util/intltool-0.37.1
-	x11-proto/kbproto
+	x11-base/xorg-proto
 	virtual/pkgconfig
 "
 

diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.4.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.4.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=6
@@ -51,7 +51,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-libs/libxml2:2
 	>=dev-util/intltool-0.37.1
-	x11-proto/kbproto
+	x11-base/xorg-proto
 	virtual/pkgconfig
 "
 

diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.0.1.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.0.1.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=6
@@ -53,7 +53,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-libs/libxml2:2
 	>=dev-util/intltool-0.37.1
-	x11-proto/kbproto
+	x11-base/xorg-proto
 	virtual/pkgconfig
 "