From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1A3A41580EB for ; Sun, 25 May 2025 14:35:27 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 04EF4343050 for ; Sun, 25 May 2025 14:35:27 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 031FF110276; Sun, 25 May 2025 14:35:26 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id EBF75110276 for ; Sun, 25 May 2025 14:35:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9A51C3430A9 for ; Sun, 25 May 2025 14:35:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F131CE9B for ; Sun, 25 May 2025 14:35:23 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1748183715.c6c30c638c13efd91564d34e99882bdec2ecb9b4.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/hydrogen/hydrogen-9999.ebuild X-VCS-Directories: media-sound/hydrogen/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: c6c30c638c13efd91564d34e99882bdec2ecb9b4 X-VCS-Branch: master Date: Sun, 25 May 2025 14:35:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cb160a16-07ae-4ea0-83ec-89d8ccf8e3ac X-Archives-Hash: 8d010b3df915889f739d13b7e8c3e6d1 commit: c6c30c638c13efd91564d34e99882bdec2ecb9b4 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri May 23 18:19:10 2025 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun May 25 14:35:15 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6c30c63 media-sound/hydrogen: Port to Qt6 Drop unnecessary gnuinstalldirs patch. See also: https://github.com/hydrogen-music/hydrogen/issues/2144 https://github.com/hydrogen-music/hydrogen/pull/2160 Bug: https://bugs.gentoo.org/955257 Signed-off-by: Andreas Sturmlechner gentoo.org> media-sound/hydrogen/hydrogen-9999.ebuild | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild index 03a62d321784..464da53c32f2 100644 --- a/media-sound/hydrogen/hydrogen-9999.ebuild +++ b/media-sound/hydrogen/hydrogen-9999.ebuild @@ -8,7 +8,7 @@ inherit cmake xdg DESCRIPTION="Advanced drum machine" HOMEPAGE="http://hydrogen-music.org/" -if [[ ${PV} == 9999 ]]; then +if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/${PN}-music/${PN}" else @@ -22,13 +22,9 @@ LICENSE="GPL-2 ZLIB" SLOT="0" IUSE="alsa +archive doc jack ladspa osc oss portaudio portmidi pulseaudio" -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 +DEPEND=" + dev-qt/qtbase:6[gui,network,widgets,xml] dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 media-libs/libsndfile alsa? ( media-libs/alsa-lib ) archive? ( app-arch/libarchive:= ) @@ -41,27 +37,25 @@ RDEPEND=" portmidi? ( media-libs/portmidi ) pulseaudio? ( media-libs/libpulse ) " -DEPEND="${RDEPEND} - dev-qt/qttest:5 -" +RDEPEND="${DEPEND}" BDEPEND=" - dev-qt/linguist-tools:5 + dev-qt/qttools:6[linguist] virtual/pkgconfig doc? ( app-text/doxygen ) " DOCS=( AUTHORS CHANGELOG.md DEVELOPERS.md README.md ) -PATCHES=( - "${FILESDIR}/${PN}-1.2.3-gnuinstalldirs.patch" - "${FILESDIR}/${PN}-1.3.0-cflags.patch" -) +PATCHES=( "${FILESDIR}/${PN}-1.3.0-cflags.patch" ) src_configure() { local mycmakeargs=( - -DWANT_ALSA=$(usex alsa) -DWANT_CPPUNIT=OFF -DWANT_DEBUG=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) @@ -71,7 +65,6 @@ src_configure() { -DWANT_PORTAUDIO=$(usex portaudio) -DWANT_PORTMIDI=$(usex portmidi) -DWANT_PULSEAUDIO=$(usex pulseaudio) - -DWANT_RUBBERBAND=OFF ) cmake_src_configure