gentoo auto-resync : 03:07:2023 - 16:06:11

3 files changed, 33 insertions, 14 deletions

diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest
index 1b4af375a0d8..6b3b07b92cda 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-r1.ebuild 941 BLAKE2B fa1fdbf45586394ca4097ab213b842aba2aa14d9fa15134952826daee0129d5e55d3011d3fa71f9d0d4437112089b0056c7ffa43ed8cac1f94b0d753f6dd51d5 SHA512 79b23864502681884123062b48e74046394279749a255d6e7d23b8a85e564159775628dc409a4ac3f4417f5b7de82ba80110282e3cdaea873441ef8465309d51
+EBUILD qsampler-0.9.10-r2.ebuild 1110 BLAKE2B cc1819820467f889ebe521151f3b0f0269f9725f90689a4d43544ab0d9705b3713ba9c1e3e6ea08b60d0fa682dc30ab24bf78a679ad3663bad0eb4562f37b1b6 SHA512 82b79f0ddab10540fce314264b3a1bfd07311573dc778261a58f291541af39003e1780720931d8903c0f9fa50c7f54f37e04d4cd67d366b0ab3ccc4c46f8f64b
 EBUILD qsampler-0.9.9.ebuild 1124 BLAKE2B 423634b30fce7ebdcae2f0213ca1d05a65703dba101e29d2f75459efe68c6d5c0c1fb2d3ffdf5df3720ae1dd49efcaf8cd8764b72bcff4e05a37a3a3d9b93315 SHA512 6c8355d59cb268a4d77cd53a0c6c2effe70e31745655c3b1ddbb03249d813f799714f12660817d7ff06807e096bed13cc18027f56e6b5ed877dec4e0303f925c
-EBUILD qsampler-9999.ebuild 941 BLAKE2B fa1fdbf45586394ca4097ab213b842aba2aa14d9fa15134952826daee0129d5e55d3011d3fa71f9d0d4437112089b0056c7ffa43ed8cac1f94b0d753f6dd51d5 SHA512 79b23864502681884123062b48e74046394279749a255d6e7d23b8a85e564159775628dc409a4ac3f4417f5b7de82ba80110282e3cdaea873441ef8465309d51
+EBUILD qsampler-9999.ebuild 1127 BLAKE2B fe6481616d6378b2e1ee4c93c85067679456c077dd27ffc7f648bca82afb7dfd0a0577bd8c907749b0479623695872237e012b7ac69b689d3be8e2a929226bf1 SHA512 5993759e56318b590a8ec7eef5346729ecf7a547c8f5f6ec9130b00125a92b39a6bffe5f00fbe80565072eef9b240521b43bd5bb1a0e4bf948af66243e137d47
 MISC metadata.xml 494 BLAKE2B e15f94a046f20f6430b293d548b1b9694e172b083d51542d398abf2de7beea5aa5915b670ac335bc31f797dbba71e82db55b72a93e88bfbdca8d862d9840975e SHA512 b136da53c09415395c0529c6d02d328520617737bce205ba1089725c3705ddea4be61e8208d814479976a420673498fba53caba64b5e0cb49ffe79694045f25a
diff --git a/media-sound/qsampler/qsampler-0.9.10-r1.ebuild b/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
 }