lxqt: bump eapi to 7 for all related packages

Package-Manager: Portage-2.3.61, Repoman-2.3.12
Signed-off-by: Jimi Huotari <chiitoo@gentoo.org>

22 files changed, 136 insertions, 124 deletions

diff --git a/app-arch/lxqt-archiver/lxqt-archiver-9999.ebuild b/app-arch/lxqt-archiver/lxqt-archiver-9999.ebuild
index 8ab964bf..2f849fbd 100644
--- a/app-arch/lxqt-archiver/lxqt-archiver-9999.ebuild
+++ b/app-arch/lxqt-archiver/lxqt-archiver-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit cmake-utils
 
 DESCRIPTION="A Simple and Lightweight Qt File Archiver"
@@ -18,6 +18,10 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.5.0
+"
 RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
@@ -26,10 +30,7 @@ RDEPEND="
 	dev-qt/qtx11extras:5
 	>=x11-libs/libfm-qt-0.14.0
 "
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.5.0
-"
+DEPEND="${RDEPEND}"
 
 src_configure() {
 	cmake-utils_src_configure
diff --git a/lxqt-base/liblxqt/liblxqt-9999.ebuild b/lxqt-base/liblxqt/liblxqt-9999.ebuild
index 5cc862bf..42e598a4 100644
--- a/lxqt-base/liblxqt/liblxqt-9999.ebuild
+++ b/lxqt-base/liblxqt/liblxqt-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils eapi7-ver
+inherit cmake-utils
 
 DESCRIPTION="Common base library for the LXQt desktop environment"
 HOMEPAGE="https://lxqt.org/"
@@ -20,6 +20,10 @@ LICENSE="LGPL-2.1+ BSD"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="+policykit"
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.6.0
+"
 RDEPEND="
 	>=dev-libs/libqtxdg-3.3.0
 	dev-qt/qtcore:5
@@ -32,10 +36,7 @@ RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXScrnSaver
 "
-
 DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.6.0
 	policykit? ( sys-auth/polkit-qt )
 "
 
diff --git a/lxqt-base/libsysstat/libsysstat-9999.ebuild b/lxqt-base/libsysstat/libsysstat-9999.ebuild
index df1b56b8..fe2f2307 100644
--- a/lxqt-base/libsysstat/libsysstat-9999.ebuild
+++ b/lxqt-base/libsysstat/libsysstat-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils
 
@@ -19,7 +19,6 @@ fi
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 
+BDEPEND=">=dev-util/lxqt-build-tools-0.6.0"
 RDEPEND="dev-qt/qtcore:5"
-DEPEND="${RDEPEND}
-	>=dev-util/lxqt-build-tools-0.6.0
-"
+DEPEND="${RDEPEND}"
diff --git a/lxqt-base/lxqt-about/lxqt-about-9999.ebuild b/lxqt-base/lxqt-about/lxqt-about-9999.ebuild
index 7b434b99..75f43775 100644
--- a/lxqt-base/lxqt-about/lxqt-about-9999.ebuild
+++ b/lxqt-base/lxqt-about/lxqt-about-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils eapi7-ver
+inherit cmake-utils
 
 DESCRIPTION="LXQt about dialog"
 HOMEPAGE="https://lxqt.org/"
@@ -19,6 +19,7 @@ fi
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
+BDEPEND=">=dev-util/lxqt-build-tools-0.6.0"
 RDEPEND="
 	>=dev-libs/libqtxdg-3.3.0
 	dev-qt/qtcore:5
@@ -26,6 +27,4 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	=lxqt-base/liblxqt-$(ver_cut 1-2)*
 "
-DEPEND="${RDEPEND}
-	>=dev-util/lxqt-build-tools-0.6.0
-"
+DEPEND="${RDEPEND}"
diff --git a/lxqt-base/lxqt-admin/lxqt-admin-9999.ebuild b/lxqt-base/lxqt-admin/lxqt-admin-9999.ebuild
index cd70e9ff..21736a39 100644
--- a/lxqt-base/lxqt-admin/lxqt-admin-9999.ebuild
+++ b/lxqt-base/lxqt-admin/lxqt-admin-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils eapi7-ver
+inherit cmake-utils
 
 DESCRIPTION="LXQt system administration tool"
 HOMEPAGE="https://lxqt.org/"
@@ -19,6 +19,7 @@ fi
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
+BDEPEND=">=dev-util/lxqt-build-tools-0.6.0"
 RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
@@ -27,6 +28,4 @@ RDEPEND="
 	=lxqt-base/liblxqt-$(ver_cut 1-2)*
 	kde-frameworks/kwindowsystem:5
 "
-DEPEND="${RDEPEND}
-	>=dev-util/lxqt-build-tools-0.6.0
-"
+DEPEND="${RDEPEND}"
diff --git a/lxqt-base/lxqt-config/lxqt-config-9999.ebuild b/lxqt-base/lxqt-config/lxqt-config-9999.ebuild
index 192b7300..810341ce 100644
--- a/lxqt-base/lxqt-config/lxqt-config-9999.ebuild
+++ b/lxqt-base/lxqt-config/lxqt-config-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils gnome2-utils eapi7-ver
+inherit cmake-utils gnome2-utils
 
 DESCRIPTION="LXQt system configuration control center"
 HOMEPAGE="https://lxqt.org/"
@@ -20,6 +20,10 @@ LICENSE="GPL-2 GPL-2+ GPL-3 LGPL-2 LGPL-2+ LGPL-2.1+ WTFPL-2"
 SLOT="0"
 IUSE="+monitor +touchpad"
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.6.0
+"
 RDEPEND="
 	>=dev-libs/libqtxdg-3.3.0
 	dev-qt/qtcore:5
@@ -43,10 +47,7 @@ RDEPEND="
 		x11-libs/libXext
 	)
 "
