commit: 20ccf80f7c32366e81945ae24298654345816b59
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 3 08:43:28 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Jul 3 08:43:55 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20ccf80f
media-sound/qsampler: reintroduced support for qt5
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
...-0.9.10-r1.ebuild => qsampler-0.9.10-r2.ebuild} | 21 +++++++++++++++------
media-sound/qsampler/qsampler-9999.ebuild | 22 ++++++++++++++++------
2 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/media-sound/qsampler/qsampler-0.9.10-r1.ebuild
b/media-sound/qsampler/qsampler-0.9.10-r2.ebuild
similarity index 72%
rename from media-sound/qsampler/qsampler-0.9.10-r1.ebuild
rename to media-sound/qsampler/qsampler-0.9.10-r2.ebuild
index 4210fdc8b8c7..697cc016c524 100644
--- a/media-sound/qsampler/qsampler-0.9.10-r1.ebuild
+++ b/media-sound/qsampler/qsampler-0.9.10-r2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
else
SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
- KEYWORDS="~amd64"
+ KEYWORDS="~amd64 ~x86"
fi
DESCRIPTION="Graphical frontend to the LinuxSampler engine"
@@ -18,21 +18,30 @@ HOMEPAGE="https://qsampler.sourceforge.io/
https://www.linuxsampler.org/";
LICENSE="GPL-2"
SLOT="0"
-IUSE="debug +libgig"
+IUSE="debug +libgig qt6"
DEPEND="
- dev-qt/qtbase:6[gui,network,widgets]
- dev-qt/qtsvg:6
media-libs/alsa-lib
media-libs/liblscp:=
x11-libs/libX11
libgig? ( media-libs/libgig:= )
+ qt6? (
+ dev-qt/qtbase:6[gui,network,widgets]
+ dev-qt/qtsvg:6
+ )
+ !qt6? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ )
"
RDEPEND="${DEPEND}
media-sound/linuxsampler
"
BDEPEND="
- dev-qt/qttools:6[linguist]
+ qt6? ( dev-qt/qttools:6[linguist] )
+ !qt6? ( dev-qt/linguist-tools:5 )
"
DOCS=( ChangeLog README TRANSLATORS )
@@ -41,7 +50,7 @@ src_configure() {
local mycmakeargs=(
-DCONFIG_DEBUG=$(usex debug 1 0)
-DCONFIG_LIBGIG=$(usex libgig 1 0)
- -DCONFIG_QT6=1
+ -DCONFIG_QT6=$(usex qt6 1 0)
)
cmake_src_configure
}
diff --git a/media-sound/qsampler/qsampler-9999.ebuild
b/media-sound/qsampler/qsampler-9999.ebuild
index 4210fdc8b8c7..202520b3f67b 100644
--- a/media-sound/qsampler/qsampler-9999.ebuild
+++ b/media-sound/qsampler/qsampler-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
else
SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
- KEYWORDS="~amd64"
+ KEYWORDS="~amd64 ~x86"
fi
DESCRIPTION="Graphical frontend to the LinuxSampler engine"
@@ -18,21 +18,31 @@ HOMEPAGE="https://qsampler.sourceforge.io/
https://www.linuxsampler.org/";
LICENSE="GPL-2"
SLOT="0"
-IUSE="debug +libgig"
+IUSE="debug +libgig qt6"
DEPEND="
- dev-qt/qtbase:6[gui,network,widgets]
- dev-qt/qtsvg:6
media-libs/alsa-lib
media-libs/liblscp:=
x11-libs/libX11
libgig? ( media-libs/libgig:= )
+ qt6? (
+ dev-qt/qtbase:6[gui,network,widgets]
+ dev-qt/qtsvg:6
+ )
+ !qt6? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ )
"
RDEPEND="${DEPEND}
media-sound/linuxsampler
"
BDEPEND="
- dev-qt/qttools:6[linguist]
+ qt6? ( dev-qt/qttools:6[linguist] )
+ !qt6? ( dev-qt/linguist-tools:5 )
"
DOCS=( ChangeLog README TRANSLATORS )
@@ -41,7 +51,7 @@ src_configure() {
local mycmakeargs=(
-DCONFIG_DEBUG=$(usex debug 1 0)
-DCONFIG_LIBGIG=$(usex libgig 1 0)
- -DCONFIG_QT6=1
+ -DCONFIG_QT6=$(usex qt6 1 0)
)
cmake_src_configure
}
