commit: 2a91d596cd57fbcaadc0adbcc905dbb3587f7cff Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> AuthorDate: Tue Apr 24 21:25:58 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Apr 24 21:37:25 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=2a91d596
*/*: Update dependencies (x11-proto/* -> x11-base/xorg-proto). All non-obsolete x11-proto/ packages except x11-proto/xcb-proto were merged into x11-base/xorg-proto. kde-apps/kmousetool/kmousetool-18.04.49.9999.ebuild | 2 +- kde-apps/kmousetool/kmousetool-9999.ebuild | 2 +- kde-apps/kopete/kopete-18.04.49.9999.ebuild | 2 +- kde-apps/kopete/kopete-9999.ebuild | 2 +- kde-frameworks/kcrash/kcrash-9999.ebuild | 2 +- kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild | 2 +- kde-frameworks/kdesu/kdesu-9999.ebuild | 2 +- kde-frameworks/kguiaddons/kguiaddons-9999.ebuild | 2 +- kde-frameworks/khtml/khtml-9999.ebuild | 2 +- kde-frameworks/kinit/kinit-9999.ebuild | 2 +- kde-frameworks/kio/kio-9999.ebuild | 2 +- kde-frameworks/kjobwidgets/kjobwidgets-9999.ebuild | 2 +- kde-frameworks/knotifications/knotifications-9999.ebuild | 2 +- kde-frameworks/kwindowsystem/kwindowsystem-9999.ebuild | 2 +- kde-frameworks/plasma/plasma-9999.ebuild | 2 +- kde-misc/wacomtablet/wacomtablet-9999.ebuild | 2 +- kde-plasma/kgamma/kgamma-5.12.49.9999.ebuild | 2 +- kde-plasma/kgamma/kgamma-9999.ebuild | 2 +- kde-plasma/khotkeys/khotkeys-5.12.49.9999.ebuild | 2 +- kde-plasma/khotkeys/khotkeys-9999.ebuild | 2 +- kde-plasma/kscreenlocker/kscreenlocker-5.12.49.9999.ebuild | 2 +- kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild | 2 +- kde-plasma/kwin/kwin-5.12.49.9999.ebuild | 2 +- kde-plasma/kwin/kwin-9999.ebuild | 2 +- kde-plasma/libksysguard/libksysguard-5.12.49.9999.ebuild | 2 +- kde-plasma/libksysguard/libksysguard-9999.ebuild | 2 +- kde-plasma/plasma-desktop/plasma-desktop-5.12.49.9999.ebuild | 2 +- kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild | 2 +- kde-plasma/plasma-workspace/plasma-workspace-5.12.49.9999.ebuild | 2 +- kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/kde-apps/kmousetool/kmousetool-18.04.49.9999.ebuild b/kde-apps/kmousetool/kmousetool-18.04.49.9999.ebuild index 5772adc65d..cd662e7a0e 100644 --- a/kde-apps/kmousetool/kmousetool-18.04.49.9999.ebuild +++ b/kde-apps/kmousetool/kmousetool-18.04.49.9999.ebuild @@ -26,9 +26,9 @@ COMMON_DEPEND=" x11-libs/libXtst " DEPEND="${COMMON_DEPEND} + x11-base/xorg-proto x11-libs/libXext x11-libs/libXt - x11-proto/xproto " RDEPEND="${COMMON_DEPEND} !<kde-apps/kde4-l10n-17.07.80 diff --git a/kde-apps/kmousetool/kmousetool-9999.ebuild b/kde-apps/kmousetool/kmousetool-9999.ebuild index 5772adc65d..cd662e7a0e 100644 --- a/kde-apps/kmousetool/kmousetool-9999.ebuild +++ b/kde-apps/kmousetool/kmousetool-9999.ebuild @@ -26,9 +26,9 @@ COMMON_DEPEND=" x11-libs/libXtst " DEPEND="${COMMON_DEPEND} + x11-base/xorg-proto x11-libs/libXext x11-libs/libXt - x11-proto/xproto " RDEPEND="${COMMON_DEPEND} !<kde-apps/kde4-l10n-17.07.80 diff --git a/kde-apps/kopete/kopete-18.04.49.9999.ebuild b/kde-apps/kopete/kopete-18.04.49.9999.ebuild index 78f452e338..09727ab703 100644 --- a/kde-apps/kopete/kopete-18.04.49.9999.ebuild +++ b/kde-apps/kopete/kopete-18.04.49.9999.ebuild @@ -133,7 +133,7 @@ RDEPEND="${COMMONDEPEND} # sms? ( app-mobilephone/smssend ) # winpopup? ( net-fs/samba ) DEPEND="${COMMONDEPEND} - x11-proto/scrnsaverproto + x11-base/xorg-proto jingle? ( dev-libs/jsoncpp ) " diff --git a/kde-apps/kopete/kopete-9999.ebuild b/kde-apps/kopete/kopete-9999.ebuild index 78f452e338..09727ab703 100644 --- a/kde-apps/kopete/kopete-9999.ebuild +++ b/kde-apps/kopete/kopete-9999.ebuild @@ -133,7 +133,7 @@ RDEPEND="${COMMONDEPEND} # sms? ( app-mobilephone/smssend ) # winpopup? ( net-fs/samba ) DEPEND="${COMMONDEPEND} - x11-proto/scrnsaverproto + x11-base/xorg-proto jingle? ( dev-libs/jsoncpp ) " diff --git a/kde-frameworks/kcrash/kcrash-9999.ebuild b/kde-frameworks/kcrash/kcrash-9999.ebuild index 37345418d1..d9f444cac8 100644 --- a/kde-frameworks/kcrash/kcrash-9999.ebuild +++ b/kde-frameworks/kcrash/kcrash-9999.ebuild @@ -22,7 +22,7 @@ RDEPEND=" x11-libs/libX11 " DEPEND="${RDEPEND} - x11-proto/xproto + x11-base/xorg-proto nls? ( $(add_qt_dep linguist-tools) ) test? ( $(add_qt_dep qtwidgets) ) " diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild index 01d3e50238..f87a2459ec 100644 --- a/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild +++ b/kde-frameworks/kdelibs4support/kdelibs4support-9999.ebuild @@ -64,7 +64,7 @@ DEPEND="${COMMON_DEPEND} dev-lang/perl dev-perl/URI test? ( $(add_qt_dep qtconcurrent) ) - X? ( x11-proto/xproto ) + X? ( x11-base/xorg-proto ) " RDEPEND="${COMMON_DEPEND} $(add_frameworks_dep kdoctools) diff --git a/kde-frameworks/kdesu/kdesu-9999.ebuild b/kde-frameworks/kdesu/kdesu-9999.ebuild index 9a421d920e..ea8f601486 100644 --- a/kde-frameworks/kdesu/kdesu-9999.ebuild +++ b/kde-frameworks/kdesu/kdesu-9999.ebuild @@ -20,7 +20,7 @@ RDEPEND=" X? ( x11-libs/libX11 ) " DEPEND="${RDEPEND} - X? ( x11-proto/xproto ) + X? ( x11-base/xorg-proto ) " src_configure() { diff --git a/kde-frameworks/kguiaddons/kguiaddons-9999.ebuild b/kde-frameworks/kguiaddons/kguiaddons-9999.ebuild index fc4d46332e..01111707dd 100644 --- a/kde-frameworks/kguiaddons/kguiaddons-9999.ebuild +++ b/kde-frameworks/kguiaddons/kguiaddons-9999.ebuild @@ -17,6 +17,6 @@ RDEPEND=" x11-libs/libX11 " DEPEND="${RDEPEND} + x11-base/xorg-proto x11-libs/libxcb - x11-proto/xproto " diff --git a/kde-frameworks/khtml/khtml-9999.ebuild b/kde-frameworks/khtml/khtml-9999.ebuild index 996fbce69e..c18f6ccff5 100644 --- a/kde-frameworks/khtml/khtml-9999.ebuild +++ b/kde-frameworks/khtml/khtml-9999.ebuild @@ -56,7 +56,7 @@ DEPEND="${RDEPEND} dev-lang/perl dev-util/gperf test? ( $(add_qt_dep qtx11extras) ) - X? ( x11-proto/xproto ) + X? ( x11-base/xorg-proto ) " src_configure() { diff --git a/kde-frameworks/kinit/kinit-9999.ebuild b/kde-frameworks/kinit/kinit-9999.ebuild index c9a36215e1..d3f32c87b4 100644 --- a/kde-frameworks/kinit/kinit-9999.ebuild +++ b/kde-frameworks/kinit/kinit-9999.ebuild @@ -30,7 +30,7 @@ RDEPEND=" " DEPEND="${RDEPEND} man? ( $(add_frameworks_dep kdoctools) ) - X? ( x11-proto/xproto ) + X? ( x11-base/xorg-proto ) " src_configure() { diff --git a/kde-frameworks/kio/kio-9999.ebuild b/kde-frameworks/kio/kio-9999.ebuild index 2608557ebc..144d29d298 100644 --- a/kde-frameworks/kio/kio-9999.ebuild +++ b/kde-frameworks/kio/kio-9999.ebuild @@ -54,9 +54,9 @@ DEPEND="${RDEPEND} $(add_qt_dep qtconcurrent) test? ( sys-libs/zlib ) X? ( + x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender - x11-proto/xproto ) " PDEPEND=" diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-9999.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-9999.ebuild index 37f24093b5..212d12b0a8 100644 --- a/kde-frameworks/kjobwidgets/kjobwidgets-9999.ebuild +++ b/kde-frameworks/kjobwidgets/kjobwidgets-9999.ebuild @@ -21,8 +21,8 @@ RDEPEND=" DEPEND="${RDEPEND} nls? ( $(add_qt_dep linguist-tools) ) X? ( + x11-base/xorg-proto x11-libs/libX11 - x11-proto/xproto ) " diff --git a/kde-frameworks/knotifications/knotifications-9999.ebuild b/kde-frameworks/knotifications/knotifications-9999.ebuild index ec43495701..9163c258ec 100644 --- a/kde-frameworks/knotifications/knotifications-9999.ebuild +++ b/kde-frameworks/knotifications/knotifications-9999.ebuild @@ -30,7 +30,7 @@ RDEPEND=" " DEPEND="${RDEPEND} nls? ( $(add_qt_dep linguist-tools) ) - X? ( x11-proto/xproto ) + X? ( x11-base/xorg-proto ) " src_configure() { diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-9999.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-9999.ebuild index be1abdaca3..390ec4ab46 100644 --- a/kde-frameworks/kwindowsystem/kwindowsystem-9999.ebuild +++ b/kde-frameworks/kwindowsystem/kwindowsystem-9999.ebuild @@ -24,7 +24,7 @@ RDEPEND=" " DEPEND="${RDEPEND} nls? ( $(add_qt_dep linguist-tools) ) - X? ( x11-proto/xproto ) + X? ( x11-base/xorg-proto ) " RESTRICT+=" test" diff --git a/kde-frameworks/plasma/plasma-9999.ebuild b/kde-frameworks/plasma/plasma-9999.ebuild index 940b17e819..458c69360b 100644 --- a/kde-frameworks/plasma/plasma-9999.ebuild +++ b/kde-frameworks/plasma/plasma-9999.ebuild @@ -51,7 +51,7 @@ RDEPEND=" " DEPEND="${RDEPEND} $(add_frameworks_dep kdoctools) - X? ( x11-proto/xproto ) + X? ( x11-base/xorg-proto ) " RESTRICT+=" test" diff --git a/kde-misc/wacomtablet/wacomtablet-9999.ebuild b/kde-misc/wacomtablet/wacomtablet-9999.ebuild index faabdb3f4d..230a744a87 100644 --- a/kde-misc/wacomtablet/wacomtablet-9999.ebuild +++ b/kde-misc/wacomtablet/wacomtablet-9999.ebuild @@ -37,8 +37,8 @@ CDEPEND=" " DEPEND="${CDEPEND} sys-devel/gettext + x11-base/xorg-proto x11-libs/libX11 - x11-proto/xproto " RDEPEND="${CDEPEND} !kde-misc/wacomtablet:4 diff --git a/kde-plasma/kgamma/kgamma-5.12.49.9999.ebuild b/kde-plasma/kgamma/kgamma-5.12.49.9999.ebuild index 91d26bac08..f418be119b 100644 --- a/kde-plasma/kgamma/kgamma-5.12.49.9999.ebuild +++ b/kde-plasma/kgamma/kgamma-5.12.49.9999.ebuild @@ -22,5 +22,5 @@ RDEPEND=" x11-libs/libXxf86vm " DEPEND="${RDEPEND} - x11-proto/xf86vidmodeproto + x11-base/xorg-proto " diff --git a/kde-plasma/kgamma/kgamma-9999.ebuild b/kde-plasma/kgamma/kgamma-9999.ebuild index 91d26bac08..f418be119b 100644 --- a/kde-plasma/kgamma/kgamma-9999.ebuild +++ b/kde-plasma/kgamma/kgamma-9999.ebuild @@ -22,5 +22,5 @@ RDEPEND=" x11-libs/libXxf86vm " DEPEND="${RDEPEND} - x11-proto/xf86vidmodeproto + x11-base/xorg-proto " diff --git a/kde-plasma/khotkeys/khotkeys-5.12.49.9999.ebuild b/kde-plasma/khotkeys/khotkeys-5.12.49.9999.ebuild index 4002c33896..e1d2c52439 100644 --- a/kde-plasma/khotkeys/khotkeys-5.12.49.9999.ebuild +++ b/kde-plasma/khotkeys/khotkeys-5.12.49.9999.ebuild @@ -40,7 +40,7 @@ RDEPEND="${COMMON_DEPEND} !kde-plasma/systemsettings:4 " DEPEND="${COMMON_DEPEND} + x11-base/xorg-proto x11-libs/libxcb x11-libs/libXtst - x11-proto/xproto " diff --git a/kde-plasma/khotkeys/khotkeys-9999.ebuild b/kde-plasma/khotkeys/khotkeys-9999.ebuild index 4002c33896..e1d2c52439 100644 --- a/kde-plasma/khotkeys/khotkeys-9999.ebuild +++ b/kde-plasma/khotkeys/khotkeys-9999.ebuild @@ -40,7 +40,7 @@ RDEPEND="${COMMON_DEPEND} !kde-plasma/systemsettings:4 " DEPEND="${COMMON_DEPEND} + x11-base/xorg-proto x11-libs/libxcb x11-libs/libXtst - x11-proto/xproto " diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.12.49.9999.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.12.49.9999.ebuild index 8c9e48f8cf..0e48a52270 100644 --- a/kde-plasma/kscreenlocker/kscreenlocker-5.12.49.9999.ebuild +++ b/kde-plasma/kscreenlocker/kscreenlocker-5.12.49.9999.ebuild @@ -45,7 +45,7 @@ COMMON_DEPEND=" seccomp? ( sys-libs/libseccomp ) " DEPEND="${COMMON_DEPEND} - x11-proto/xproto + x11-base/xorg-proto " RDEPEND="${COMMON_DEPEND} $(add_plasma_dep kde-cli-tools) diff --git a/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild index 402ee0bd5d..8ff8d53ac7 100644 --- a/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild +++ b/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild @@ -45,7 +45,7 @@ COMMON_DEPEND=" seccomp? ( sys-libs/libseccomp ) " DEPEND="${COMMON_DEPEND} - x11-proto/xproto + x11-base/xorg-proto " RDEPEND="${COMMON_DEPEND} $(add_plasma_dep kde-cli-tools) diff --git a/kde-plasma/kwin/kwin-5.12.49.9999.ebuild b/kde-plasma/kwin/kwin-5.12.49.9999.ebuild index cfe9af9c85..b2b94a6077 100644 --- a/kde-plasma/kwin/kwin-5.12.49.9999.ebuild +++ b/kde-plasma/kwin/kwin-5.12.49.9999.ebuild @@ -80,7 +80,7 @@ RDEPEND="${COMMON_DEPEND} DEPEND="${COMMON_DEPEND} $(add_qt_dep designer) $(add_qt_dep qtconcurrent) - x11-proto/xproto + x11-base/xorg-proto " RESTRICT+=" test" diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild index b6fb324341..6669e376f6 100644 --- a/kde-plasma/kwin/kwin-9999.ebuild +++ b/kde-plasma/kwin/kwin-9999.ebuild @@ -80,7 +80,7 @@ RDEPEND="${COMMON_DEPEND} DEPEND="${COMMON_DEPEND} $(add_qt_dep designer) $(add_qt_dep qtconcurrent) - x11-proto/xproto + x11-base/xorg-proto " RESTRICT+=" test" diff --git a/kde-plasma/libksysguard/libksysguard-5.12.49.9999.ebuild b/kde-plasma/libksysguard/libksysguard-5.12.49.9999.ebuild index 8cc783ac77..affe3f8baa 100644 --- a/kde-plasma/libksysguard/libksysguard-5.12.49.9999.ebuild +++ b/kde-plasma/libksysguard/libksysguard-5.12.49.9999.ebuild @@ -39,7 +39,7 @@ RDEPEND="${COMMON_DEPEND} DEPEND="${COMMON_DEPEND} $(add_frameworks_dep kiconthemes) !minimal? ( $(add_frameworks_dep plasma) ) - X? ( x11-proto/xproto ) + X? ( x11-base/xorg-proto ) " src_configure() { diff --git a/kde-plasma/libksysguard/libksysguard-9999.ebuild b/kde-plasma/libksysguard/libksysguard-9999.ebuild index 8cc783ac77..affe3f8baa 100644 --- a/kde-plasma/libksysguard/libksysguard-9999.ebuild +++ b/kde-plasma/libksysguard/libksysguard-9999.ebuild @@ -39,7 +39,7 @@ RDEPEND="${COMMON_DEPEND} DEPEND="${COMMON_DEPEND} $(add_frameworks_dep kiconthemes) !minimal? ( $(add_frameworks_dep plasma) ) - X? ( x11-proto/xproto ) + X? ( x11-base/xorg-proto ) " src_configure() { diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.12.49.9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.12.49.9999.ebuild index dd5f103944..5d6468885d 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.12.49.9999.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.12.49.9999.ebuild @@ -97,7 +97,7 @@ COMMON_DEPEND=" " DEPEND="${COMMON_DEPEND} dev-libs/boost - x11-proto/xproto + x11-base/xorg-proto fontconfig? ( x11-libs/libXrender ) mouse? ( x11-drivers/xf86-input-evdev diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild index dd5f103944..5d6468885d 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild @@ -97,7 +97,7 @@ COMMON_DEPEND=" " DEPEND="${COMMON_DEPEND} dev-libs/boost - x11-proto/xproto + x11-base/xorg-proto fontconfig? ( x11-libs/libXrender ) mouse? ( x11-drivers/xf86-input-evdev diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.12.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.12.49.9999.ebuild index c25e949afc..dd9a1c7f5f 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.12.49.9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.12.49.9999.ebuild @@ -118,7 +118,7 @@ RDEPEND="${COMMON_DEPEND} " DEPEND="${COMMON_DEPEND} $(add_qt_dep qtconcurrent) - x11-proto/xproto + x11-base/xorg-proto " PATCHES=( diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild index 65d6af9f5a..ff3ad7f03d 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild @@ -86,7 +86,7 @@ COMMON_DEPEND=" " DEPEND="${COMMON_DEPEND} $(add_qt_dep qtconcurrent) - x11-proto/xproto + x11-base/xorg-proto " RDEPEND="${COMMON_DEPEND} $(add_frameworks_dep kded)