gentoo auto-resync : 09:10:2023 - 18:06:43

8 files changed, 200 insertions, 18 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 8a8d91452268..d936deb5133c 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 42256a0e7bf5..cc300829eb94 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,6 +1,8 @@
 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.5.0.tar.bz2 13465772 BLAKE2B 647a6f952431c77ec6a66837e9668c75b69eb1a228c32c87772baf9a6dc18ab3554eea2c4056fe9d31c38acc398a3e55f681b66413bac49a9c8069f002c592c8 SHA512 9c3e37b5e4c12f2efd0fa567c2c0c7a324d3b4e6b86e2931b6574ca9bfdbc1e8af08bdf4d84bdc7cad9372d8015adb27410385bee0d6d8efec090bb26c319f8e
+DIST Ardour-8.0.0.tar.bz2 13828001 BLAKE2B 3ea0b6195a21f69e1ba240d728a2ebe41d55d3cd50e02daf432567b65043632ede9d095ad160ab46677124aa070751f55c66697c86ddf6978cf860cc8d8297d5 SHA512 c9354cc64c36841a7662b88cdef86438b13b5dda753cd06c76ca4839fa3532e468e3e4c42b4c09b032521438c978410a13663158c5d899295b641bcc61c041c2
 EBUILD ardour-7.5-r3.ebuild 5166 BLAKE2B e503052858d42249c77e5a8ef07dcb0078c6523d313b9003b0a4de69b6af73b8c5cc6d812381bfd57eab930bc57bd739fee2867a054acc6f3985a21619683f9d SHA512 380101687cb2437b152ff82624f26607f70b53a6f97082c1c44010542ef4078e30feb800a9269fd529d11618d521889f20a30d92e178cf5b8c4624815fde7e6c
+EBUILD ardour-8.0.ebuild 5107 BLAKE2B ac214e5a026eede5b3ca5ce4ab8d59f06e5ee22a942b623a901a2b628bc306eed65b68368e1394671f7674c36911fee184c1d357b091b7b1c6d6b5d5df202720 SHA512 4965bfae5b1048de179fdb7424f8131b7478f5a5922f272d214269478a2e89d99e8e4069ff703060d8f77f1fc9713400e2d4c6aa571be47446cfd4f9f57de201
 EBUILD ardour-9999.ebuild 5107 BLAKE2B ac214e5a026eede5b3ca5ce4ab8d59f06e5ee22a942b623a901a2b628bc306eed65b68368e1394671f7674c36911fee184c1d357b091b7b1c6d6b5d5df202720 SHA512 4965bfae5b1048de179fdb7424f8131b7478f5a5922f272d214269478a2e89d99e8e4069ff703060d8f77f1fc9713400e2d4c6aa571be47446cfd4f9f57de201
 MISC metadata.xml 451 BLAKE2B 0ed571ca79f0d4b92239239982f04abf725365df169290e4a02f6d8f580cf801f70d8bc93414b4549c8172ff43864d5c49fa987caeec58e1b2331ffe01a69ae6 SHA512 504bd817356c7ee57c64193584b3fc5b3bc70f5224d5a531ac5ecf8fb974728639e75b77bb9e7c5ad77cf6099123361b9ec6211b855edb4761acd95b8cb7abcb
diff --git a/media-sound/ardour/ardour-8.0.ebuild b/media-sound/ardour/ardour-8.0.ebuild
new file mode 100644
index 000000000000..dc901064219f
--- /dev/null
+++ b/media-sound/ardour/ardour-8.0.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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
+
+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-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
+
+	# 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"
+
+	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 "--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[@]}"
+}
+
+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/qjackctl/Manifest b/media-sound/qjackctl/Manifest
index 423a11063ffb..05b95e38d1b9 100644
--- a/media-sound/qjackctl/Manifest
+++ b/media-sound/qjackctl/Manifest
@@ -2,6 +2,6 @@ AUX qjackctl-0.9.1-disable-git.patch 468 BLAKE2B 84b9ec507f3e5c7d3524c6ee916eb77
 DIST qjackctl-0.9.11.tar.gz 1276434 BLAKE2B c9409995bc861fa942c3a39d6a71332fdec423836ea0d283097a54a13a44a4d682c3f7c8bdc481aa1374748c589cbc3d758f2ec21f087e22df3bd0756a714960 SHA512 b620530017090cca118a71f61f3923c49fda974ab5e82bc260c14fcc6f282d90f39bd9bc30652cd1de157e687c3172350e679fead43b52374832008f88a325b0
 DIST qjackctl-0.9.12.tar.gz 1277827 BLAKE2B 1fcfba82762c473f0012a137f6ddd13ae6e857d16fe8e0cad449afe6de1f1feb8a147b3441a00d20d887f1ed868e4fdddc598104f829ab2213ca8e9863c16951 SHA512 e5655b4f4a965761b81d2d08c1ad297bda6d2437aff97127dc22015f59fe916f1b10f4f492fe41b0d0678ed9de2a94de16c195ac608fb01e815e3ecb116bf958
 EBUILD qjackctl-0.9.11.ebuild 994 BLAKE2B 2b02d9b0578a99bd5a5280ad4988f735d9526362cdfe8b532fa1ab647438eccbeae9bfbb9eef4af1a76404f268ffe02f86ae22a3619fe74ee4856dcb68d66f03 SHA512 f8e59c7831f0a3cb4881979a00db4b78956d22c29075e7cb0d8b8d0a00c390ef6531ae501c9447899affc0a7a154fe44c9f3bc7724dcb27fff1bab49d461734f
