[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     5bb13c9991c9a479a76978cdea5b0f88dbc64fca
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 26 21:26:54 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May 26 21:29:09 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bb13c99

media-sound/hydrogen: add Qt6-based 1.2.4_p20250526 (from 1.2 branch)

Bug: https://bugs.gentoo.org/955257
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-sound/hydrogen/Manifest                      |  2 ++
 ...9999.ebuild => hydrogen-1.2.4_p20250526.ebuild} | 22 +++++++++++++++-------
 media-sound/hydrogen/hydrogen-9999.ebuild          |  3 +--
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index d4cea5a4be3d..d8f9e1991e31 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1 +1,3 @@
 DIST hydrogen-1.2.4.tar.gz 14399993 BLAKE2B ed718e75d7016dae234148d3eafd676127248bbebc2f8bd98db2c6ca52e62e4df282035afba0de0692a5e4c0cceb7a920dab6d3688aec9c3793f448f8db54a7b SHA512 3f1522ac0535aa482c828382965822c6a81e5359bece93cbd7ed5029d8a1e192f187e10c5205274cc0ca5c030e958cfd062650f47fb9188f13a176dface64475
+DIST hydrogen-1.2.4_p20250526-493f5afe.tar.gz 14411800 BLAKE2B 92738e7f6c708070cad5026c15aa1408c7ca25293dcb4e386a7c799358cf135e2d29055d85dca7ba2a427510ba1b00954fa0373c24259aa3ab64ba2d78e9e055 SHA512 3f9fdd6dfaaa20d2b32f932187e1869bad1a5db7538ce1d7112bac4e795e07348d6ad7b38311bcc783de33ee63b6dc7334a7c2883c73e94bb2b5b32e18bbbc2f
+DIST hydrogen-documentation-1.2.4.tar.gz 41539683 BLAKE2B 6b4cf6bcb72941bde466665a8bb339977ebca729ab44aaafaaa5a648cea50d523010edb2be09c7c7a29db9da13ece9c774a576fa801b994697f57c9b00a1d0d6 SHA512 0ca5b10c2048d9d38f6d4fb9e7712b3c32b469cdf562dd28758437a9203ef5741c16f6a6307e27118ed2e691eab4ec87e0a18927afddd49f7dd66a68c2743034

diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-1.2.4_p20250526.ebuild
similarity index 73%
copy from media-sound/hydrogen/hydrogen-9999.ebuild
copy to media-sound/hydrogen/hydrogen-1.2.4_p20250526.ebuild
index 464da53c32f2..935bc570bc7a 100644
--- a/media-sound/hydrogen/hydrogen-9999.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.2.4_p20250526.ebuild
@@ -10,11 +10,13 @@ HOMEPAGE="http://hydrogen-music.org/"
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
+	EGIT_BRANCH="releases/1.2"
 	EGIT_REPO_URI="https://github.com/${PN}-music/${PN}"
 else
-	MY_PV=${PV/_/-}
-	SRC_URI="https://github.com/${PN}-music/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
+	COMMIT=493f5afe6206d7d68264b7111414a1e8025b6eca
+	SRC_URI="https://github.com/${PN}-music/${PN}/archive/${COMMIT}.tar.gz -> ${P}-${COMMIT:0:8}.tar.gz
+		https://github.com/${PN}-music/documentation/archive/${PV/_p*/}.tar.gz -> ${PN}-documentation-${PV/_p*/}.tar.gz"
+	S="${WORKDIR}"/${PN}-${COMMIT}
 	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 fi
 
@@ -24,7 +26,7 @@ IUSE="alsa +archive doc jack ladspa osc oss portaudio portmidi pulseaudio"
 
 DEPEND="
 	dev-qt/qtbase:6[gui,network,widgets,xml]
-	dev-qt/qtsvg:5
+	dev-qt/qtsvg:6
 	media-libs/libsndfile
 	alsa? ( media-libs/alsa-lib )
 	archive? ( app-arch/libarchive:= )
@@ -44,21 +46,27 @@ BDEPEND="
 	doc? ( app-text/doxygen )
 "
 
-DOCS=( AUTHORS CHANGELOG.md DEVELOPERS.md README.md )
+DOCS=( AUTHORS CHANGELOG.md DEVELOPERS README.md )
 
-PATCHES=( "${FILESDIR}/${PN}-1.3.0-cflags.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.2.3-cflags.patch" )
+
+src_prepare() {
+	rmdir data/doc || die
+	mv "${WORKDIR}"/documentation-${PV/_p*/} data/doc || die
+	cmake_src_prepare
+}
 
 src_configure() {
 	local mycmakeargs=(
 		-DWANT_CPPUNIT=OFF
 		-DWANT_DEBUG=OFF
+		-DWANT_LASH=OFF
 		-DWANT_RUBBERBAND=OFF
 		-DWANT_QT6=ON
 		-DWANT_ALSA=$(usex alsa)
 		-DWANT_LIBARCHIVE=$(usex archive)
 		-DWANT_JACK=$(usex jack)
 		-DWANT_LADSPA=$(usex ladspa)
-		-DWANT_LIBARCHIVE=$(usex archive)
 		-DWANT_LRDF=$(usex ladspa)
 		-DWANT_OSC=$(usex osc)
 		-DWANT_OSS=$(usex oss)

diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild
index 464da53c32f2..d3750f977e79 100644
--- a/media-sound/hydrogen/hydrogen-9999.ebuild
+++ b/media-sound/hydrogen/hydrogen-9999.ebuild
@@ -24,7 +24,7 @@ IUSE="alsa +archive doc jack ladspa osc oss portaudio portmidi pulseaudio"
 
 DEPEND="
 	dev-qt/qtbase:6[gui,network,widgets,xml]
-	dev-qt/qtsvg:5
+	dev-qt/qtsvg:6
 	media-libs/libsndfile
 	alsa? ( media-libs/alsa-lib )
 	archive? ( app-arch/libarchive:= )
@@ -58,7 +58,6 @@ src_configure() {
 		-DWANT_LIBARCHIVE=$(usex archive)
 		-DWANT_JACK=$(usex jack)
 		-DWANT_LADSPA=$(usex ladspa)
-		-DWANT_LIBARCHIVE=$(usex archive)
 		-DWANT_LRDF=$(usex ladspa)
 		-DWANT_OSC=$(usex osc)
 		-DWANT_OSS=$(usex oss)