commit: 15a04c3b6eb631d5ea6403dba483563db507644a Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Mon Jul 3 08:23:40 2023 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Mon Jul 3 08:23:50 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15a04c3b
media-sound/qsampler: migrated latest to qt6 Closes: https://bugs.gentoo.org/908650 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> ...ler-0.9.10.ebuild => qsampler-0.9.10-r1.ebuild} | 24 +++++++--------------- media-sound/qsampler/qsampler-9999.ebuild | 22 ++++++++------------ 2 files changed, 15 insertions(+), 31 deletions(-) diff --git a/media-sound/qsampler/qsampler-0.9.10.ebuild b/media-sound/qsampler/qsampler-0.9.10-r1.ebuild similarity index 72% rename from media-sound/qsampler/qsampler-0.9.10.ebuild rename to media-sound/qsampler/qsampler-0.9.10-r1.ebuild index 38a795222015..4210fdc8b8c7 100644 --- a/media-sound/qsampler/qsampler-0.9.10.ebuild +++ b/media-sound/qsampler/qsampler-0.9.10-r1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64" fi DESCRIPTION="Graphical frontend to the LinuxSampler engine" @@ -21,11 +21,8 @@ SLOT="0" IUSE="debug +libgig" DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 + dev-qt/qtbase:6[gui,network,widgets] + dev-qt/qtsvg:6 media-libs/alsa-lib media-libs/liblscp:= x11-libs/libX11 @@ -34,24 +31,17 @@ DEPEND=" RDEPEND="${DEPEND} media-sound/linuxsampler " -BDEPEND="dev-qt/linguist-tools:5" - -PATCHES=( - "${FILESDIR}/${PN}-0.9.1-cmake-no-git.patch" -) +BDEPEND=" + dev-qt/qttools:6[linguist] +" DOCS=( ChangeLog README TRANSLATORS ) -src_prepare() { - cmake_src_prepare - - sed -e "/^find_package.*QT/s/Qt6 //" -i CMakeLists.txt || die -} - src_configure() { local mycmakeargs=( -DCONFIG_DEBUG=$(usex debug 1 0) -DCONFIG_LIBGIG=$(usex libgig 1 0) + -DCONFIG_QT6=1 ) cmake_src_configure } diff --git a/media-sound/qsampler/qsampler-9999.ebuild b/media-sound/qsampler/qsampler-9999.ebuild index 262219cfea6e..4210fdc8b8c7 100644 --- a/media-sound/qsampler/qsampler-9999.ebuild +++ b/media-sound/qsampler/qsampler-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64" fi DESCRIPTION="Graphical frontend to the LinuxSampler engine" @@ -21,11 +21,8 @@ SLOT="0" IUSE="debug +libgig" DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 + dev-qt/qtbase:6[gui,network,widgets] + dev-qt/qtsvg:6 media-libs/alsa-lib media-libs/liblscp:= x11-libs/libX11 @@ -34,20 +31,17 @@ DEPEND=" RDEPEND="${DEPEND} media-sound/linuxsampler " -BDEPEND="dev-qt/linguist-tools:5" +BDEPEND=" + dev-qt/qttools:6[linguist] +" DOCS=( ChangeLog README TRANSLATORS ) -src_prepare() { - cmake_src_prepare - - sed -e "/^find_package.*QT/s/Qt6 //" -i CMakeLists.txt || die -} - src_configure() { local mycmakeargs=( -DCONFIG_DEBUG=$(usex debug 1 0) -DCONFIG_LIBGIG=$(usex libgig 1 0) + -DCONFIG_QT6=1 ) cmake_src_configure }
