gentoo auto-resync : 07:10:2024 - 04:26:50

5 files changed, 201 insertions, 67 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index b2debf8827d1..7e9f7de3ec32 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 0b145b575564..5c570c6710f7 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -2,7 +2,9 @@ AUX ardour-6.8-boost-1.85.patch 750 BLAKE2B 9a86275431cb735b32b36a570450d4b5c035
 AUX ardour-6.8-metadata.patch 568 BLAKE2B 68bb84e5249d67e88e191dbc009b7f2b696d448903a2c7164778f4fda3b526370bd2562fa627faea832da2c115d61fe8ddccf6c54c016a7f68e5cab688868984 SHA512 1bf77b0cf2692e7051a524a049add8f22feb734120d9ae58ffcf06647e8ed28249dcbe2cd124eb2354897f119a2977c6124228fc37c15e476053dc5ea4b5033c
 DIST Ardour-8.6.0.tar.bz2 17588463 BLAKE2B e8d3b603fecaf453eae9e0c2cac531a5c2d35850b282d27c25dbd22a930a6537fbbff3f1fa58f4dcc525dcc65ef8343172642d16ad473c8b80b0e373364a06cb SHA512 c4a3b6369fe1a1789ba2b5cbcfd23b6ac6b93f819b016aac2c071f1135e32826ca4f5bb99d4c3e4e1d8f91f82719ae17bcf2991eb29072c14e60f282545f934a
 DIST Ardour-8.7.0.tar.bz2 17807972 BLAKE2B 9bbe4ed5c3ad62d643518881a45b71642f5ce41c8620eb4c82befcb9df1053b08b60d3683961d78825f99e3a74222404c511073491972f138edaaaea445c6961 SHA512 cd2cdc1360b01d23cd3df62ee949ecab9d5d8da5112636438c2ef8a88d188503bcd7f09f2a5d8e07460dacbc35cecd96e8edbc748adccc50b5a90375f2f742d0
+DIST Ardour-8.8.0.tar.bz2 17809437 BLAKE2B 35c1346bcaf772c02195f8aeb1451d476a14c50bd3bded845961ca2142dec5b7e31bf39ff86ccb5d8ff6a96662b364c7923313e16d9e8d3e5dc9cdb84175d14a SHA512 dc0b8724ea495df2c2df2c133c980c7c7da57f14a438d5ecdc6e3810d5e462e7347309f932287f3cc5b7dd364cd9afd35e2ef0739877454274c37505954c5424
 EBUILD ardour-8.6-r1.ebuild 5257 BLAKE2B 48899bdee879dd24d9530e2eadb4c89a03241a1c793e87bd8ff5df3cdd25e598bc73ae2cb4dae131bfd6607957e77b42ddf0d33e996949e10887a0b8cbd6047d SHA512 d37fb303db968c36017d1e6a4a296e534bfd6280bd25ef841f5fb556ebda5b87e6bbf3d8e4b47517c28d0f99573d6d6852a5c6801960a5309a2107be2e8b4552
 EBUILD ardour-8.7.ebuild 5258 BLAKE2B 0111663a23b399284b867d47579d47f5f1e67fd0d480ed709b3f28b542db32f5e39e221553f5727ead1b28c59a60c8ec8fdec43d84efcf5448adef39a0843e2a SHA512 450b9579fda381e986333f827d4f559d442c020911ed92a7d40f3b3c4a459dccaede1a73bef8b30b2a35e9621a3712e00920fb07c64847f409d727964171973c
+EBUILD ardour-8.8.ebuild 5216 BLAKE2B 76147b3a790cccf26e6c7cb11305d2f50271f93abab3eb83d25c98559aced9ea0719e80240986d1adb0e6bf5adbf337b6422443babf2388f533aeb98a99dc188 SHA512 941298dfb89c7c86b100a4d127f8aa775b084f8c98cac7bba8d1e5a10a6922d8cb7828a5d16afd9896635e11b09bce653f3bc07bb8bb870953c1d142192a1ea1
 EBUILD ardour-9999.ebuild 5216 BLAKE2B 76147b3a790cccf26e6c7cb11305d2f50271f93abab3eb83d25c98559aced9ea0719e80240986d1adb0e6bf5adbf337b6422443babf2388f533aeb98a99dc188 SHA512 941298dfb89c7c86b100a4d127f8aa775b084f8c98cac7bba8d1e5a10a6922d8cb7828a5d16afd9896635e11b09bce653f3bc07bb8bb870953c1d142192a1ea1
 MISC metadata.xml 451 BLAKE2B 0ed571ca79f0d4b92239239982f04abf725365df169290e4a02f6d8f580cf801f70d8bc93414b4549c8172ff43864d5c49fa987caeec58e1b2331ffe01a69ae6 SHA512 504bd817356c7ee57c64193584b3fc5b3bc70f5224d5a531ac5ecf8fb974728639e75b77bb9e7c5ad77cf6099123361b9ec6211b855edb4761acd95b8cb7abcb
