19 files changed, 13 insertions, 7 deletions
diff --git a/lxqt-base/liblxqt/liblxqt-0.12.0.ebuild b/lxqt-base/liblxqt/liblxqt-0.12.0-r1.ebuild
index 91b6ca7c..91b6ca7c 100644
--- a/lxqt-base/liblxqt/liblxqt-0.12.0.ebuild
+++ b/lxqt-base/liblxqt/liblxqt-0.12.0-r1.ebuild
diff --git a/lxqt-base/libsysstat/libsysstat-0.4.0.ebuild b/lxqt-base/libsysstat/libsysstat-0.4.0-r1.ebuild
index 8374259b..8374259b 100644
--- a/lxqt-base/libsysstat/libsysstat-0.4.0.ebuild
+++ b/lxqt-base/libsysstat/libsysstat-0.4.0-r1.ebuild
diff --git a/lxqt-base/lxqt-about/lxqt-about-0.12.0.ebuild b/lxqt-base/lxqt-about/lxqt-about-0.12.0-r1.ebuild
index 0ed585a0..0ed585a0 100644
--- a/lxqt-base/lxqt-about/lxqt-about-0.12.0.ebuild
+++ b/lxqt-base/lxqt-about/lxqt-about-0.12.0-r1.ebuild
diff --git a/lxqt-base/lxqt-admin/lxqt-admin-0.12.0.ebuild b/lxqt-base/lxqt-admin/lxqt-admin-0.12.0-r1.ebuild
index 46851848..46851848 100644
--- a/lxqt-base/lxqt-admin/lxqt-admin-0.12.0.ebuild
+++ b/lxqt-base/lxqt-admin/lxqt-admin-0.12.0-r1.ebuild
diff --git a/lxqt-base/lxqt-build-tools/lxqt-build-tools-0.4.0.ebuild b/lxqt-base/lxqt-build-tools/lxqt-build-tools-0.4.0-r1.ebuild
index 7ef58c36..ef0a3764 100644
--- a/lxqt-base/lxqt-build-tools/lxqt-build-tools-0.4.0.ebuild
+++ b/lxqt-base/lxqt-build-tools/lxqt-build-tools-0.4.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 inherit cmake-utils
 
-DESCRIPTION="Common base library for the LXQt desktop environment"
+DESCRIPTION="Various packaging tools and scripts for LXQt applications"
 HOMEPAGE="http://lxqt.org/"
 
 if [[ ${PV} = *9999* ]]; then
diff --git a/lxqt-base/lxqt-config/lxqt-config-0.12.0.ebuild b/lxqt-base/lxqt-config/lxqt-config-0.12.0-r1.ebuild
index 2a159420..2a159420 100644
--- a/lxqt-base/lxqt-config/lxqt-config-0.12.0.ebuild
+++ b/lxqt-base/lxqt-config/lxqt-config-0.12.0-r1.ebuild
diff --git a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.12.0.ebuild b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.12.0-r1.ebuild
index 6429e464..e7269a49 100644
--- a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.12.0.ebuild
+++ b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.12.0-r1.ebuild
@@ -33,6 +33,7 @@ RDEPEND="
 	x11-libs/libXext"
 DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
+	!lxqt-base/lxqt-common
 "
 
 src_configure() {
diff --git a/lxqt-base/lxqt-l10n/lxqt-l10n-0.12.0.ebuild b/lxqt-base/lxqt-l10n/lxqt-l10n-0.12.0-r1.ebuild
index 6985b89e..6985b89e 100644
--- a/lxqt-base/lxqt-l10n/lxqt-l10n-0.12.0.ebuild
+++ b/lxqt-base/lxqt-l10n/lxqt-l10n-0.12.0-r1.ebuild
diff --git a/lxqt-base/lxqt-meta/lxqt-meta-0.12.0.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-0.12.0-r1.ebuild
index f8f675c6..e8741f20 100644
--- a/lxqt-base/lxqt-meta/lxqt-meta-0.12.0.ebuild
+++ b/lxqt-base/lxqt-meta/lxqt-meta-0.12.0-r1.ebuild
@@ -13,8 +13,9 @@ KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="+about +admin +branding +filemanager +styles +icons +sddm +lximage minimal +oxygen +policykit
 	+powermanagement +ssh-askpass sudo"
 REQUIRED_USE="oxygen? ( icons )"
+DEPEND="!lxqt-base/lxqt-common"
 
-RDEPEND="
+RDEPEND="${DEPEND}
 	>=lxde-base/lxmenu-data-0.1.2
 	>=lxde-base/lxappearance-0.5.5
 	~lxqt-base/lxqt-themes-${PV}
@@ -43,8 +44,7 @@ RDEPEND="
 			sys-apps/systemd[policykit(-)] ) )
 	powermanagement? ( ~lxqt-base/lxqt-powermanagement-${PV} )
 	ssh-askpass? ( ~lxqt-base/lxqt-openssh-askpass-${PV} )
-	sudo? ( ~lxqt-base/lxqt-sudo-${PV} )
-	!lxqt-base/lxqt-common"
+	sudo? ( ~lxqt-base/lxqt-sudo-${PV} )"
 
 # Note: we prefer kde-frameworks/oxygen-icons over other icon sets, as the initial
 # install expects oxygen icons, until the user specifies otherwise (bug 543380)
