gentoo auto-resync : 16:02:2023 - 14:04:41

3 files changed, 190 insertions, 3 deletions

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 59e3118b948c..b02acac5c36a 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -2,8 +2,10 @@ AUX ardour-6.8-metadata.patch 653 BLAKE2B 3929d825fd8de5205d0f5aa8d0172e6374ca9f
 DIST Ardour-6.9.0.tar.bz2 12297369 BLAKE2B 62037130b9f2d15a7f527b549c552a281105298dc85e3019d0f7ac09cb791f2b5460c4a7bd2f2098ccade6b87c70a16e6414691d90ec4baafeb6065f26d10a66 SHA512 ace45f5bfe6d0c9e4bb1712ae53ebaee2f15f883045650cae3ddcae251d4fd2f645ba745effb739b47c73a0568ae9e8ae443b711dd610584e04575fd9046b234
 DIST Ardour-7.1.0.tar.bz2 12731494 BLAKE2B 1473d89089b378db9d7cb665d0d3fb9980abe5344e3e35114352141116547490fba1446d61c1ff4ee1262ac114e78baec994a4671e8362a1c146ff7f6020332d SHA512 e5fb26a03059eb96df3000977544f622e30aae0772f9265f5acb7da8f88460624dfed500423786975d69a6629821340dd74a03343f2c7ff70f959434e795c0fd
 DIST Ardour-7.2.0.tar.bz2 12882609 BLAKE2B fe4912e4e6be318605f41cbd58ea51711d6ae6537c673c5534ff48a74455e54d92bcb6aa14b18b0014d8ebf4463d630e817696013b5b56255529183471a51566 SHA512 a8e1337324eed503e864f8fe3da34410b2a21e61a2b243a27ac68ac4d41b59ac3417e7713497f38f310a57b8d9885e758b99b00fec992b77756076a86f5ef7b3
+DIST Ardour-7.3.0.tar.bz2 12897398 BLAKE2B 518de10fd43220e843c775c9374347cf827562ff979a99ecdb9507f69daad642345a1c2ddec6f601511b599167a6904905dcdd25ac15f71616c3cb432897545d SHA512 4c0119768015aea447ea5c4ef15708a6440e189bd3578aca74b8ea2cac86920a8c8bd975e03f2af25108f76231d8afccf0003e6a2f8de1de28bcdce9085fe98c
 EBUILD ardour-6.9-r2.ebuild 4827 BLAKE2B 9cff3b9c3c7a9b7d3623ea87f446344400d6d3f767bd89c8f3a75ec3c1782d3a02088ee4049a8f7997ec01a295dcfaa5a53f92be9647a6dda8947d5954bd4b19 SHA512 007568f6878fb7ab1c8e07071145536cb207d5aaa7a70762ab23be9bf8b6d0b34b6f34b10cfee181adf90af4026f404bf6447d1a4a7145bb243ca03b1486209f
 EBUILD ardour-7.1.ebuild 4992 BLAKE2B a2284ab21c83f89ede3c785d451db5f290e38e67031aa565d3182e4d28fff0b6285ad7f116663487a7ac8e667b96230b02081feba0714b50dfc2a59f2b7b1080 SHA512 da55dd455ec3ec985ecd845ad236968bd91c3a0e0e9f83e29288aa16e51a001e6f97036574ba77566cd63d6b8ca414d7ce157cfff49d377fdf175e0962ae66e0
 EBUILD ardour-7.2.ebuild 4992 BLAKE2B a2284ab21c83f89ede3c785d451db5f290e38e67031aa565d3182e4d28fff0b6285ad7f116663487a7ac8e667b96230b02081feba0714b50dfc2a59f2b7b1080 SHA512 da55dd455ec3ec985ecd845ad236968bd91c3a0e0e9f83e29288aa16e51a001e6f97036574ba77566cd63d6b8ca414d7ce157cfff49d377fdf175e0962ae66e0
-EBUILD ardour-9999.ebuild 4992 BLAKE2B a2284ab21c83f89ede3c785d451db5f290e38e67031aa565d3182e4d28fff0b6285ad7f116663487a7ac8e667b96230b02081feba0714b50dfc2a59f2b7b1080 SHA512 da55dd455ec3ec985ecd845ad236968bd91c3a0e0e9f83e29288aa16e51a001e6f97036574ba77566cd63d6b8ca414d7ce157cfff49d377fdf175e0962ae66e0
+EBUILD ardour-7.3.ebuild 4984 BLAKE2B 404ce69d34defd688368027838f97df5ac69cb5608a275ee6d05b7254b3109c7c5c8b33ffcdfc8d59670c6b05f666dd5dc987bec61ed94ad5f62685eded5dd3a SHA512 4ae07b7ade9c09da92aa8c04a3aa48b8d12233dda699fdadb3a1487cd71c18ef78401c2e351bbdef0451017dfdcacb4256691fb6491a75ab6c68bfeda2219765
+EBUILD ardour-9999.ebuild 4984 BLAKE2B 404ce69d34defd688368027838f97df5ac69cb5608a275ee6d05b7254b3109c7c5c8b33ffcdfc8d59670c6b05f666dd5dc987bec61ed94ad5f62685eded5dd3a SHA512 4ae07b7ade9c09da92aa8c04a3aa48b8d12233dda699fdadb3a1487cd71c18ef78401c2e351bbdef0451017dfdcacb4256691fb6491a75ab6c68bfeda2219765
 MISC metadata.xml 451 BLAKE2B 0ed571ca79f0d4b92239239982f04abf725365df169290e4a02f6d8f580cf801f70d8bc93414b4549c8172ff43864d5c49fa987caeec58e1b2331ffe01a69ae6 SHA512 504bd817356c7ee57c64193584b3fc5b3bc70f5224d5a531ac5ecf8fb974728639e75b77bb9e7c5ad77cf6099123361b9ec6211b855edb4761acd95b8cb7abcb
diff --git a/media-sound/ardour/ardour-7.3.ebuild b/media-sound/ardour/ardour-7.3.ebuild
new file mode 100644
index 000000000000..4c32a9d5eadb
--- /dev/null
+++ b/media-sound/ardour/ardour-7.3.ebuild
@@ -0,0 +1,185 @@
+# 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="cs de el en_GB es eu fr it ja 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 ~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
+	dev-libs/libxslt
+	>=gnome-base/libgnomecanvas-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-sound/pulseaudio )
+	media-libs/lilv
+	media-libs/sratom
+	dev-libs/sord
+	media-libs/suil[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"
+)
+
+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-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 2fb765891251..4c32a9d5eadb 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE='threads(+)'
 PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh"
@@ -87,7 +87,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	xdg_src_prepare
+	default
 
 	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
 	MARCH=$(get-flag march)