4 files changed, 7 insertions, 201 deletions
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 91915ea96b76..53b5097a4a60 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -2,9 +2,7 @@ AUX ardour-6.8-metadata.patch 568 BLAKE2B 68bb84e5249d67e88e191dbc009b7f2b696d44
 AUX ardour-9.0.0-fix-clang-crash.patch 4511 BLAKE2B ad67f040fbb51f18f7feca562c6a741aad1d2e559820319e8eefb998198a78a59df61ef3ff2643be1f52f21c7e04570056af546229f395d1967f3de1d5a0fc0e SHA512 e98f83676b9c063e3a1abcd554f14e83dcfb2ff35525917dbf2e301947902ed51613826a08334df8e7a00847ff454bfdec3828176fba351075d85c28a7355319
 AUX ardour-9.0.0-fix-unlikely-buffer-overflow.patch 877 BLAKE2B 0bfe3d663bbf9d70b2616984913b3772a1adf168a1579a78f3e4fc6ac2ac27ab8b70dde7092ed4d250b9c7d65ff2771b19f14d4fc7d490ebde7e994aa4decf95 SHA512 7e03399a63ca95577a32f644406573145e8c88c7b39fe26b2aa106b5bc180dccc815252d3c9c2a623544e96b0046e18b38a5ea7fe3c6fe7edaa0dd9a5cb643eb
 AUX ardour-9.0.0-properly-check-for-syscall.patch 709 BLAKE2B 628af149268643b0f46628367296bc28bdd80b59ffabcfe6584dfb811ab931a01d2b0207821ab0277a04170a2eb3728ef21e830a822ec02ce45a157b497b2906 SHA512 15afc522495ef7ce3678de4955091500dd7bc7ef87ffda02afc58235083e55cef058a54847fd7aac89d1217e2216c951dc31a1e50b829ee4e8f6ecc6cf4793fe
-DIST Ardour-8.10.0.tar.bz2 17811275 BLAKE2B 5a0edc68c707ae1659b080cf543a4a3dc3397c91366e5c5e3084fe0095d983ba1170acc1fde49dbd6abd1b05325e2117b79fcf96c1d5c84b24d5ecc76a39cd64 SHA512 744e4bc73e35a758fce46c0035a11b430b70aa77503446a0118aba62b86b62fb293be1418ec8cfc0e1495a3a005bb71445f48661d9302a3b5bacc1a7f6c2874b
-DIST Ardour-8.11.0.tar.bz2 17812329 BLAKE2B 0683e4517afc58e258c05dfc027649f522c99b64a01353b27d32cd4ef9d474273f4c182c9d59992a0377b031d7ef7a3ff5396b73bd4f6b9b3b1bdc9eb472ae06 SHA512 17f8bb4f70da60a6d7c3934ba5a22fd3e14ff0520cbcb3fcdd151bac3ea46aef468faa2011b1110e502f71e6e7bbaa9810440c140a32e06aa5d4c0013d1628ff
-EBUILD ardour-8.10-r4.ebuild 5329 BLAKE2B c15a037e91904fb1d9f02fc9c3d4089cdbf55c8c9e2dee81f2afdb078e13ca8884380b833cfc01f396cba949fbba381d001674559f1d2e296c0e5bb43674a45e SHA512 5cdb04b34515406a613fe48d595bed6f76c5e134ec34eec51f01bf8b84227ebc4689720ec7b25e510bbf3f72ffac109f32a948ecdc6676af26840863ac1c4f4a
-EBUILD ardour-8.11.ebuild 5329 BLAKE2B 4e5f8cce1a7a5bf83e7249ca1d5c5f2feaa4ca9a20448992ba190aeee360202fe9e1c04697ef09facadca9c8befb9fb1dae77988516df5c361395c1559146715 SHA512 8c4a5ec1df4f91fde4292e60ca4b9e93dfbe5c4461e7360529918c6d092ad87af14ba7a351054ec1d824d0c83bde0362e6c7b0c73453eaa3d6f06ce31e0cc9de
-EBUILD ardour-9999.ebuild 5161 BLAKE2B c2424dcf49e79e50eb125a84a4ecc6cdee73b47dfe0998bad6026e81e201ad294f2d38d7c807b9b2250cc89a5734dff2c25409f42db0548f393b3c69864031c3 SHA512 f6e255376e0ec52f705fb7012fb93c4ca6931d198a1724ee5aa7df326f16d5169aa3ef69c296ce53bc01f0cc21225b70406d6e91d938d2c509f9aabe5da1c7a6
+DIST Ardour-8.12.0.tar.bz2 17816405 BLAKE2B 7826081746c0c4d7fd5076b681fa2fdff204af26f2af82bb048294cc916eb1a33999a8f7900edc28984868f4941cbf9d8ba1caba38e5359f4b0077e82d905834 SHA512 cc74ea3a7faa43d0620fac3e251c9f765b3bb61756a90966756245eb9acca59b043605ccb0e4d5a6165f65e1be3c63ca738b84f6613d705236b5f787bc11de53
+EBUILD ardour-8.12.ebuild 5329 BLAKE2B 4e5f8cce1a7a5bf83e7249ca1d5c5f2feaa4ca9a20448992ba190aeee360202fe9e1c04697ef09facadca9c8befb9fb1dae77988516df5c361395c1559146715 SHA512 8c4a5ec1df4f91fde4292e60ca4b9e93dfbe5c4461e7360529918c6d092ad87af14ba7a351054ec1d824d0c83bde0362e6c7b0c73453eaa3d6f06ce31e0cc9de
+EBUILD ardour-9999.ebuild 5258 BLAKE2B 32c1a7d3f826d344d5358fb22146e6fb6760a48958bfb28435e328052491c2d50eddf09351ea99094bee4157151b2387a7fbf37a0821072bafa8c166ad20a5e5 SHA512 7d27b64aaa0af4675dd35590db033f57bea0f73865da5663445c2c7174b1d82ba7784ca9645632391d60160b4664dad88c2b32c9fec267f28b5a13eae2850d69
 MISC metadata.xml 451 BLAKE2B 0ed571ca79f0d4b92239239982f04abf725365df169290e4a02f6d8f580cf801f70d8bc93414b4549c8172ff43864d5c49fa987caeec58e1b2331ffe01a69ae6 SHA512 504bd817356c7ee57c64193584b3fc5b3bc70f5224d5a531ac5ecf8fb974728639e75b77bb9e7c5ad77cf6099123361b9ec6211b855edb4761acd95b8cb7abcb
