media-sound/lmms: Drop USE=qt5 and make it unconditional

- Drop unused eutils.eclass
- Sort DEPENDs
- Remove duplicate KEYWORDS

Gentoo-bug: 631906
Package-Manager: Portage-2.3.10, Repoman-2.3.3

2 files changed, 54 insertions, 54 deletions

diff --git a/media-sound/lmms/lmms-1.1.90.ebuild b/media-sound/lmms/lmms-1.1.90.ebuild
index 9fb0ae7c9eb9..ee2e01679215 100644
--- a/media-sound/lmms/lmms-1.1.90.ebuild
+++ b/media-sound/lmms/lmms-1.1.90.ebuild
@@ -3,14 +3,13 @@
 
 EAPI=6
 
-inherit eutils cmake-utils
+inherit cmake-utils
 
 DESCRIPTION="Cross-platform music production software"
 HOMEPAGE="https://lmms.io"
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/LMMS/lmms.git"
 	inherit git-r3
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/LMMS/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
@@ -19,17 +18,11 @@ fi
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 
-IUSE="alsa debug fluidsynth jack libgig ogg portaudio pulseaudio qt5 sdl soundio
-	stk vst"
+IUSE="alsa debug fluidsynth jack libgig ogg portaudio pulseaudio sdl soundio stk vst"
 
-RDEPEND="qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-	)
-	!qt5? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4[accessibility]
-	)
+COMMON_DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
 	>=media-libs/libsamplerate-0.1.8
 	>=media-libs/libsndfile-1.0.11
 	sci-libs/fftw:3.0
@@ -39,29 +32,36 @@ RDEPEND="qt5? (
 	fluidsynth? ( media-sound/fluidsynth )
 	jack? ( virtual/jack )
 	libgig? ( media-libs/libgig )
-	ogg? ( media-libs/libvorbis
-		media-libs/libogg )
+	ogg? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
 	portaudio? ( >=media-libs/portaudio-19_pre )
 	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl
-		>=media-libs/sdl-sound-1.0.1 )
+	sdl? (
+		media-libs/libsdl
+		>=media-libs/sdl-sound-1.0.1
+	)
 	soundio? ( media-libs/libsoundio )
 	stk? ( media-libs/stk )
-	vst? ( || ( app-emulation/wine virtual/wine ) )"
-DEPEND="${RDEPEND}
-	qt5? ( dev-qt/linguist-tools:5 )
-	>=dev-util/cmake-2.4.5"
-RDEPEND="${RDEPEND}
-	media-plugins/swh-plugins
+	vst? ( || ( app-emulation/wine virtual/wine ) )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	>=dev-util/cmake-2.4.5
+"
+RDEPEND="${COMMON_DEPEND}
+	media-libs/ladspa-cmt
+	media-plugins/calf
 	media-plugins/caps-plugins
+	media-plugins/swh-plugins
 	media-plugins/tap-plugins
-	media-plugins/calf
-	media-libs/ladspa-cmt"
+"
 