-EBUILD qjackctl-0.9.12.ebuild 996 BLAKE2B 1bc8dc7d372bc2aeb2e11433635c0a66316898c80c349cfdb1fd431c757f646aafcb87d79b560e115faae0edd604f3f315988b46153cf36708fa02ebffce650f SHA512 671d8e021ba17414d759f394214afe1051eb6e9bb8dd6de0f898c6077f295d3dd4b6146d358c34c7d528cd3341cf629cb4ad54073d9c0cae93538e37392ecb31
+EBUILD qjackctl-0.9.12.ebuild 995 BLAKE2B f069ccba4471dfee17106411b7214ac46674140f7fbbb150e62a46c5180330d5b1e66ad625eb9c321910b903ed54f8311559c17ccb1c2080ca66187c930abb25 SHA512 17b7d278f99e2fa4c9cb9420ba61e1a9541562f1c58b1e325cafeef82e1ada4949a65ccd71f80d53963d323942effc30657934f1f312aa09bcb266fc2fcf9046
 EBUILD qjackctl-9999.ebuild 938 BLAKE2B 402e75717088af6d0520d5a5444818d8d2ad92339f24bf255ef1c686af727150ef9128aea0439d6792069e8dd1a2addb748b5b3d2e0ae4a5b0041b089fabb39b SHA512 a02f0d2fad5f4e4160cc71ebda9fc69c7cd7bc86cbf432aa16723c68be426fb1ed386b0f4898e53c84a1fbc6c2617b40e72535fbeeb0154f297bc6f108212174
 MISC metadata.xml 338 BLAKE2B 74efc1853779388695ea14b6ccbe8e22d88941b8fcb845f553c02bd9e052f5638b2f4629dd238272a20b76db17f0d1f30a454a4b9a27333eb1e80b8d826c0dfd SHA512 bf18f336710191bc34b33b34f3f39435a9f3c9d7c45cef4e5b0ad39c19f4a9b27ee032dd2dbf6c57daaa90ad5f9adce40c49230850b6c1d746d0691eaf5ebb10
diff --git a/media-sound/qjackctl/qjackctl-0.9.12.ebuild b/media-sound/qjackctl/qjackctl-0.9.12.ebuild
index ebda8b30bb1e..c9db3f90a3b8 100644
--- a/media-sound/qjackctl/qjackctl-0.9.12.ebuild
+++ b/media-sound/qjackctl/qjackctl-0.9.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="alsa dbus debug portaudio"
 
 BDEPEND="dev-qt/linguist-tools:5"
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index 2c23472e1b76..bc71b1c7dc1e 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,4 +1,4 @@
-AUX spotify-wrapper 1377 BLAKE2B b75890e77c96198d7bd788b5d954fb5c10095d9ca59e2c33a48003d5e559231db7aade027206da7d96f9c7bb6c19482c4d382918262e25c912cf47975a990793 SHA512 553d25d286368b1600bb7dc5c3ab681b380e9c9ff30df335796952c86e77912775ddeee03db348220e9d84a4bc32f4a8d85c7a1551a60e4155ee960b4a6d8799
+AUX spotify-wrapper 922 BLAKE2B c3ac2049a1302ec6ac0c1dc4c1514199c49a87474ef77c392e0ce5c2dba65788255e5b04dc3b8142fd8f315ebfd2491a7ec259d6347357e059fd0e2f7f777caf SHA512 f658cd4338c3072638d39d79eb6b1a5d959cfd4398dbb08d5cd108ab246c43e337ad11cf10a25c57cad12c8342526f8928c992e81d0c5c678fc5056f8832f42c
 DIST spotify-client_1.2.20.1210.g2a8a8a57_amd64.deb 124183006 BLAKE2B 32f48b06311d25ced25516e8a521dd87ebd44179fdb93b6f5ba53636eb4b53b5be97092d227968846188f0d51d9a8f6f2e350d009b797519d1cb0f252783076d SHA512 a527d6fecec9fa925d8c60e0ba8764ec8f53d3f5268d0b968d3bdeca7d367081f7faa0bcd1fe016491f15e37a1238ad40dbca1fc93b2533e0238e7a7a07f352b
