diff --git a/media-sound/carla/carla-2.5.8.ebuild b/media-sound/carla/carla-2.5.8.ebuild index 95751cd..66b74c3 100644 --- a/media-sound/carla/carla-2.5.8.ebuild +++ b/media-sound/carla/carla-2.5.8.ebuild @@ -22,7 +22,7 @@ DESCRIPTION="Fully-featured audio plugin host, supports many audio drivers and p HOMEPAGE="https://kx.studio/Applications:Carla" LICENSE="GPL-2 LGPL-3" SLOT="0" -IUSE="alsa gtk gtk2 opengl osc pulseaudio rdf sf2 sndfile X" +IUSE="alsa gtk opengl pulseaudio rdf sf2 sndfile X" REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND=" @@ -31,11 +31,6 @@ DEPEND=" virtual/jack alsa? ( media-libs/alsa-lib ) gtk? ( x11-libs/gtk+:3 ) - gtk2? ( x11-libs/gtk+:2 ) - osc? ( - media-libs/liblo - media-libs/pyliblo - ) pulseaudio? ( media-libs/libpulse ) rdf? ( dev-python/rdflib ) sf2? ( media-sound/fluidsynth ) @@ -74,9 +69,7 @@ src_compile() { DEFAULT_QT=5 HAVE_ALSA=$(usex alsa true false) HAVE_FLUIDSYNTH=$(usex sf2 true false) - HAVE_GTK2=$(usex gtk2 true false) HAVE_GTK3=$(usex gtk true false) - HAVE_LIBLO=$(usex osc true false) HAVE_PULSEAUDIO=$(usex pulseaudio true false) HAVE_SNDFILE=$(usex sndfile true false) HAVE_X11=$(usex X true false) @@ -90,7 +83,5 @@ src_compile() { src_install() { emake DESTDIR="${D}" PREFIX="/usr" "${myemakeargs[@]}" install - if ! use osc; then - find "${D}/usr" -iname "carla-control*" | xargs rm - fi + find "${D}/usr" -iname "carla-control*" | xargs rm } diff --git a/media-sound/carla/carla-9999.ebuild b/media-sound/carla/carla-9999.ebuild index 03c5c65..1e03ad6 100644 --- a/media-sound/carla/carla-9999.ebuild +++ b/media-sound/carla/carla-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -22,7 +22,7 @@ DESCRIPTION="Fully-featured audio plugin host, supports many audio drivers and p HOMEPAGE="https://kx.studio/Applications:Carla" LICENSE="GPL-2 LGPL-3" SLOT="0" -IUSE="alsa gtk gtk2 opengl osc pulseaudio rdf sf2 sndfile X" +IUSE="alsa gtk opengl pulseaudio rdf sf2 sndfile X" REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND=" @@ -31,11 +31,6 @@ DEPEND=" virtual/jack alsa? ( media-libs/alsa-lib ) gtk? ( x11-libs/gtk+:3 ) - gtk2? ( x11-libs/gtk+:2 ) - osc? ( - media-libs/liblo - media-libs/pyliblo - ) pulseaudio? ( media-libs/libpulse ) rdf? ( dev-python/rdflib ) sf2? ( media-sound/fluidsynth ) @@ -72,9 +67,7 @@ src_compile() { DEFAULT_QT=5 HAVE_ALSA=$(usex alsa true false) HAVE_FLUIDSYNTH=$(usex sf2 true false) - HAVE_GTK2=$(usex gtk2 true false) HAVE_GTK3=$(usex gtk true false) - HAVE_LIBLO=$(usex osc true false) HAVE_PULSEAUDIO=$(usex pulseaudio true false) HAVE_SNDFILE=$(usex sndfile true false) HAVE_X11=$(usex X true false) @@ -88,7 +81,5 @@ src_compile() { src_install() { emake DESTDIR="${D}" PREFIX="/usr" "${myemakeargs[@]}" install - if ! use osc; then - find "${D}/usr" -iname "carla-control*" | xargs rm - fi + find "${D}/usr" -iname "carla-control*" | xargs rm } diff --git a/media-sound/carla/metadata.xml b/media-sound/carla/metadata.xml index f354149..0e4c0a0 100644 --- a/media-sound/carla/metadata.xml +++ b/media-sound/carla/metadata.xml @@ -6,7 +6,6 @@ flewkey@2a03.party - Use gtk-2 instead of gtk-3 Enable LADSPA-RDF support Enable builtin SF2 sample support using media-sound/fluidsynth