-DOCS=(README.md doc/AUTHORS)
+DOCS=( README.md doc/AUTHORS )
 
 src_configure() {
-	mycmakeargs+=(
+	local mycmakeargs+=(
 		-DUSE_WERROR=FALSE
 		-DWANT_SYSTEM_SR=TRUE
 		-DWANT_CAPS=FALSE
@@ -69,6 +69,7 @@ src_configure() {
 		-DWANT_SWH=FALSE
 		-DWANT_CMT=FALSE
 		-DWANT_CALF=FALSE
+		-DWANT_QT5=TRUE
 		-DCMAKE_INSTALL_LIBDIR=$(get_libdir)
 		-DWANT_ALSA=$(usex alsa)
 		-DWANT_JACK=$(usex jack)
@@ -76,7 +77,6 @@ src_configure() {
 		-DWANT_OGGVORBIS=$(usex ogg)
 		-DWANT_PORTAUDIO=$(usex portaudio)
 		-DWANT_PULSEAUDIO=$(usex pulseaudio)
-		-DWANT_QT5=$(usex qt5)
 		-DWANT_SDL=$(usex sdl)
 		-DWANT_SOUNDIO=$(usex soundio)
 		-DWANT_STK=$(usex stk)
diff --git a/media-sound/lmms/lmms-9999.ebuild b/media-sound/lmms/lmms-9999.ebuild
index 9fb0ae7c9eb9..ee2e01679215 100644
--- a/media-sound/lmms/lmms-9999.ebuild
+++ b/media-sound/lmms/lmms-9999.ebuild
@@ -3,14 +3,13 @@
 
 EAPI=6
 
-inherit eutils cmake-utils
+inherit cmake-utils
 
 DESCRIPTION="Cross-platform music production software"
 HOMEPAGE="https://lmms.io"
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/LMMS/lmms.git"
 	inherit git-r3
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/LMMS/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
@@ -19,17 +18,11 @@ fi
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 
-IUSE="alsa debug fluidsynth jack libgig ogg portaudio pulseaudio qt5 sdl soundio
-	stk vst"
+IUSE="alsa debug fluidsynth jack libgig ogg portaudio pulseaudio sdl soundio stk vst"
 
-RDEPEND="qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-	)
-	!qt5? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4[accessibility]
-	)
+COMMON_DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
 	>=media-libs/libsamplerate-0.1.8
 	>=media-libs/libsndfile-1.0.11
 	sci-libs/fftw:3.0
@@ -39,29 +32,36 @@ RDEPEND="qt5? (
 	fluidsynth? ( media-sound/fluidsynth )
 	jack? ( virtual/jack )
 	libgig? ( media-libs/libgig )
-	ogg? ( media-libs/libvorbis
-		media-libs/libogg )
+	ogg? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
 	portaudio? ( >=media-libs/portaudio-19_pre )
 	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl
-		>=media-libs/sdl-sound-1.0.1 )
+	sdl? (
+		media-libs/libsdl
+		>=media-libs/sdl-sound-1.0.1
+	)
 	soundio? ( media-libs/libsoundio )
 	stk? ( media-libs/stk )
-	vst? ( || ( app-emulation/wine virtual/wine ) )"
-DEPEND="${RDEPEND}
-	qt5? ( dev-qt/linguist-tools:5 )
-	>=dev-util/cmake-2.4.5"
-RDEPEND="${RDEPEND}
-	media-plugins/swh-plugins
+	vst? ( || ( app-emulation/wine virtual/wine ) )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	>=dev-util/cmake-2.4.5
+"
+RDEPEND="${COMMON_DEPEND}
+	media-libs/ladspa-cmt
+	media-plugins/calf
 	media-plugins/caps-plugins
+	media-plugins/swh-plugins
 	media-plugins/tap-plugins
-	media-plugins/calf
-	media-libs/ladspa-cmt"
+"
 
-DOCS=(README.md doc/AUTHORS)
+DOCS=( README.md doc/AUTHORS )
 
 src_configure() {
-	mycmakeargs+=(
+	local mycmakeargs+=(
 		-DUSE_WERROR=FALSE
 		-DWANT_SYSTEM_SR=TRUE
 		-DWANT_CAPS=FALSE
@@ -69,6 +69,7 @@ src_configure() {
 		-DWANT_SWH=FALSE
 		-DWANT_CMT=FALSE
 		-DWANT_CALF=FALSE
+		-DWANT_QT5=TRUE
 		-DCMAKE_INSTALL_LIBDIR=$(get_libdir)
 		-DWANT_ALSA=$(usex alsa)
 		-DWANT_JACK=$(usex jack)
@@ -76,7 +77,6 @@ src_configure() {
 		-DWANT_OGGVORBIS=$(usex ogg)
 		-DWANT_PORTAUDIO=$(usex portaudio)
 		-DWANT_PULSEAUDIO=$(usex pulseaudio)
-		-DWANT_QT5=$(usex qt5)
 		-DWANT_SDL=$(usex sdl)
 		-DWANT_SOUNDIO=$(usex soundio)
 		-DWANT_STK=$(usex stk)