-DEPEND="${DEPEND}
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.6.0
-"
+DEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-9999.ebuild b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-9999.ebuild
index bc4e4b5d..a8088d71 100644
--- a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-9999.ebuild
+++ b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils eapi7-ver
+inherit cmake-utils
 
 DESCRIPTION="Daemon and library for global keyboard shortcuts registration"
 HOMEPAGE="https://lxqt.org/"
@@ -19,6 +19,10 @@ fi
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.6.0
+"
 RDEPEND="
 	>=dev-libs/libqtxdg-3.3.0
 	dev-qt/qtcore:5
@@ -32,7 +36,4 @@ RDEPEND="
 	x11-libs/libX11
 	!lxqt-base/lxqt-common
 "
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.6.0
-"
+DEPEND="${RDEPEND}"
diff --git a/lxqt-base/lxqt-l10n/lxqt-l10n-9999.ebuild b/lxqt-base/lxqt-l10n/lxqt-l10n-9999.ebuild
index af55c1a8..180e7fde 100644
--- a/lxqt-base/lxqt-l10n/lxqt-l10n-9999.ebuild
+++ b/lxqt-base/lxqt-l10n/lxqt-l10n-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils
 
@@ -19,8 +19,9 @@ fi
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
-RDEPEND="!~x11-misc/obconf-qt-0.9.0_p20150729"
-DEPEND="${RDEPEND}
+BDEPEND="
 	dev-qt/linguist-tools:5
 	>=dev-util/lxqt-build-tools-0.6.0
 "
+RDEPEND="!~x11-misc/obconf-qt-0.9.0_p20150729"
+DEPEND="${RDEPEND}"
diff --git a/lxqt-base/lxqt-meta/lxqt-meta-9999.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-9999.ebuild
index 2155a1d5..f113d4c4 100644
--- a/lxqt-base/lxqt-meta/lxqt-meta-9999.ebuild
+++ b/lxqt-base/lxqt-meta/lxqt-meta-9999.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit eapi7-ver
+EAPI=7
 
 DESCRIPTION="Meta ebuild for LXQt, the Lightweight Desktop Environment"
 HOMEPAGE="https://lxqt.org/"
diff --git a/lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild b/lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild
index a4beb3af..ee258c49 100644
--- a/lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild
+++ b/lxqt-base/lxqt-notificationd/lxqt-notificationd-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils eapi7-ver
+inherit cmake-utils
 
 DESCRIPTION="LXQt notification daemon and library"
 HOMEPAGE="https://lxqt.org/"
@@ -19,6 +19,10 @@ fi
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.6.0
+"
 RDEPEND="
 	>=dev-libs/libqtxdg-3.3.0
 	dev-qt/qtcore:5
@@ -29,7 +33,4 @@ RDEPEND="
 	=lxqt-base/liblxqt-$(ver_cut 1-2)*
 	!lxqt-base/lxqt-common
 "
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.6.0
-"
+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 1c4929b6..0da13230 100644
--- a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-9999.ebuild
+++ b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils eapi7-ver
+inherit cmake-utils
 
 DESCRIPTION="LXQt OpenSSH user password prompt tool"
 HOMEPAGE="https://lxqt.org/"
