From a6d3c8fcfb555fd1c0293a037c4ba58c4fb7132b Mon Sep 17 00:00:00 2001 From: Jimi Huotari Date: Mon, 18 Feb 2019 23:55:22 +0200 Subject: lxqt: add blockers for 'lxqt-base/lxqt-l10n' Due to the translation changes, this package installs conflicting files, not to mention it is deprecated upstream. Package-Manager: Portage-2.3.61, Repoman-2.3.12 Signed-off-by: Jimi Huotari --- lxqt-base/liblxqt/liblxqt-9999.ebuild | 1 + lxqt-base/lxqt-about/lxqt-about-9999.ebuild | 1 + lxqt-base/lxqt-admin/lxqt-admin-9999.ebuild | 1 + lxqt-base/lxqt-config/lxqt-config-9999.ebuild | 1 + lxqt-base/lxqt-globalkeys/lxqt-globalkeys-9999.ebuild | 1 + lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild | 1 + lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-9999.ebuild | 1 + lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild | 1 + lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild | 1 + lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild | 1 + lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild | 1 + lxqt-base/lxqt-session/lxqt-session-9999.ebuild | 1 + lxqt-base/lxqt-sudo/lxqt-sudo-9999.ebuild | 1 + media-gfx/lximage-qt/lximage-qt-9999.ebuild | 1 + x11-libs/libfm-qt/libfm-qt-9999.ebuild | 1 + x11-misc/obconf-qt/obconf-qt-9999.ebuild | 1 + x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild | 1 + 17 files changed, 17 insertions(+) diff --git a/lxqt-base/liblxqt/liblxqt-9999.ebuild b/lxqt-base/liblxqt/liblxqt-9999.ebuild index 42e598a4..76fc3330 100644 --- a/lxqt-base/liblxqt/liblxqt-9999.ebuild +++ b/lxqt-base/liblxqt/liblxqt-9999.ebuild @@ -35,6 +35,7 @@ RDEPEND=" kde-frameworks/kwindowsystem:5[X] x11-libs/libX11 x11-libs/libXScrnSaver + !lxqt-base/lxqt-l10n " DEPEND="${RDEPEND} policykit? ( sys-auth/polkit-qt ) diff --git a/lxqt-base/lxqt-about/lxqt-about-9999.ebuild b/lxqt-base/lxqt-about/lxqt-about-9999.ebuild index 75f43775..024038f6 100644 --- a/lxqt-base/lxqt-about/lxqt-about-9999.ebuild +++ b/lxqt-base/lxqt-about/lxqt-about-9999.ebuild @@ -26,5 +26,6 @@ RDEPEND=" dev-qt/qtgui:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-$(ver_cut 1-2)* + !lxqt-base/lxqt-l10n " DEPEND="${RDEPEND}" diff --git a/lxqt-base/lxqt-admin/lxqt-admin-9999.ebuild b/lxqt-base/lxqt-admin/lxqt-admin-9999.ebuild index 21736a39..6675bd34 100644 --- a/lxqt-base/lxqt-admin/lxqt-admin-9999.ebuild +++ b/lxqt-base/lxqt-admin/lxqt-admin-9999.ebuild @@ -27,5 +27,6 @@ RDEPEND=" dev-qt/qtwidgets:5 =lxqt-base/liblxqt-$(ver_cut 1-2)* kde-frameworks/kwindowsystem:5 + !lxqt-base/lxqt-l10n " DEPEND="${RDEPEND}" diff --git a/lxqt-base/lxqt-config/lxqt-config-9999.ebuild b/lxqt-base/lxqt-config/lxqt-config-9999.ebuild index 810341ce..00ac0c9d 100644 --- a/lxqt-base/lxqt-config/lxqt-config-9999.ebuild +++ b/lxqt-base/lxqt-config/lxqt-config-9999.ebuild @@ -46,6 +46,7 @@ RDEPEND=" x11-drivers/xf86-input-libinput x11-libs/libXext ) + !lxqt-base/lxqt-l10n " DEPEND="${DEPEND}" diff --git a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-9999.ebuild b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-9999.ebuild index a8088d71..0858b261 100644 --- a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-9999.ebuild +++ b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-9999.ebuild @@ -35,5 +35,6 @@ RDEPEND=" kde-frameworks/kwindowsystem:5 x11-libs/libX11 !lxqt-base/lxqt-common + !lxqt-base/lxqt-l10n " DEPEND="${RDEPEND}" diff --git a/lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild b/lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild index ee258c49..31c8db47 100644 --- a/lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild +++ b/lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild @@ -32,5 +32,6 @@ RDEPEND=" kde-frameworks/kwindowsystem:5 =lxqt-base/liblxqt-$(ver_cut 1-2)* !lxqt-base/lxqt-common + !lxqt-base/lxqt-l10n " DEPEND="${RDEPEND}" diff --git a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-9999.ebuild b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-9999.ebuild index 0da13230..333f665d 100644 --- a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-9999.ebuild +++ b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-9999.ebuild @@ -27,6 +27,7 @@ RDEPEND=" dev-qt/qtcore:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-$(ver_cut 1-2)* + !lxqt-base/lxqt-l10n " DEPEND="${RDEPEND}" diff --git a/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild index bec24119..f8e34a5d 100644 --- a/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild +++ b/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild @@ -67,6 +67,7 @@ RDEPEND=" ) ) !lxqt-base/lxqt-common + !lxqt-base/lxqt-l10n " DEPEND="${RDEPEND}" diff --git a/lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild b/lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild index d27fe6da..a41b83fd 100644 --- a/lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild +++ b/lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild @@ -33,6 +33,7 @@ RDEPEND=" =lxqt-base/liblxqt-$(ver_cut 1-2)* sys-auth/polkit-qt[qt5(+)] !lxqt-base/lxqt-common + !lxqt-base/lxqt-l10n " DEPEND="${RDEPEND}" diff --git a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild index aa506a5a..f787aa6c 100644 --- a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild +++ b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild @@ -37,5 +37,6 @@ RDEPEND=" =lxqt-base/liblxqt-$(ver_cut 1-2)* sys-power/upower !lxqt-base/lxqt-common + !lxqt-base/lxqt-l10n " DEPEND="${RDEPEND}" diff --git a/lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild b/lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild index eb8e1c97..44dae620 100644 --- a/lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild +++ b/lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild @@ -38,6 +38,7 @@ RDEPEND=" =lxqt-base/liblxqt-${MY_PV} =lxqt-base/lxqt-globalkeys-${MY_PV} !lxqt-base/lxqt-common + !lxqt-base/lxqt-l10n " DEPEND="${RDEPEND}" diff --git a/lxqt-base/lxqt-session/lxqt-session-9999.ebuild b/lxqt-base/lxqt-session/lxqt-session-9999.ebuild index 1d49ebfc..ef9a3b27 100644 --- a/lxqt-base/lxqt-session/lxqt-session-9999.ebuild +++ b/lxqt-base/lxqt-session/lxqt-session-9999.ebuild @@ -41,6 +41,7 @@ RDEPEND=" themes? ( =x11-themes/lxqt-themes-${MY_PV} ) udev? ( virtual/libudev ) !lxqt-base/lxqt-common + !lxqt-base/lxqt-l10n " DEPEND="${RDEPEND}" diff --git a/lxqt-base/lxqt-sudo/lxqt-sudo-9999.ebuild b/lxqt-base/lxqt-sudo/lxqt-sudo-9999.ebuild index 6714b3bc..90154671 100644 --- a/lxqt-base/lxqt-sudo/lxqt-sudo-9999.ebuild +++ b/lxqt-base/lxqt-sudo/lxqt-sudo-9999.ebuild @@ -26,5 +26,6 @@ RDEPEND=" dev-qt/qtcore:5 dev-qt/qtwidgets:5 =lxqt-base/liblxqt-$(ver_cut 1-2)* + !lxqt-base/lxqt-l10n " DEPEND="${RDEPEND}" diff --git a/media-gfx/lximage-qt/lximage-qt-9999.ebuild b/media-gfx/lximage-qt/lximage-qt-9999.ebuild index bd2bf321..a1dc7bd2 100644 --- a/media-gfx/lximage-qt/lximage-qt-9999.ebuild +++ b/media-gfx/lximage-qt/lximage-qt-9999.ebuild @@ -39,5 +39,6 @@ RDEPEND=" >=x11-libs/libfm-qt-0.12.0:= x11-libs/libX11 x11-libs/libXfixes + !lxqt-base/lxqt-l10n " DEPEND="${RDEPEND}" diff --git a/x11-libs/libfm-qt/libfm-qt-9999.ebuild b/x11-libs/libfm-qt/libfm-qt-9999.ebuild index 5dea1d3e..61b7192b 100644 --- a/x11-libs/libfm-qt/libfm-qt-9999.ebuild +++ b/x11-libs/libfm-qt/libfm-qt-9999.ebuild @@ -34,5 +34,6 @@ RDEPEND=" media-libs/libexif:= >=x11-libs/libfm-1.2.0:= x11-libs/libxcb:= + !lxqt-base/lxqt-l10n " DEPEND="${RDEPEND}" diff --git a/x11-misc/obconf-qt/obconf-qt-9999.ebuild b/x11-misc/obconf-qt/obconf-qt-9999.ebuild index 6a7d1bee..3fc2e65c 100644 --- a/x11-misc/obconf-qt/obconf-qt-9999.ebuild +++ b/x11-misc/obconf-qt/obconf-qt-9999.ebuild @@ -32,6 +32,7 @@ RDEPEND=" dev-qt/qtx11extras:5 x11-wm/openbox:3 x11-libs/libX11 + !lxqt-base/lxqt-l10n " DEPEND="${RDEPEND} sys-apps/sed diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild index 92201293..5e4cc2f9 100644 --- a/x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild +++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild @@ -37,6 +37,7 @@ RDEPEND=" virtual/eject virtual/freedesktop-icon-theme !lxqt-base/lxqt-common + !lxqt-base/lxqt-l10n " DEPEND="${RDEPEND}" -- cgit v1.2.3-65-gdbad