gentoo auto-resync : 03:10:2023 - 23:49:49

4 files changed, 29 insertions, 201 deletions

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 494d6dc22c92..632ce55cc6fd 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,8 +1,6 @@
 AUX ardour-6.8-metadata.patch 568 BLAKE2B 68bb84e5249d67e88e191dbc009b7f2b696d448903a2c7164778f4fda3b526370bd2562fa627faea832da2c115d61fe8ddccf6c54c016a7f68e5cab688868984 SHA512 1bf77b0cf2692e7051a524a049add8f22feb734120d9ae58ffcf06647e8ed28249dcbe2cd124eb2354897f119a2977c6124228fc37c15e476053dc5ea4b5033c
 AUX ardour-7.4-libc++.patch 1494 BLAKE2B 8cd7d973e098fe3dce358208f13c3f11076dbf24308f67a3964c458346d1a90d1a7d77ab03b1b092219ad7f729f248b880d166807e84ccdae1916076fa307ec6 SHA512 927999c2a74fb4e557c17931c559790af8bab9dbfd074ef4ea22c44649b1f5c823ee5e1c67a22f393aff7020db3a45040078b6a769d130a0fc62c85729dc0366
-DIST Ardour-7.4.0.tar.bz2 12940403 BLAKE2B 4f3ca19e44a9ab5908fb6a6cf29adefb6a7abf4a9f43f810f0a0fdbe8fc1e11cdb49e2a66336fddb0e5d49a0780ac5af7b9363d2f14d9e309b787ceb8c8dd060 SHA512 2533167986a8b7550848e03475931fcd1409f188abed0c7c2a5999869995a73576976d02080cf2ac310113b57ff62d39031615c92cb4fafbe5d96edfc3a4ec45
 DIST Ardour-7.5.0.tar.bz2 13465772 BLAKE2B 647a6f952431c77ec6a66837e9668c75b69eb1a228c32c87772baf9a6dc18ab3554eea2c4056fe9d31c38acc398a3e55f681b66413bac49a9c8069f002c592c8 SHA512 9c3e37b5e4c12f2efd0fa567c2c0c7a324d3b4e6b86e2931b6574ca9bfdbc1e8af08bdf4d84bdc7cad9372d8015adb27410385bee0d6d8efec090bb26c319f8e
-EBUILD ardour-7.4-r3.ebuild 4982 BLAKE2B 8716d9d6c2fc2bd4f5c9aff36c997c358a72574598d86ef7a5a814a5858e1bb20b32328ed43cf7d5cda3c6ae6a402b12d274c875bce09b6f2af08e9d2312503d SHA512 00eae08353e3114bea3480fae1a86ffa1a01a15c35b7416dc8458bf20e5eac057e4deac53db689a459c72b9bd27b97daf78e8afad7d2fc5e320a251c28bb721c
-EBUILD ardour-7.5-r1.ebuild 4990 BLAKE2B 3ae010d64b28ad4cb2f654698f104775782cd31178315a5ce35ded6fe66e8c760d7ab18af032b2e79ee3aba963a54cfa4645bb5f786314a06ba56dbfb60545f3 SHA512 96bd96ee70f72a4033295783ae6d68fadb4e18ab809f4a864c55a53b5f00b1f72a60607b9210e08b05772fa31dc77a1d8bdb898e4183a4949764da80e2328c7a
-EBUILD ardour-9999.ebuild 4802 BLAKE2B 893c6384cdb21ab61df3731bd7f6af7724afd1610960f55d5009eeb5dadf25dfa8f6a46e9006d17fa18b40d5bb6666ca2770312e56ac0d0dbe159fbcbc8f70df SHA512 d6199923b95f2bd96ac80560ebd282d91cfb164def578fdef47614ed91bc1e8de99256224f2c8356e83813d780717ed547a2c7c952dcfcec1f2e1f5df5702872
+EBUILD ardour-7.5-r2.ebuild 5142 BLAKE2B b19ac01e7f27c13cdb634105046862416cdf1a857cb5fb3171840b6e927724266520309f52b5586e8d84d8019932e05de2858f694ea5b001b8502195d821ef18 SHA512 abe5573573e0d4b8ef5a68b7b43a8a4741682377fde00fd1a643af43fc8b0ff6c01a8fcb2fd81a0f54bd9f56104cd24874965fdf97505d266271a8d2256ea4ca
+EBUILD ardour-9999.ebuild 5107 BLAKE2B ac214e5a026eede5b3ca5ce4ab8d59f06e5ee22a942b623a901a2b628bc306eed65b68368e1394671f7674c36911fee184c1d357b091b7b1c6d6b5d5df202720 SHA512 4965bfae5b1048de179fdb7424f8131b7478f5a5922f272d214269478a2e89d99e8e4069ff703060d8f77f1fc9713400e2d4c6aa571be47446cfd4f9f57de201
 MISC metadata.xml 451 BLAKE2B 0ed571ca79f0d4b92239239982f04abf725365df169290e4a02f6d8f580cf801f70d8bc93414b4549c8172ff43864d5c49fa987caeec58e1b2331ffe01a69ae6 SHA512 504bd817356c7ee57c64193584b3fc5b3bc70f5224d5a531ac5ecf8fb974728639e75b77bb9e7c5ad77cf6099123361b9ec6211b855edb4761acd95b8cb7abcb