@@ -19,15 +19,16 @@ fi
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.6.0
+"
 RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtwidgets:5
 	=lxqt-base/liblxqt-$(ver_cut 1-2)*
 "
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.6.0
-"
+DEPEND="${RDEPEND}"
 
 src_install(){
 	cmake-utils_src_install
diff --git a/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild
index 1c8372b3..bec24119 100644
--- a/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild
+++ b/lxqt-base/lxqt-panel/lxqt-panel-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils eapi7-ver
+inherit cmake-utils
 
 DESCRIPTION="LXQt desktop panel and plugins"
 HOMEPAGE="https://lxqt.org/"
@@ -25,6 +25,11 @@ IUSE="+alsa colorpicker cpuload +desktopswitch +directorymenu dom +kbindicator +
 	+spacer statusnotifier sysstat +taskbar +tray +volume +worldclock"
 REQUIRED_USE="volume? ( || ( alsa pulseaudio ) )"
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.6.0
+	virtual/pkgconfig
+"
 RDEPEND="
 	>=dev-libs/libqtxdg-3.3.0
 	dev-qt/qtcore:5
@@ -63,11 +68,7 @@ RDEPEND="
 	)
 	!lxqt-base/lxqt-common
 "
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.6.0
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild b/lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild
index ff00a07f..d27fe6da 100644
--- a/lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild
+++ b/lxqt-base/lxqt-policykit/lxqt-policykit-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils eapi7-ver
+inherit cmake-utils
 
 DESCRIPTION="LXQt PolKit authentication agent"
 HOMEPAGE="https://lxqt.org/"
@@ -19,6 +19,11 @@ fi
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.6.0
+	virtual/pkgconfig
+"
 RDEPEND="
 	dev-libs/glib:2
 	>=dev-libs/libqtxdg-3.3.0
@@ -29,11 +34,7 @@ RDEPEND="
 	sys-auth/polkit-qt[qt5(+)]
 	!lxqt-base/lxqt-common
 "
-DEPEND="${RDEPEND}
-	>=dev-util/lxqt-build-tools-0.6.0
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
 
 src_install(){
 	cmake-utils_src_install
diff --git a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild
index eb8d0d93..ee4d28dc 100644
--- a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild
+++ b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils eapi7-ver
+inherit cmake-utils
 
 DESCRIPTION="LXQt daemon for power management and auto-suspend"
 HOMEPAGE="https://lxqt.org/"
@@ -19,6 +19,11 @@ fi
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.6.0
+	virtual/pkgconfig
+"
 RDEPEND="
 	>=dev-libs/libqtxdg-3.3.0
 	dev-qt/qtcore:5
@@ -36,8 +41,4 @@ RDEPEND="
 	)
 	!lxqt-base/lxqt-common
 "
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.6.0
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
diff --git a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-9999.ebuild b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-9999.ebuild
index 342a77fb..94944c0f 100644
--- a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-9999.ebuild
+++ b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils eapi7-ver
+inherit cmake-utils
 
 DESCRIPTION="LXQt system integration plugin for Qt"
 HOMEPAGE="https://lxqt.org/"
@@ -19,6 +19,10 @@ fi
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.6.0
+"
 RDEPEND="
 	dev-libs/libdbusmenu-qt:=[qt5(+)]
 	>=dev-libs/libqtxdg-3.3.0
@@ -29,7 +33,4 @@ RDEPEND="
 	dev-qt/qtx11extras:5
 	=x11-libs/libfm-qt-$(ver_cut 1-2)*
 "
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.6.0
-"
+DEPEND="${RDEPEND}"
diff --git a/lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild b/lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild
index 2035aeac..eb8e1c97 100644
--- a/lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild
+++ b/lxqt-base/lxqt-runner/lxqt-runner-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils eapi7-ver
+inherit cmake-utils
 
 DESCRIPTION="LXQt quick launcher"
 HOMEPAGE="https://lxqt.org/"
@@ -21,6 +21,11 @@ fi
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.6.0
+	virtual/pkgconfig
+"
 RDEPEND="
 	>=dev-cpp/muParser-2.2.3:=
 	>=dev-libs/libqtxdg-3.3.0
