gentoo auto-resync : 03:07:2023 - 10:05:34

3 files changed, 17 insertions, 33 deletions

diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest
index dd52ab956daf..1b4af375a0d8 100644
--- a/media-sound/qsampler/Manifest
+++ b/media-sound/qsampler/Manifest
@@ -1,7 +1,7 @@
 AUX qsampler-0.9.1-cmake-no-git.patch 468 BLAKE2B b8b53ea84160b7baf0f89a848ae5fad9ef3a51f95b6baf856e17639add1f773c510569a7a659d2db482110de945cb86ee73583ba53c53818482209c157e18f79 SHA512 7a500986365218898f70b2f0f88ed04da1f63156571d05c5ba83ffd4c6bef59436c4e0f0ed6152cd8a919368e84270b3704d615e368d880d8757c277fee5f8eb
 DIST qsampler-0.9.10.tar.gz 222310 BLAKE2B 1fc9c4d063dcce9f3cd69e74e0205b4585e2609eb09fea409fccb87560f4eb767ce322b9dc6d18c3e7ae79c5eff7d06a3bc4c408f6880c161f34d9d93f7ca0fd SHA512 599db13d35a0cf25e5d5fcd02a8fe7995500552c2f2b298883395af9876ecd7fd5aca4528fa8aa5dcd678038ea8704b69131df95c7d9de8061a2c0d163ccbde9
 DIST qsampler-0.9.9.tar.gz 220746 BLAKE2B 9c062b21655bc8fd484663a4c439b92c3bf554a1eb3648051f89bb97388740eea13c56b23a584c0c3f02ce150d2400a007dbaf1ad7a5752ab2366e9b2be3d6ab SHA512 0553a158cb257ce35fe784d69e4ac654cd3bd096287e21476ab7eca6369c2f415a8f317d2ae155cb6a475e68dfde958b93348f1d24e33f13e18bd408f3901db9
-EBUILD qsampler-0.9.10.ebuild 1125 BLAKE2B ffd653a06b30cd9ee1e191a940509bbd62b59b89658e5cacb2bd427610e62a7b1dd094f53406501cd29498d1753ee52ca8c1e5b335a98d97e08435ecc3d5a0bc SHA512 de8cceb65dd96352e261cff78663b1f87501a228f5201f130facc74d573a920f22a2d0c57ba815ce022b5820ddf3a8d2e731170c9f986ede5ec19d528fae0fb7
+EBUILD qsampler-0.9.10-r1.ebuild 941 BLAKE2B fa1fdbf45586394ca4097ab213b842aba2aa14d9fa15134952826daee0129d5e55d3011d3fa71f9d0d4437112089b0056c7ffa43ed8cac1f94b0d753f6dd51d5 SHA512 79b23864502681884123062b48e74046394279749a255d6e7d23b8a85e564159775628dc409a4ac3f4417f5b7de82ba80110282e3cdaea873441ef8465309d51
 EBUILD qsampler-0.9.9.ebuild 1124 BLAKE2B 423634b30fce7ebdcae2f0213ca1d05a65703dba101e29d2f75459efe68c6d5c0c1fb2d3ffdf5df3720ae1dd49efcaf8cd8764b72bcff4e05a37a3a3d9b93315 SHA512 6c8355d59cb268a4d77cd53a0c6c2effe70e31745655c3b1ddbb03249d813f799714f12660817d7ff06807e096bed13cc18027f56e6b5ed877dec4e0303f925c
-EBUILD qsampler-9999.ebuild 1066 BLAKE2B b0a45cb8bbb7411501d30139b4943537f8dc88efab7191d3e2d26f2f0b197e4f9f93e2b1244e579be535da988306710dc4a5239e0464ba8c25ef04be8e08611a SHA512 9ce670ceefca88a1d33d66ab16132086c482aff2dd2ba6f47bf21e676ee19b92369ac629d29fa2bd22c575aea5290cb6082973c8571fdbe2e3f3d17a91513d76
+EBUILD qsampler-9999.ebuild 941 BLAKE2B fa1fdbf45586394ca4097ab213b842aba2aa14d9fa15134952826daee0129d5e55d3011d3fa71f9d0d4437112089b0056c7ffa43ed8cac1f94b0d753f6dd51d5 SHA512 79b23864502681884123062b48e74046394279749a255d6e7d23b8a85e564159775628dc409a4ac3f4417f5b7de82ba80110282e3cdaea873441ef8465309d51
 MISC metadata.xml 494 BLAKE2B e15f94a046f20f6430b293d548b1b9694e172b083d51542d398abf2de7beea5aa5915b670ac335bc31f797dbba71e82db55b72a93e88bfbdca8d862d9840975e SHA512 b136da53c09415395c0529c6d02d328520617737bce205ba1089725c3705ddea4be61e8208d814479976a420673498fba53caba64b5e0cb49ffe79694045f25a
diff --git a/media-sound/qsampler/qsampler-0.9.10.ebuild b/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
 }