-EBUILD spotify-1.2.20-r2.ebuild 3776 BLAKE2B ea7cac96bafad1bfa1cf4d2aa15a85061a73a66cd62acf5604282ea26c91d1794f0aa7d34d47a421819853d1bba6fe524dc6c4386658123ee3ffa3a35c5e9562 SHA512 42bb39179ef25f340e3ea43a3b5ebb908512338ac28c1556c01c90cc01ca154e93150c0d05691f721aa5d842ac97ef0192f4912f219df5d61ba8eba44fe73641
+EBUILD spotify-1.2.20-r3.ebuild 3688 BLAKE2B 68697650937820a6c7ea7b908ff54e3faa1e82c5e2a677685626e50ea10099b58693ae85d4931df179448ff840333ff13db668abbd94adee00acc5e0be1bffec SHA512 389febcee44203d6e26867851ab9b9988b424b321e6270b42aeba0979ed52bf097da44eae3d17acc8b5bde661e34783f2876a1f7074a3363e431935d717d20ec
 MISC metadata.xml 521 BLAKE2B 6859f340482640ec95ed103b2ca4b1e6c316509d8b87402068e1164a4efeaac9cf8ac5360ea038eb09c3682dd8e8e10a9cc872a3820c1a8341fcccaab34e0a18 SHA512 7527cfdf2d421e1bd7c156b930f980a464fad60f2ba2fafa5b79e4f04baad97a6ce3176987e8a32c8b5bcae20acf2b416812b26de1f7bc76205e0d8bee4e98e8
diff --git a/media-sound/spotify/files/spotify-wrapper b/media-sound/spotify/files/spotify-wrapper
index 862fa4c680d6..0d7295af5ca1 100644
--- a/media-sound/spotify/files/spotify-wrapper
+++ b/media-sound/spotify/files/spotify-wrapper
@@ -5,17 +5,6 @@ export LD_LIBRARY_PATH="/usr/$LIBDIR/apulse"
 if command -v spotify-dbus.py > /dev/null; then
         echo "Launching spotify with Gnome systray integration."
         spotify-dbus.py "$@"
-elif [ -e "$SPOTIFY_HOME/spotify-tray" ] > /dev/null; then
-        echo "Launching spotify with generic systray integration."
-        minimized=
-        for arg; do
-                if [ "$arg" = --minimized ]; then
-                        minimized=$arg
-                        break
-                fi
-        done
-        GDK_BACKEND="x11" "$SPOTIFY_HOME/spotify-tray" \
-                --client-path="$SPOTIFY_HOME/spotify" --toggle $minimized -- "$@"
 else
     if pgrep -f "Spotify/[0-9].[0-9].[0-9]" > /dev/null; then
         busline="org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.OpenUri ${1}"
diff --git a/media-sound/spotify/spotify-1.2.20-r2.ebuild b/media-sound/spotify/spotify-1.2.20-r3.ebuild
index 7d4a9417eaec..333a0fd7c799 100644
--- a/media-sound/spotify/spotify-1.2.20-r2.ebuild
+++ b/media-sound/spotify/spotify-1.2.20-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit desktop optfeature pax-utils unpacker xdg
+inherit desktop pax-utils unpacker xdg
 
 DESCRIPTION="Spotify is a social music platform"
 HOMEPAGE="https://www.spotify.com/download/linux/"
@@ -127,6 +127,4 @@ pkg_postinst() {
 	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
 	ewarn "To remove the cache:"
 	ewarn "rm -rf ~/.cache/spotify"
-
-	optfeature "systray integration on non-Gnome DEs" media-sound/spotify-tray
 }