diff --git a/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.12.0.ebuild b/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.12.0-r1.ebuild
index 3fbb001b..22af102b 100644
--- a/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.12.0.ebuild
+++ b/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.12.0-r1.ebuild
@@ -29,7 +29,8 @@ RDEPEND="
 	kde-frameworks/kwindowsystem:5
 	~lxqt-base/liblxqt-${PV}"
 DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
+	dev-qt/linguist-tools:5
+	!lxqt-base/lxqt-common"
 
 src_configure() {
 	local mycmakeargs=( -DPULL_TRANSLATIONS=OFF )
diff --git a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.12.0.ebuild b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.12.0-r1.ebuild
index adae0abe..adae0abe 100644
--- a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.12.0.ebuild
+++ b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.12.0-r1.ebuild
diff --git a/lxqt-base/lxqt-panel/lxqt-panel-0.12.0.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-0.12.0-r1.ebuild
index 9acd0cdd..278a953a 100644
--- a/lxqt-base/lxqt-panel/lxqt-panel-0.12.0.ebuild
+++ b/lxqt-base/lxqt-panel/lxqt-panel-0.12.0-r1.ebuild
@@ -50,7 +50,8 @@ CDEPEND="
 	volume? ( alsa? ( media-libs/alsa-lib )
 		pulseaudio? ( media-sound/pulseaudio ) )"
 DEPEND="${CDEPEND}
-	dev-qt/linguist-tools:5"
+	dev-qt/linguist-tools:5
+	!lxqt-base/lxqt-common"
 RDEPEND="${CDEPEND}
 	dev-qt/qtsvg:5
 	>=lxde-base/lxmenu-data-0.1.2"
diff --git a/lxqt-base/lxqt-policykit/lxqt-policykit-0.12.0.ebuild b/lxqt-base/lxqt-policykit/lxqt-policykit-0.12.0-r1.ebuild
index bdf453e5..ac18ba94 100644
--- a/lxqt-base/lxqt-policykit/lxqt-policykit-0.12.0.ebuild
+++ b/lxqt-base/lxqt-policykit/lxqt-policykit-0.12.0-r1.ebuild
@@ -31,6 +31,7 @@ RDEPEND="
 	sys-auth/polkit-qt[qt5(+)]"
 DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
+	!lxqt-base/lxqt-common
 	virtual/pkgconfig"
 
 src_configure() {
diff --git a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.12.0.ebuild b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.12.0-r1.ebuild
index 04a3d72c..04a3d72c 100644
--- a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.12.0.ebuild
+++ b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.12.0-r1.ebuild
diff --git a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.12.0.ebuild b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.12.0-r1.ebuild
index 0d1285d3..0d1285d3 100644
--- a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.12.0.ebuild
+++ b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.12.0-r1.ebuild
diff --git a/lxqt-base/lxqt-runner/lxqt-runner-0.12.0.ebuild b/lxqt-base/lxqt-runner/lxqt-runner-0.12.0-r1.ebuild
index f417bafd..f417bafd 100644
--- a/lxqt-base/lxqt-runner/lxqt-runner-0.12.0.ebuild
+++ b/lxqt-base/lxqt-runner/lxqt-runner-0.12.0-r1.ebuild
diff --git a/lxqt-base/lxqt-session/lxqt-session-0.12.0.ebuild b/lxqt-base/lxqt-session/lxqt-session-0.12.0-r1.ebuild
index 9a96d940..b43e706c 100644
--- a/lxqt-base/lxqt-session/lxqt-session-0.12.0.ebuild
+++ b/lxqt-base/lxqt-session/lxqt-session-0.12.0-r1.ebuild
@@ -34,6 +34,7 @@ CDEPEND="
 DEPEND="${CDEPEND}
 	dev-qt/linguist-tools:5
 	dev-util/intltool
+	!lxqt-base/lxqt-common
 	sys-devel/gettext
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
diff --git a/lxqt-base/lxqt-sudo/lxqt-sudo-0.12.0.ebuild b/lxqt-base/lxqt-sudo/lxqt-sudo-0.12.0-r1.ebuild
index dacee17d..dacee17d 100644
--- a/lxqt-base/lxqt-sudo/lxqt-sudo-0.12.0.ebuild
+++ b/lxqt-base/lxqt-sudo/lxqt-sudo-0.12.0-r1.ebuild
diff --git a/lxqt-base/lxqt-themes/lxqt-themes-0.12.0.ebuild b/lxqt-base/lxqt-themes/lxqt-themes-0.12.0-r1.ebuild
index 627faaf4..34d8d49f 100644
--- a/lxqt-base/lxqt-themes/lxqt-themes-0.12.0.ebuild
+++ b/lxqt-base/lxqt-themes/lxqt-themes-0.12.0-r1.ebuild
@@ -19,7 +19,8 @@ fi
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
-DEPEND="~lxqt-base/liblxqt-${PV}"
+DEPEND="~lxqt-base/liblxqt-${PV}
+	!lxqt-base/lxqt-common"
 RDEPEND="${DEPEND}"
 PDEPEND="~lxqt-base/lxqt-session-${PV}"