@@ -34,11 +39,7 @@ RDEPEND="
 	=lxqt-base/lxqt-globalkeys-${MY_PV}
 	!lxqt-base/lxqt-common
 "
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.6.0
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
 
 src_install(){
 	cmake-utils_src_install
diff --git a/lxqt-base/lxqt-session/lxqt-session-9999.ebuild b/lxqt-base/lxqt-session/lxqt-session-9999.ebuild
index 941b917d..1d49ebfc 100644
--- a/lxqt-base/lxqt-session/lxqt-session-9999.ebuild
+++ b/lxqt-base/lxqt-session/lxqt-session-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils eapi7-ver
+inherit cmake-utils
 
 DESCRIPTION="LXQT session manager"
 HOMEPAGE="https://lxqt.org/"
@@ -23,6 +23,10 @@ IUSE="+themes +udev"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.6.0
+"
 RDEPEND="
 	>=dev-libs/libqtxdg-3.3.0
 	dev-qt/qtcore:5
@@ -38,10 +42,7 @@ RDEPEND="
 	udev? ( virtual/libudev )
 	!lxqt-base/lxqt-common
 "
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.6.0
-"
+DEPEND="${RDEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/lxqt-base/lxqt-sudo/lxqt-sudo-9999.ebuild b/lxqt-base/lxqt-sudo/lxqt-sudo-9999.ebuild
index fb1d72c3..6714b3bc 100644
--- a/lxqt-base/lxqt-sudo/lxqt-sudo-9999.ebuild
+++ b/lxqt-base/lxqt-sudo/lxqt-sudo-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils eapi7-ver
+inherit cmake-utils
 
 DESCRIPTION="LXQt GUI frontend for sudo"
 HOMEPAGE="https://lxqt.org/"
@@ -19,6 +19,7 @@ fi
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
+BDEPEND=">=dev-util/lxqt-build-tools-0.6.0"
 RDEPEND="
 	app-admin/sudo
 	>=dev-libs/libqtxdg-3.3.0
@@ -26,6 +27,4 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	=lxqt-base/liblxqt-$(ver_cut 1-2)*
 "
-DEPEND="${RDEPEND}
-	>=dev-util/lxqt-build-tools-0.6.0
-"
+DEPEND="${RDEPEND}"
diff --git a/media-gfx/lximage-qt/lximage-qt-9999.ebuild b/media-gfx/lximage-qt/lximage-qt-9999.ebuild
index f05cda1c..35575df2 100644
--- a/media-gfx/lximage-qt/lximage-qt-9999.ebuild
+++ b/media-gfx/lximage-qt/lximage-qt-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils
 
@@ -19,6 +19,11 @@ fi
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.5.0
+	virtual/pkgconfig
+"
 RDEPEND="
 	dev-libs/glib:2
 	dev-qt/qtcore:5
@@ -35,8 +40,4 @@ RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXfixes
 "
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.5.0
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libfm-qt/libfm-qt-9999.ebuild b/x11-libs/libfm-qt/libfm-qt-9999.ebuild
index fc6c658a..7eada74c 100644
--- a/x11-libs/libfm-qt/libfm-qt-9999.ebuild
+++ b/x11-libs/libfm-qt/libfm-qt-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils eapi7-ver
+inherit cmake-utils
 
 DESCRIPTION="Qt port of libfm, a library providing components to build desktop file managers"
 HOMEPAGE="https://lxqt.org/"
@@ -19,6 +19,11 @@ fi
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/5"
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.5.0
+	virtual/pkgconfig
+"
 RDEPEND="
 	dev-libs/glib:2
 	dev-qt/qtcore:5
@@ -30,8 +35,4 @@ RDEPEND="
 	>=x11-libs/libfm-1.2.0:=
 	x11-libs/libxcb:=
 "
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.5.0
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
diff --git a/x11-misc/obconf-qt/obconf-qt-9999.ebuild b/x11-misc/obconf-qt/obconf-qt-9999.ebuild
index 1cdeb1ff..593e4139 100644
--- a/x11-misc/obconf-qt/obconf-qt-9999.ebuild
+++ b/x11-misc/obconf-qt/obconf-qt-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils gnome2-utils xdg-utils
 
@@ -19,6 +19,11 @@ fi
 LICENSE="GPL-2+"
 SLOT="0"
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.5.0
+	virtual/pkgconfig
+"
 RDEPEND="
 	dev-libs/glib:2
 	dev-qt/qtcore:5
@@ -29,10 +34,7 @@ RDEPEND="
 	x11-libs/libX11
 "
 DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.5.0
 	sys-apps/sed
-	virtual/pkgconfig
 "
 
 pkg_postinst() {
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild
index dc722431..6d797fe7 100644
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils eapi7-ver xdg-utils
+inherit cmake-utils xdg-utils
 
 if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
@@ -19,6 +19,10 @@ HOMEPAGE="https://lxqt.org/"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.5.0
+"
 RDEPEND="
 	dev-libs/glib:2
 	dev-qt/qtcore:5
@@ -34,10 +38,7 @@ RDEPEND="
 	virtual/freedesktop-icon-theme
 	!lxqt-base/lxqt-common
 "
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.5.0
-"
+DEPEND="${RDEPEND}"
 
 pkg_postinst() {
 	xdg_desktop_database_update