commit: 5ab46199cec7e47594f65df9e61cdb58b33bae18
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 13 13:42:04 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 13 14:47:42 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=5ab46199
*/*: x11-proto/* -> x11-base/xorg-proto
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/konsolepart/konsolepart-4.14.3.ebuild | 3 +--
kde-apps/kopete/kopete-3.5.10-r2.ebuild | 6 ++---
kde-apps/kopete/kopete-3.5.10-r4.ebuild | 6 ++---
kde-apps/kopete/kopete-3.5.10-r5.ebuild | 6 ++---
kde-apps/kopete/kopete-3.5.10-r6.ebuild | 6 ++---
kde-apps/kopete/kopete-3.5.10.ebuild | 5 ++--
kde-apps/kopete/kopete-4.14.3-r1.ebuild | 2 +-
.../ktimetracker-4.14.11_pre20160611.ebuild | 2 +-
kde-base/karm/karm-3.5.10.ebuild | 2 +-
kde-base/kdesktop/kdesktop-3.5.10.ebuild | 2 +-
kde-base/ksplashml/ksplashml-3.5.10.ebuild | 2 +-
kde-misc/rsibreak/rsibreak-0.8.0-r1.ebuild | 9 ++++---
kde-plasma/kephal/kephal-4.11.22.ebuild | 2 +-
kde-plasma/kgamma/kgamma-4.14.3.ebuild | 2 +-
kde-plasma/ksplash/ksplash-4.11.22.ebuild | 7 +++--
kde-plasma/kwin/kwin-4.11.22.ebuild | 6 +----
.../plasma-workspace-4.11.22.ebuild | 5 +---
.../systemsettings-4.11.22-r2.ebuild | 3 +--
media-tv/kdetv/kdetv-0.8.9-r2.ebuild | 3 +--
media-tv/kdetv/kdetv-0.8.9-r3.ebuild | 3 +--
media-video/kaffeine/kaffeine-0.8.6.ebuild | 4 +--
media-video/kaffeine/kaffeine-0.8.8-r1.ebuild | 8 +++---
media-video/kaffeine/kaffeine-0.8.8-r2.ebuild | 8 +++---
media-video/kaffeine/kaffeine-0.8.8.ebuild | 8 +++---
net-im/sim/sim-9999.ebuild | 31 ++++++++++++----------
sys-power/kpowersave/kpowersave-0.7.3-r2.ebuild | 2 +-
26 files changed, 66 insertions(+), 77 deletions(-)
diff --git a/kde-apps/konsolepart/konsolepart-4.14.3.ebuild
b/kde-apps/konsolepart/konsolepart-4.14.3.ebuild
index 9be9cca7..baae5e1f 100644
--- a/kde-apps/konsolepart/konsolepart-4.14.3.ebuild
+++ b/kde-apps/konsolepart/konsolepart-4.14.3.ebuild
@@ -24,8 +24,7 @@ COMMONDEPEND="
"
DEPEND="${COMMONDEPEND}
x11-apps/bdftopcf
- x11-proto/kbproto
- x11-proto/renderproto
+ x11-base/xorg-proto
"
RDEPEND="${COMMONDEPEND}
!<kde-apps/konsole-4.14.3-r2
diff --git a/kde-apps/kopete/kopete-3.5.10-r2.ebuild
b/kde-apps/kopete/kopete-3.5.10-r2.ebuild
index 97b02cad..5dcee1b5 100644
--- a/kde-apps/kopete/kopete-3.5.10-r2.ebuild
+++ b/kde-apps/kopete/kopete-3.5.10-r2.ebuild
@@ -57,14 +57,12 @@ RDEPEND="
# only needed for calling
# netmeeting? ( net-im/gnomemeeting )"
-DEPEND="
- ${BOTH_DEPEND}
- x11-proto/videoproto
+DEPEND="${BOTH_DEPEND}
+ x11-base/xorg-proto
kernel_linux? (
virtual/os-headers
x11-libs/libXv
)
- xscreensaver? ( x11-proto/scrnsaverproto )
"
pkg_setup() {
diff --git a/kde-apps/kopete/kopete-3.5.10-r4.ebuild
b/kde-apps/kopete/kopete-3.5.10-r4.ebuild
index e411388a..388322e7 100644
--- a/kde-apps/kopete/kopete-3.5.10-r4.ebuild
+++ b/kde-apps/kopete/kopete-3.5.10-r4.ebuild
@@ -55,14 +55,12 @@ RDEPEND="
"
# !kde-base/kdenetwork is handled by the eclass.
-DEPEND="
- ${BOTH_DEPEND}
- x11-proto/videoproto
+DEPEND="${BOTH_DEPEND}
+ x11-base/xorg-proto
kernel_linux? (
virtual/os-headers
x11-libs/libXv
)
- xscreensaver? ( x11-proto/scrnsaverproto )
"
pkg_setup() {
diff --git a/kde-apps/kopete/kopete-3.5.10-r5.ebuild
b/kde-apps/kopete/kopete-3.5.10-r5.ebuild
index 8211418e..511d5c83 100644
--- a/kde-apps/kopete/kopete-3.5.10-r5.ebuild
+++ b/kde-apps/kopete/kopete-3.5.10-r5.ebuild
@@ -58,14 +58,12 @@ RDEPEND="
"
# !kde-base/kdenetwork is handled by the eclass.
-DEPEND="
- ${BOTH_DEPEND}
- x11-proto/videoproto
+DEPEND="${BOTH_DEPEND}
+ x11-base/xorg-proto
kernel_linux? (
virtual/os-headers
x11-libs/libXv
)
- xscreensaver? ( x11-proto/scrnsaverproto )
"
pkg_setup() {
diff --git a/kde-apps/kopete/kopete-3.5.10-r6.ebuild
b/kde-apps/kopete/kopete-3.5.10-r6.ebuild
index be281b11..e897ca1c 100644
--- a/kde-apps/kopete/kopete-3.5.10-r6.ebuild
+++ b/kde-apps/kopete/kopete-3.5.10-r6.ebuild
@@ -60,14 +60,12 @@ RDEPEND="
"
# !kde-base/kdenetwork is handled by the eclass.
-DEPEND="
- ${BOTH_DEPEND}
- x11-proto/videoproto
+DEPEND="${BOTH_DEPEND}
+ x11-base/xorg-proto
kernel_linux? (
virtual/os-headers
x11-libs/libXv
)
- xscreensaver? ( x11-proto/scrnsaverproto )
"
pkg_setup() {
diff --git a/kde-apps/kopete/kopete-3.5.10.ebuild
b/kde-apps/kopete/kopete-3.5.10.ebuild
index 455d9e15..4f6ccc97 100644
--- a/kde-apps/kopete/kopete-3.5.10.ebuild
+++ b/kde-apps/kopete/kopete-3.5.10.ebuild
@@ -49,10 +49,9 @@ RDEPEND="${BOTH_DEPEND}
# netmeeting? ( net-im/gnomemeeting )"
DEPEND="${BOTH_DEPEND}
+ x11-base/xorg-proto
kernel_linux? ( virtual/os-headers )
- x11-proto/videoproto
- kernel_linux? ( x11-libs/libXv )
- xscreensaver? ( x11-proto/scrnsaverproto )"
+ kernel_linux? ( x11-libs/libXv )"
pkg_setup() {
if use kernel_linux && ! built_with_use dev-qt/qt-meta:3 opengl; then
diff --git a/kde-apps/kopete/kopete-4.14.3-r1.ebuild
b/kde-apps/kopete/kopete-4.14.3-r1.ebuild
index 162fc168..157b41a8 100644
--- a/kde-apps/kopete/kopete-4.14.3-r1.ebuild
+++ b/kde-apps/kopete/kopete-4.14.3-r1.ebuild
@@ -110,7 +110,7 @@ RDEPEND="${COMMONDEPEND}
"
# telepathy? ( net-libs/decibel )"
DEPEND="${COMMONDEPEND}
- x11-proto/scrnsaverproto
+ x11-base/xorg-proto
jingle? ( dev-libs/jsoncpp )
"
diff --git a/kde-apps/ktimetracker/ktimetracker-4.14.11_pre20160611.ebuild
b/kde-apps/ktimetracker/ktimetracker-4.14.11_pre20160611.ebuild
index 45eb02ef..a560b32d 100644
--- a/kde-apps/ktimetracker/ktimetracker-4.14.11_pre20160611.ebuild
+++ b/kde-apps/ktimetracker/ktimetracker-4.14.11_pre20160611.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
x11-libs/libXScrnSaver
"
DEPEND="${RDEPEND}
- x11-proto/scrnsaverproto
+ x11-base/xorg-proto
"
KMEXTRACTONLY="
diff --git a/kde-base/karm/karm-3.5.10.ebuild b/kde-base/karm/karm-3.5.10.ebuild
index 36d5fd6b..919ef111 100644
--- a/kde-base/karm/karm-3.5.10.ebuild
+++ b/kde-base/karm/karm-3.5.10.ebuild
@@ -15,7 +15,7 @@ RDEPEND=">=kde-base/libkcal-${PV}:${SLOT}
x11-libs/libXScrnSaver"
DEPEND="${RDEPEND}
- x11-proto/scrnsaverproto"
+ x11-base/xorg-proto"
KMCOPYLIB="
libkcal libkcal
diff --git a/kde-base/kdesktop/kdesktop-3.5.10.ebuild
b/kde-base/kdesktop/kdesktop-3.5.10.ebuild
index dcae9aed..0ca20eef 100644
--- a/kde-base/kdesktop/kdesktop-3.5.10.ebuild
+++ b/kde-base/kdesktop/kdesktop-3.5.10.ebuild
@@ -17,7 +17,7 @@ DEPEND="x11-libs/libXext
x11-libs/libXcursor
>=kde-apps/libkonq-${PV}:${SLOT}
>=kde-apps/kcontrol-${PV}:${SLOT}
- xscreensaver? ( x11-proto/scrnsaverproto )"
+ xscreensaver? ( x11-base/xorg-proto )"
# Requires the desktop background settings module,
# so until we separate the kcontrol modules into separate ebuilds :-),
# there's a dep here
diff --git a/kde-base/ksplashml/ksplashml-3.5.10.ebuild
b/kde-base/ksplashml/ksplashml-3.5.10.ebuild
index e7dd6c4e..25bb7180 100644
--- a/kde-base/ksplashml/ksplashml-3.5.10.ebuild
+++ b/kde-base/ksplashml/ksplashml-3.5.10.ebuild
@@ -11,7 +11,7 @@ KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
IUSE="kdehiddenvisibility xinerama"
DEPEND="x11-libs/libXcursor
- xinerama? ( x11-proto/xineramaproto )"
+ xinerama? ( x11-base/xorg-proto )"
RDEPEND="x11-libs/libXcursor
xinerama? ( x11-libs/libXinerama )"
diff --git a/kde-misc/rsibreak/rsibreak-0.8.0-r1.ebuild
b/kde-misc/rsibreak/rsibreak-0.8.0-r1.ebuild
index 0a31b532..585805f2 100644
--- a/kde-misc/rsibreak/rsibreak-0.8.0-r1.ebuild
+++ b/kde-misc/rsibreak/rsibreak-0.8.0-r1.ebuild
@@ -25,10 +25,11 @@ IUSE=""
S="${WORKDIR}/${PN}-${PV/_rc/-rc}"
-RDEPEND="x11-libs/libXext
- x11-libs/libX11
- x11-libs/libXScrnSaver"
+RDEPEND="
+ x11-libs/libXext
+ x11-libs/libX11
+ x11-libs/libXScrnSaver"
DEPEND="${RDEPEND}
- x11-proto/scrnsaverproto"
+ x11-base/xorg-proto"
need-kde 3.3
diff --git a/kde-plasma/kephal/kephal-4.11.22.ebuild
b/kde-plasma/kephal/kephal-4.11.22.ebuild
index 89cc26ef..90937cbe 100644
--- a/kde-plasma/kephal/kephal-4.11.22.ebuild
+++ b/kde-plasma/kephal/kephal-4.11.22.ebuild
@@ -16,7 +16,7 @@ RDEPEND="
x11-libs/libXrandr
"
DEPEND="${RDEPEND}
- x11-proto/randrproto
+ x11-base/xorg-proto
"
KMEXTRACTONLY+="
diff --git a/kde-plasma/kgamma/kgamma-4.14.3.ebuild
b/kde-plasma/kgamma/kgamma-4.14.3.ebuild
index aabd5ec1..234460f7 100644
--- a/kde-plasma/kgamma/kgamma-4.14.3.ebuild
+++ b/kde-plasma/kgamma/kgamma-4.14.3.ebuild
@@ -14,7 +14,7 @@ RDEPEND="
x11-libs/libXxf86vm
"
DEPEND="${RDEPEND}
- x11-proto/xf86vidmodeproto
+ x11-base/xorg-proto
"
PATCHES=( "${FILESDIR}/${P}-cmake34.patch" )
diff --git a/kde-plasma/ksplash/ksplash-4.11.22.ebuild
b/kde-plasma/ksplash/ksplash-4.11.22.ebuild
index be8acc56..157afaa4 100644
--- a/kde-plasma/ksplash/ksplash-4.11.22.ebuild
+++ b/kde-plasma/ksplash/ksplash-4.11.22.ebuild
@@ -12,17 +12,16 @@ KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
IUSE="cpu_flags_x86_3dnow altivec debug cpu_flags_x86_mmx cpu_flags_x86_sse
cpu_flags_x86_sse2 xinerama"
-COMMONDEPEND="
+RDEPEND="
media-libs/libpng:0=
virtual/jpeg:0
x11-libs/libX11
x11-libs/libXext
xinerama? ( x11-libs/libXinerama )
"
-DEPEND="${COMMONDEPEND}
- xinerama? ( x11-proto/xineramaproto )
+DEPEND="${RDEPEND}
+ xinerama? ( x11-base/xorg-proto )
"
-RDEPEND="${COMMONDEPEND}"
src_configure() {
local mycmakeargs=(
diff --git a/kde-plasma/kwin/kwin-4.11.22.ebuild
b/kde-plasma/kwin/kwin-4.11.22.ebuild
index b3bb3823..b11d168b 100644
--- a/kde-plasma/kwin/kwin-4.11.22.ebuild
+++ b/kde-plasma/kwin/kwin-4.11.22.ebuild
@@ -44,11 +44,7 @@ COMMONDEPEND="
"
DEPEND="${COMMONDEPEND}
x11-libs/xcb-util-renderutil
- x11-proto/compositeproto
- x11-proto/damageproto
- x11-proto/fixesproto
- x11-proto/randrproto
- x11-proto/renderproto
+ x11-base/xorg-proto
"
RDEPEND="${COMMONDEPEND}
x11-apps/scripts
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-4.11.22.ebuild
b/kde-plasma/plasma-workspace/plasma-workspace-4.11.22.ebuild
index 3bc18770..f2951403 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-4.11.22.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-4.11.22.ebuild
@@ -47,10 +47,7 @@ COMMONDEPEND="
"
DEPEND="${COMMONDEPEND}
dev-libs/boost
- x11-proto/compositeproto
- x11-proto/damageproto
- x11-proto/fixesproto
- x11-proto/renderproto
+ x11-base/xorg-proto
"
RDEPEND="${COMMONDEPEND}
$(add_kdeapps_dep plasma-runtime)
diff --git a/kde-plasma/systemsettings/systemsettings-4.11.22-r2.ebuild
b/kde-plasma/systemsettings/systemsettings-4.11.22-r2.ebuild
index 4be29dba..04425cf8 100644
--- a/kde-plasma/systemsettings/systemsettings-4.11.22-r2.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-4.11.22-r2.ebuild
@@ -35,8 +35,7 @@ COMMONDEPEND="
usb? ( virtual/libusb:0 )
"
DEPEND="${COMMONDEPEND}
- x11-proto/kbproto
- x11-proto/xextproto
+ x11-base/xorg-proto
"
RDEPEND="${COMMONDEPEND}
>=kde-frameworks/oxygen-icons-5.19.0:5
diff --git a/media-tv/kdetv/kdetv-0.8.9-r2.ebuild
b/media-tv/kdetv/kdetv-0.8.9-r2.ebuild
index af986011..01cb4c1f 100644
--- a/media-tv/kdetv/kdetv-0.8.9-r2.ebuild
+++ b/media-tv/kdetv/kdetv-0.8.9-r2.ebuild
@@ -39,8 +39,7 @@ RDEPEND="
x11-libs/libXrender"
DEPEND="${RDEPEND}
- x11-proto/xf86dgaproto
- x11-proto/videoproto
+ x11-base/xorg-proto
virtual/os-headers"
need-kde 3.5
diff --git a/media-tv/kdetv/kdetv-0.8.9-r3.ebuild
b/media-tv/kdetv/kdetv-0.8.9-r3.ebuild
index 5a778151..d7934431 100644
--- a/media-tv/kdetv/kdetv-0.8.9-r3.ebuild
+++ b/media-tv/kdetv/kdetv-0.8.9-r3.ebuild
@@ -39,8 +39,7 @@ RDEPEND="
x11-libs/libXrender"
DEPEND="${RDEPEND}
- x11-proto/xf86dgaproto
- x11-proto/videoproto
+ x11-base/xorg-proto
virtual/os-headers"
need-kde 3.5
diff --git a/media-video/kaffeine/kaffeine-0.8.6.ebuild
b/media-video/kaffeine/kaffeine-0.8.6.ebuild
index 8176bb9b..bebe323a 100644
--- a/media-video/kaffeine/kaffeine-0.8.6.ebuild
+++ b/media-video/kaffeine/kaffeine-0.8.6.ebuild
@@ -24,8 +24,8 @@ RDEPEND=">=media-libs/xine-lib-1.1.9
x11-libs/libXtst"
DEPEND="${RDEPEND}
- dvb? ( media-tv/linuxtv-dvb-headers )
- x11-proto/inputproto"
+ x11-base/xorg-proto
+ dvb? ( media-tv/linuxtv-dvb-headers )"
need-kde 3.5.4
diff --git a/media-video/kaffeine/kaffeine-0.8.8-r1.ebuild
b/media-video/kaffeine/kaffeine-0.8.8-r1.ebuild
index 37c9bdde..f0ae670d 100644
--- a/media-video/kaffeine/kaffeine-0.8.8-r1.ebuild
+++ b/media-video/kaffeine/kaffeine-0.8.8-r1.ebuild
@@ -36,9 +36,11 @@ RDEPEND=">=media-libs/xine-lib-1.1.9[xcb?]
x11-libs/libXtst"
DEPEND="${RDEPEND}
- dvb? ( virtual/linuxtv-dvb-headers
- >=sys-kernel/linux-headers-2.6.28 )
- x11-proto/inputproto"
+ x11-base/xorg-proto
+ dvb? (
+ virtual/linuxtv-dvb-headers
+ >=sys-kernel/linux-headers-2.6.28
+ )"
need-kde 3.5.4
diff --git a/media-video/kaffeine/kaffeine-0.8.8-r2.ebuild
b/media-video/kaffeine/kaffeine-0.8.8-r2.ebuild
index 64349e28..0e13e0e2 100644
--- a/media-video/kaffeine/kaffeine-0.8.8-r2.ebuild
+++ b/media-video/kaffeine/kaffeine-0.8.8-r2.ebuild
@@ -36,9 +36,11 @@ RDEPEND=">=media-libs/xine-lib-1.1.9[xcb?]
x11-libs/libXtst"
DEPEND="${RDEPEND}
- dvb? ( virtual/linuxtv-dvb-headers
- >=sys-kernel/linux-headers-2.6.28 )
- x11-proto/inputproto"
+ x11-base/xorg-proto
+ dvb? (
+ virtual/linuxtv-dvb-headers
+ >=sys-kernel/linux-headers-2.6.28
+ )"
need-kde 3.5.4
diff --git a/media-video/kaffeine/kaffeine-0.8.8.ebuild
b/media-video/kaffeine/kaffeine-0.8.8.ebuild
index 8fa12d60..2b6b4899 100644
--- a/media-video/kaffeine/kaffeine-0.8.8.ebuild
+++ b/media-video/kaffeine/kaffeine-0.8.8.ebuild
@@ -36,9 +36,11 @@ RDEPEND=">=media-libs/xine-lib-1.1.9[xcb?]
x11-libs/libXtst"
DEPEND="${RDEPEND}
- dvb? ( media-tv/linuxtv-dvb-headers
- >=sys-kernel/linux-headers-2.6.28 )
- x11-proto/inputproto"
+ x11-base/xorg-proto
+ dvb? (
+ media-tv/linuxtv-dvb-headers
+ >=sys-kernel/linux-headers-2.6.28
+ )"
need-kde 3.5.4
diff --git a/net-im/sim/sim-9999.ebuild b/net-im/sim/sim-9999.ebuild
index 054235f1..de5e33ad 100644
--- a/net-im/sim/sim-9999.ebuild
+++ b/net-im/sim/sim-9999.ebuild
@@ -22,22 +22,25 @@ IUSE="debug gpg +jabber kde msn +oscar sms spell ssl
weather yahoo livejournal"
# inside /etc/portage/env/net-im/sim to disable transparent plugin.
# kdebase-data provides the icon "licq.png"
-RDEPEND="kde? ( kde-frameworks/kdelibs:3.5[spell=]
- kde-apps/kdebase-data:3.5 )
- !kde? ( spell? ( app-text/aspell ) )
- dev-qt/qt-meta:3
- ssl? ( dev-libs/openssl )
- gpg? ( app-crypt/gnupg )
- dev-libs/libxml2
- dev-libs/libxslt
- sys-libs/zlib
- media-libs/fontconfig
- x11-libs/libXScrnSaver"
+RDEPEND="
+ kde? (
+ kde-frameworks/kdelibs:3.5[spell=]
+ kde-apps/kdebase-data:3.5
+ )
+ !kde? ( spell? ( app-text/aspell ) )
+ dev-qt/qt-meta:3
+ ssl? ( dev-libs/openssl )
+ gpg? ( app-crypt/gnupg )
+ dev-libs/libxml2
+ dev-libs/libxslt
+ sys-libs/zlib
+ media-libs/fontconfig
+ x11-libs/libXScrnSaver"
DEPEND="${RDEPEND}
- sys-devel/flex
- app-arch/zip
- x11-proto/scrnsaverproto"
+ sys-devel/flex
+ app-arch/zip
+ x11-base/xorg-proto"
pkg_setup() {
if ! use jabber && ! use livejournal && ! use msn && ! use oscar && !
use yahoo; then
diff --git a/sys-power/kpowersave/kpowersave-0.7.3-r2.ebuild
b/sys-power/kpowersave/kpowersave-0.7.3-r2.ebuild
index 330f2551..d427128b 100644
--- a/sys-power/kpowersave/kpowersave-0.7.3-r2.ebuild
+++ b/sys-power/kpowersave/kpowersave-0.7.3-r2.ebuild
@@ -27,7 +27,7 @@ RDEPEND=">=sys-apps/hal-0.5.4
x11-libs/libXtst
=kde-frameworks/kdelibs-3*"
DEPEND="${RDEPEND}
- x11-proto/scrnsaverproto"
+ x11-base/xorg-proto"
need-kde 3.5
