gentoo auto-resync : 15:12:2023 - 14:48:25

3 files changed, 0 insertions, 246 deletions

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index bc37fd81be29..888dfbdc6045 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,9 +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.5.0.tar.bz2 13465772 BLAKE2B 647a6f952431c77ec6a66837e9668c75b69eb1a228c32c87772baf9a6dc18ab3554eea2c4056fe9d31c38acc398a3e55f681b66413bac49a9c8069f002c592c8 SHA512 9c3e37b5e4c12f2efd0fa567c2c0c7a324d3b4e6b86e2931b6574ca9bfdbc1e8af08bdf4d84bdc7cad9372d8015adb27410385bee0d6d8efec090bb26c319f8e
 DIST Ardour-8.1.0.tar.bz2 13835817 BLAKE2B 1d1e048ea8a23ba0a6b6cabda7c3d21ff9630ea02d70025fc414661612f8d674ffc2143578b3cd9cb43240a0fb823d731bbe14eac6b33816047ce4b04c4ff09f SHA512 d8e534b67b0b7daba0c6b384cb718d077739c538ee3371b3dd415589b34d03bdaf6270e8e2f953c6fd404ac52930a4e485cf0639b02fd5681a7b38584f5ce14c
 DIST Ardour-8.2.0.tar.bz2 13897958 BLAKE2B 54916b2f0ac3925f160df9536db61b1ece4ace3f9f4a09880c00661e328835a32c04a8faa2b04bb3fe34aeeb97064e0139f4e19524be1a17f33d7e773b893e1b SHA512 62962929201c649a0028c2cfc1e7e6acce3ab9ee24adbc5ebb5a7c3d70f73430c579801788f696769afd2d14d766eb2ef4936b5957dce2288a30cf671ca62ee1
-EBUILD ardour-7.5-r3.ebuild 5166 BLAKE2B e503052858d42249c77e5a8ef07dcb0078c6523d313b9003b0a4de69b6af73b8c5cc6d812381bfd57eab930bc57bd739fee2867a054acc6f3985a21619683f9d SHA512 380101687cb2437b152ff82624f26607f70b53a6f97082c1c44010542ef4078e30feb800a9269fd529d11618d521889f20a30d92e178cf5b8c4624815fde7e6c
 EBUILD ardour-8.1.ebuild 5094 BLAKE2B ed716332e1a56c66ba04086e765d80fa2fbb32d96af58a9c0829c1c58243caa1100e5f40aae0ffd402a473d016dcecc8d72d944a9a36b393be4cef4c235074d9 SHA512 d6164d18d9ca4f491edc00859704a060d16c8659b148ac42fb748507e8660dd190ced1654f965c768dec297b678fe834fdcbe158ea73e69da55e2e51817cb815
 EBUILD ardour-8.2.ebuild 5095 BLAKE2B 484c68044d35f713409e8a4848d5d133871966296759c33595e8b7c6664c9f44d5537314865b37e733df72e05347055b0448d3c024bb39ead9e6de8f77e7159e SHA512 d4b25737d33ec98454dbf309f929264b298b1a904c5fed73c558e574f87194465a01d00a616ec8a2c3bbb02ce0750dd14ec98f516ef490cf2d9a46b5078b8e96
 EBUILD ardour-9999.ebuild 5095 BLAKE2B 484c68044d35f713409e8a4848d5d133871966296759c33595e8b7c6664c9f44d5537314865b37e733df72e05347055b0448d3c024bb39ead9e6de8f77e7159e SHA512 d4b25737d33ec98454dbf309f929264b298b1a904c5fed73c558e574f87194465a01d00a616ec8a2c3bbb02ce0750dd14ec98f516ef490cf2d9a46b5078b8e96
diff --git a/media-sound/ardour/ardour-7.5-r3.ebuild b/media-sound/ardour/ardour-7.5-r3.ebuild
deleted file mode 100644
index dbd8b4331e81..000000000000
--- a/media-sound/ardour/ardour-7.5-r3.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# 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="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/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"
-	"${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
-
-	# 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 "--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
-		# 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/files/ardour-7.4-libc++.patch b/media-sound/ardour/files/ardour-7.4-libc++.patch
deleted file mode 100644
index 44d8b2ccca47..000000000000
--- a/media-sound/ardour/files/ardour-7.4-libc++.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From https://github.com/Ardour/ardour/pull/822/commits/c2ac82bfbacc583c49b306826dedec754633bbe7 Mon Sep 17 00:00:00 2001
-From: Violet Purcell <vimproved@inventati.org>
-Date: Thu, 21 Sep 2023 21:09:30 -0400
-Subject: [PATCH] Backport VST3 libc++ fix on linux
-
-LLVM libc++ does not have the ext/atomicity.h header. This fix is copied
-from the upstream vst3_pluginterfaces repo.
-
-Signed-off-by: Violet Purcell <vimproved@inventati.org>
---- a/libs/vst3/pluginterfaces/base/funknown.cpp
-+++ b/libs/vst3/pluginterfaces/base/funknown.cpp
-@@ -44,13 +44,23 @@
- #endif
- 
- #if SMTG_OS_LINUX
-+#if !defined (SMTG_USE_ATOMIC)
-+#if defined (_LIBCPP_VERSION)
-+#define SMTG_USE_ATOMIC 1
-+#else
- #include <ext/atomicity.h>
-+#endif
-+#endif
- /* UUID */
- #include <string>
- #include <boost/uuid/uuid.hpp>
- #include <boost/uuid/uuid_generators.hpp>
- #endif
- 
-+#if defined (SMTG_USE_ATOMIC) && SMTG_USE_ATOMIC
-+#include <atomic>
-+#endif
-+
- namespace Steinberg {
- 
- //------------------------------------------------------------------------
-@@ -79,7 +89,9 @@ namespace FUnknownPrivate {
- //------------------------------------------------------------------------
- int32 PLUGIN_API atomicAdd (int32& var, int32 d)
- {
--#if SMTG_OS_WINDOWS
-+#if SMTG_USE_ATOMIC
-+	return atomic_fetch_add (reinterpret_cast<std::atomic_int_least32_t*> (&var), d) +d;
-+#elif SMTG_OS_WINDOWS
- 	return InterlockedExchangeAdd ((volatile long int*)&var, d) + d;
- #elif SMTG_OS_MACOS
- 	return OSAtomicAdd32Barrier (d, (int32_t*)&var);
--- 
-2.42.0
-