diff --git a/media-sound/ardour/ardour-7.5-r1.ebuild b/media-sound/ardour/ardour-7.5-r1.ebuild
deleted file mode 100644
index b4284c57729e..000000000000
--- a/media-sound/ardour/ardour-7.5-r1.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-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
-	KEYWORDS="amd64 ~loong ~x86"
-	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
-	S="${WORKDIR}/Ardour-${PV}.0"
-fi
-
-LICENSE="GPL-2"
-SLOT="7"
-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/glibmm:2
-	dev-cpp/gtkmm:2.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/libart_lgpl
-	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-misc/curl
-	sys-libs/readline:0=
-	sci-libs/fftw:3.0[threads]
-	virtual/libusb:1
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/pango
-	jack? ( virtual/jack )
-	pulseaudio? ( media-libs/libpulse )
-	media-libs/lilv
-	media-libs/sratom
-	dev-libs/sord
-	media-libs/suil[X,gtk2]
-	media-libs/lv2"
-#	!bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle...
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )
-	jack? ( virtual/jack )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.8-metadata.patch"
-	"${FILESDIR}/${PN}-7.4-libc++.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"
-}
-
-pkg_setup() {
-	if has_version \>=dev-libs/libsigc++-2.6 ; then
-		append-cxxflags -std=c++11
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
-	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
-	append-flags "-lboost_system"
-	python_fix_shebang "${S}"/wscript
-	python_fix_shebang "${S}"/waf
-	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"
-
-	local backends="alsa,dummy"
-	use jack && backends+=",jack"
-	use pulseaudio && backends+=",pulseaudio"
-
-	tc-export CC CXX
-	mkdir -p "${D}"
-	local myconf=(
-		--configdir=/etc
-		--freedesktop
-		--noconfirm
-		--optimize
-		--with-backends=${backends}
-		$({ use cpu_flags_ppc_altivec || use cpu_flags_x86_sse; } && \
-			echo "--fpu-optimization" || echo "--no-fpu-optimization")
-		$(usex doc "--docs" '')
-		$(usex nls "--nls" "--no-nls")
-		$(usex phonehome "--phone-home" "--no-phone-home")
-		# not possible right now  --use-external-libs
-	)
-
-	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
-}
-
-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-7.4-r3.ebuild b/media-sound/ardour/ardour-7.5-r2.ebuild
index c9ac3af6d6f0..82c6d9e313d4 100644
--- a/media-sound/ardour/ardour-7.4-r3.ebuild
+++ b/media-sound/ardour/ardour-7.5-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 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
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
 	inherit git-r3
 else
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ~loong x86"
 	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi
@@ -35,7 +35,6 @@ RDEPEND="
 	media-libs/aubio
 	media-libs/flac:=
 	media-libs/freetype:2
-	media-libs/libart_lgpl
 	media-libs/liblo
 	media-libs/liblrdf
 	media-libs/libsamplerate
@@ -89,7 +88,10 @@ pkg_setup() {
 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
@@ -111,9 +113,13 @@ src_prepare() {
 	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
 	}
@@ -129,7 +135,6 @@ src_configure() {
 	use pulseaudio && backends+=",pulseaudio"
 
 	tc-export CC CXX
-	mkdir -p "${D}"
 	local myconf=(
 		--configdir=/etc
 		--freedesktop
@@ -142,6 +147,7 @@ src_configure() {
 		$(usex nls "--nls" "--no-nls")
 		$(usex phonehome "--phone-home" "--no-phone-home")
 		# not possible right now  --use-external-libs
+		# missing dependency: https://github.com/c4dm/qm-dsp
 	)
 
 	waf-utils_src_configure "${myconf[@]}"
@@ -175,6 +181,7 @@ src_install() {
 
 	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() {
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index d38fad48fe22..dc901064219f 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 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
@@ -21,8 +21,8 @@ else
 fi
 
 LICENSE="GPL-2"
-SLOT="7"
-IUSE="doc jack phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+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/glibmm:2
@@ -35,7 +35,6 @@ RDEPEND="
 	media-libs/aubio
 	media-libs/flac:=
 	media-libs/freetype:2
-	media-libs/libart_lgpl
 	media-libs/liblo
 	media-libs/liblrdf
 	media-libs/libsamplerate
@@ -45,6 +44,7 @@ RDEPEND="
 	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]
@@ -88,7 +88,10 @@ pkg_setup() {
 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
@@ -110,9 +113,13 @@ src_prepare() {
 	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
 	}
@@ -128,18 +135,19 @@ src_configure() {
 	use pulseaudio && backends+=",pulseaudio"
 
 	tc-export CC CXX
-	mkdir -p "${D}"
 	local myconf=(
 		--configdir=/etc
 		--freedesktop
 		--noconfirm
 		--optimize
 		--with-backends=${backends}
-		--no-fpu-optimization
+		$({ use cpu_flags_ppc_altivec || use cpu_flags_x86_sse; } && \
+			echo '' || echo "--no-fpu-optimization")
 		$(usex doc "--docs" '')
-		--no-nls
+		$(usex nls '' "--no-nls")
 		$(usex phonehome "--phone-home" "--no-phone-home")
 		# not possible right now  --use-external-libs
+		# missing dependency: https://github.com/c4dm/qm-dsp
 	)
 
 	waf-utils_src_configure "${myconf[@]}"
@@ -173,6 +181,7 @@ src_install() {
 
 	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() {