diff --git a/media-sound/ardour/ardour-8.10-r4.ebuild b/media-sound/ardour/ardour-8.10-r4.ebuild
deleted file mode 100644
index b6e3201bbb13..000000000000
--- a/media-sound/ardour/ardour-8.10-r4.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..13} python3_13t )
-PYTHON_REQ_USE='threads(+)'
-PLOCALES="ca cs de el en_GB es eu fr it ja ko nn pl pt pt_PT ru sv zh"
-inherit toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop xdg
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="https://ardour.org/"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
-	S="${WORKDIR}/Ardour-${PV}.0"
-	KEYWORDS="amd64 ~loong ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="8"
-IUSE="doc jack nls phonehome pulseaudio cpu_flags_ppc_altivec cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
-
-RDEPEND="
-	dev-cpp/cairomm:0
-	dev-cpp/glibmm:2
-	dev-cpp/pangomm:1.4
-	dev-libs/boost:=
-	dev-libs/glib:2
-	dev-libs/libsigc++:2
-	dev-libs/libxml2:2
-	media-libs/alsa-lib
-	media-libs/aubio
-	media-libs/flac:=
-	media-libs/freetype:2
-	media-libs/liblo
-	media-libs/liblrdf
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	media-libs/libsoundtouch
-	media-libs/raptor:2
-	media-libs/rubberband
-	media-libs/taglib:=
-	media-libs/vamp-plugin-sdk
-	net-libs/libwebsockets
-	net-misc/curl
-	sys-libs/readline:0=
-	sci-libs/fftw:3.0[threads]
-	virtual/libusb:1
-	x11-libs/cairo
-	x11-libs/pango
-	jack? ( virtual/jack )
-	pulseaudio? ( media-libs/libpulse )
-	media-libs/lilv
-	media-libs/sratom
-	dev-libs/sord
-	media-libs/lv2"
-#	media-libs/suil[X,gtk2] bundled suil is now used, probably because of ytk
-#	!bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle...
-
-DEPEND="${RDEPEND}
-	jack? ( virtual/jack )"
-BDEPEND="${PYTHON_DEPS}
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( app-text/doxygen[dot] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.8-metadata.patch"
-	"${FILESDIR}/${PN}-9.0.0-fix-clang-crash.patch"
-	"${FILESDIR}/${PN}-9.0.0-properly-check-for-syscall.patch"
-	"${FILESDIR}/${PN}-9.0.0-fix-unlikely-buffer-overflow.patch"
-)
-
-pkg_pretend() {
-	[[ $(tc-getLD) == *gold* ]] && (has_version sci-libs/fftw[openmp] || has_version sci-libs/fftw[threads]) && \
-		ewarn "Linking with gold linker might produce broken executable, see bug #733972"
-}
-
-src_prepare() {
-	default
-
-	# delete optimization flags
-	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
-
-	# handle arch
-	MARCH=$(get-flag march)
-	OPTFLAGS=""
-	if use cpu_flags_x86_sse; then
-		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
-			elog "You enabled sse but use an march that does not support sse!"
-			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
-		fi
-		OPTFLAGS="sse"
-	fi
-	if use cpu_flags_x86_mmx; then
-		if [[ ${MARCH} == "i486" ]]; then
-			elog "You enabled mmx with i486 set as march! You have been warned!"
-		fi
-		OPTFLAGS="${OPTFLAGS} mmx"
-	fi
-	if use cpu_flags_x86_3dnow; then
-		OPTFLAGS="${OPTFLAGS} 3dnow"
-	fi
-	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
-		-i "${S}"/wscript || die
-	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
-
-	# boost and shebang
-	append-flags "-lboost_system"
-	python_fix_shebang "${S}"/wscript
-	python_fix_shebang "${S}"/waf
-
-	# handle locales
-	my_lcmsg() {
-		rm -f {gtk2_ardour,gtk2_ardour/appdata,libs/ardour,libs/gtkmm2ext}/po/${1}.po
-	}
-	plocale_for_each_disabled_locale my_lcmsg
-}
-
-src_configure() {
-	# avoid bug https://bugs.gentoo.org/800067
-	local -x AS="$(tc-getCC) -c"
-
-	# -Werror=odr
-	# https://tracker.ardour.org/view.php?id=9649
-	# https://bugs.gentoo.org/917095
-	filter-lto
-
-	local backends="alsa,dummy"
-	use jack && backends+=",jack"
-	use pulseaudio && backends+=",pulseaudio"
-
-	tc-export CC CXX
-	local myconf=(
-		--configdir=/etc
-		--freedesktop
-		--noconfirm
-		--optimize
-		--with-backends=${backends}
-		$({ use cpu_flags_ppc_altivec || use cpu_flags_x86_sse; } && \
-			echo '' || echo "--no-fpu-optimization")
-		$(usex doc "--docs" '')
-		$(usex nls '' "--no-nls")
-		$(usex phonehome '' "--no-phone-home")
-		# not possible right now  --use-external-libs
-		# missing dependency: https://github.com/c4dm/qm-dsp
-	)
-
-	waf-utils_src_configure "${myconf[@]}"
-}
-
-src_compile() {
-	waf-utils_src_compile
-	use nls && waf-utils_src_compile i18n
-}
-
-src_install() {
-	local s
-
-	waf-utils_src_install
-
-	mv ${PN}.1 ${PN}${SLOT}.1 || die
-	doman ${PN}${SLOT}.1
-
-	for s in 16 22 32 48 256 512; do
-		newicon -s ${s} gtk2_ardour/resources/Ardour-icon_${s}px.png ardour${SLOT}.png
-	done
-
-	# the build system still installs ardour6.png files so we get rid of those to not conflict with ardour:6
-	find "${D}/usr/share/icons/" -name ardour6.png -delete
-
-	sed -i \
-		-e "s/\(^Name=\).*/\1Ardour ${SLOT}/" \
-		-e 's/;AudioEditing;/;X-AudioEditing;/' \
-		build/gtk2_ardour/ardour${SLOT}.desktop || die
-	domenu build/gtk2_ardour/ardour${SLOT}.desktop
-
-	insinto /usr/share/mime/packages
-	newins build/gtk2_ardour/ardour.xml ardour${SLOT}.xml
-	rm "${D}/usr/share/mime/packages/ardour.xml" || die
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "Please do _not_ report problems with the package to ${PN} upstream."
-	elog "If you think you've found a bug, check the upstream binary package"
-	elog "before you report anything to upstream."
-}
diff --git a/media-sound/ardour/ardour-8.11.ebuild b/media-sound/ardour/ardour-8.12.ebuild
index d657adb69b4d..d657adb69b4d 100644
--- a/media-sound/ardour/ardour-8.11.ebuild
+++ b/media-sound/ardour/ardour-8.12.ebuild
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index bbfe10e43adb..7f197538c693 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,9 @@ DESCRIPTION="Digital Audio Workstation"
 HOMEPAGE="https://ardour.org/"
 
 if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
+	# Main repo disabled for now by upstream
+	#EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
+	EGIT_REPO_URI="https://github.com/Ardour/ardour.git"
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"