diff --git a/media-sound/ardour/ardour-8.8.ebuild b/media-sound/ardour/ardour-8.8.ebuild
new file mode 100644
index 000000000000..d3af7b789e27
--- /dev/null
+++ b/media-sound/ardour/ardour-8.8.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..13} )
+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="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
+	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/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/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-text/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
+
+	# 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
+		--no-ytk
+		--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/picard/Manifest b/media-sound/picard/Manifest
index b6779fd38cea..f2e265702a5d 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,6 +1,4 @@
-DIST picard-2.12.2.tar.gz 5863787 BLAKE2B f9f8fc5ffe424ce2a9aa154994e7ec1adf61a61a94769fb36d715de9ec84f1dac2d49f27d13900354adad7dcb936d62a2eba429e4ccb20dc5d6849d7f4b22adc SHA512 d06583c82737e6b5f26a639f24ecec115f29a9df7498e2632e084bcfc31f13c72965bd862c19c496fe0539c8987812d53ed9298522e37989c733af2f7ecface1
 DIST picard-2.12.3.tar.gz 5878683 BLAKE2B cdbe37842d5e2602941513835a3f28ff1ab2cad6ec37f41e6c1d8d4df2a8c957a36422414f2e4ce06d217c19b4a737fc4385022edb3052bba9cac138fa73c50b SHA512 0c4ec97f7d786982685cc095c838e46435b7305f10c33cd7d82eba006150acee934a92a182c3891e48555a7b958068782e9458ee4368cc4e3e39ad80cda858be
-EBUILD picard-2.12.2.ebuild 1458 BLAKE2B 4ea9ce9a342e40e0ec10fc604f8042188b9611f280afc5048466a44551a5f1cb7172e54c089e60b0e56d1b77054a2c6d8790d6b02ce8507f3947931047844ae5 SHA512 daea247c3f1a37cc46150515480365e0a53565c4af3edbedc76cb61e7b2d6828e856eb1fb8a4b1825104f7ea80c4c441e114c09028d5cb2c60f4e375d0ff17fb
 EBUILD picard-2.12.3.ebuild 1458 BLAKE2B 4ea9ce9a342e40e0ec10fc604f8042188b9611f280afc5048466a44551a5f1cb7172e54c089e60b0e56d1b77054a2c6d8790d6b02ce8507f3947931047844ae5 SHA512 daea247c3f1a37cc46150515480365e0a53565c4af3edbedc76cb61e7b2d6828e856eb1fb8a4b1825104f7ea80c4c441e114c09028d5cb2c60f4e375d0ff17fb
 EBUILD picard-9999.ebuild 1460 BLAKE2B 107be2b163a16c68827762f10acbd1564a803b0d633ab140c5eec7fbb1fa735ba72e12a09e7f06060f0d35fe0c3deee85fc632385530bc752eee9ec0a307572e SHA512 41d6e045267fc0d24b5cff98cfbfb4084815d2dd3dfb54c28a27b82bebfee4606df2766c82d917e256e361f009d6ab5a2985228f9428f1ac9014746ad3d9a3cb
 MISC metadata.xml 740 BLAKE2B cc09a7bf012e0b85ff55531ace5d8b187cd68fdae7d274cb640a7ae446296c2ac70bb599955d6ab2570b3eb879c28cad0cf2e70fe7339c2c0c58fd8b0dcdcac7 SHA512 321188fd4887593a3683b2c507673baa9e2faf2b46b0158338a67e72dbf5267b93c1e358ceadeacd707d6a6bb234a4fae8ef681779463c4ab5bd3b79dbd47c43
diff --git a/media-sound/picard/picard-2.12.2.ebuild b/media-sound/picard/picard-2.12.2.ebuild
deleted file mode 100644
index 6bba3ba85121..000000000000
--- a/media-sound/picard/picard-2.12.2.ebuild
+++ /dev/null
@@ -1,65 +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} )
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_EXT=1
-
-inherit distutils-r1 xdg
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/metabrainz/picard"
-	inherit git-r3
-else
-	SRC_URI="https://data.musicbrainz.org/pub/musicbrainz/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-fi
-
-DESCRIPTION="Cross-platform music tagger"
-HOMEPAGE="https://picard.musicbrainz.org"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="discid fingerprints nls"
-
-BDEPEND="
-	nls? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/fasteners[${PYTHON_USEDEP}]
-		dev-python/pyjwt[${PYTHON_USEDEP}]
-		dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		media-libs/mutagen[${PYTHON_USEDEP}]
-		discid? ( dev-python/discid[${PYTHON_USEDEP}] )
-	')
-	fingerprints? ( media-libs/chromaprint[tools] )
-"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	local build_args=(
-		--disable-autoupdate
-	)
-	if ! use nls; then
-		build_args+=( --disable-locales )
-	fi
-	distutils-r1_python_compile ${build_args[@]}
-}
-
-python_install() {
-	local install_args=(
-		--disable-autoupdate
-		--skip-build
-	)
-	if ! use nls; then
-		install_args+=( --disable-locales )
-	fi
-	distutils-r1_python_install ${install_args[@]}
-}