gentoo auto-resync : 01:05:2023 - 11:19:44

3 files changed, 2 insertions, 228 deletions

diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 17e853588ef8..60a88cc95ee9 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -11,13 +11,10 @@ AUX audacity-3.2.3-fix-rpaths.patch 5961 BLAKE2B d48471ba4cea8103fd1caef6e3e1335
 AUX audacity-3.2.3-remove-conan-threadpool.patch 1681 BLAKE2B d5b32185ae961c1ab49fd28410de857b7e3eddaeebf2435dd77c526912ff06a604500c8af2357dc8c601fc032823c74beec4c207cca58fa074d950de6cace6fb SHA512 4a4ee937be644587114e9e097178859ae369e3519475224ea22095ecf51971215b7873b3d9f05ff4f6dcb12c31741448381621c250e159824c818fa61238f0c1
 AUX audacity-3.2.5-gcc13.patch 550 BLAKE2B de4b1bacbc3606562c9989df8631fd20c97538be05a9a00e1aa6b323de7c07ab38fef05eb47449e47966e54d9ae089e53cf799508666f63c79462306176b244a SHA512 76379252380237cf5c39476a4502a8bfb575740ed1094bd9ed79e2e890710c7a0fbad9209691d5d95c4b96d737383155f3877a061af33deb7d873d9d25f83d2f
 DIST Audacity-2.4.2.tar.gz 61248430 BLAKE2B bb7e31e22d2a09c38767b019ed5c2c2be31741594715d73452fc4622d171a6209e87009b6f820873cc1cff2f6b85547a3dea0a2d8d4dd7195617509e571ee9b8 SHA512 0d9cdabf5ba2c7207e8d8e4a8bdfc3e7d32277386436ecb480e3ff781720f5449a56b310ba91c78ca67afb752e2ab736abd5b7ce40d19d153bfc4a2067343a3d
-DIST Audacity-3.2.4.tar.gz 57016943 BLAKE2B df36f5f7162cc6303b2bcb4861f0b418fd3dfd97a8d664b9c0fe1e84b57df5342864a82e7652c2e706e723b6eb6faded50a0ce4fb96f36ac1e6ba48726db40a7 SHA512 d69459839760f0db7d23ad5ee5601e0a0b8e918a7f9ad6773bb45b525f732d09ff0fc6ca59c6400b62d7b0b905411dd97673b6d6f2102c9ed549e9f833b60a96
 DIST Audacity-3.2.5.tar.gz 57017533 BLAKE2B b8e48cab1c89cadb343a17fcb1d811a7363231152867f842ffff6dd8329103c9a407beb3f0b587e35e711070230c5c86d5aa97578b5a7c08bdbb029570677a24 SHA512 850ce4dc27e2c6d0b63bf0c0186deb417febc49b561e572a697f0e7ae2a7b2b3f39816b7beeacf9cbfb9525de85923e2ce6d06486fcf1855e34e2ecd1b7e3582
 DIST audacity-manual-2.4.2.zip 22459298 BLAKE2B 001ca56f73c3c48f9b49b3b6478c6de6fb4c305fb869b11d93e41d5aee7ee45133bd7047c4d281fed4859d6c6061352dfaeb995e7b2602e42e09ab04e05e00dc SHA512 8afc7faffb0da87efe0c2cb64f8593777357252b4893ae0522ec7b37b4f7806ad9582ca9e4b751d085c2598aba6b580dacd805daa00b236a4ff8f6663a80135c
-DIST audacity-manual-3.2.4.tar.gz 22251911 BLAKE2B ba2cf1a3b13f59bf03014fd301e3e50654d39fa0a79076760b68edca725513ea18c7be6e68452471e25274597e0629fff2964a135a81d1c54e0c0ae7b55f94fc SHA512 6f2d6339dfe150a1eb57a42a957154237c6ade0beb0a2a06ed2c59b5d23ff6b40d1dea0bc91851951a7df26aeb1c43c79f85ac71ba5361165f8524dbf1301424
 DIST audacity-manual-3.2.5.tar.gz 22260237 BLAKE2B e3c96282b5eeffe5854781cfe316fb40c10212c9bc07a081433cf947363f79892e7397b53a31aa33337b5d0b6a00e14bd420d6f064515455055233a45f5ebf47 SHA512 9bd2f2b3268ff7259f1fa0957ab3f15e7b58d72a3199be4e271bac67d9d0b44967b2b783ea36f9392ed1bdf004274754468b3902c3a72a204d08333a5c07894c
 DIST progschj-ThreadPool-20140926.h 2612 BLAKE2B 54d050ad443512e60e5c99449dd7133f3884c1067288cfc36b96c06855537b83d9b599cd8b8fb7f24e20cbc4898585b11d98d3a33dc7571a886b57c806ad3b14 SHA512 f927489de9afe0217bb0552c45bea238693f9f183a062cb12a48e19576dc50a4d0ba449a12397012ae790cc5ebd741decc08128b66f795310dba4778122e9f3d
 EBUILD audacity-2.4.2-r3.ebuild 3964 BLAKE2B ad71e2a7c308660527a10a2e756c99752a35b6b1f77e04a1e28143c2038d080249c543d92ec2ed4b72037549dd8aa87959b9bea87e466f3eeb8625de9defd950 SHA512 94fc4f9012e63998628ae0c28d0d3d04f80422651af6a6ee9bd2907648923a7c5cf0179e49a047e9f7809ee1f52614e7e393eff3d93e8d218fa567c5ede2b809
-EBUILD audacity-3.2.4.ebuild 6929 BLAKE2B f4ceb2ebd0c3a5c6e9b70b5b89ee571cf625549cb0f3be54763307cc084971ad28b67f92bc5b6e612632eb545de99b65fb0b8ee1a6c6444d1baf3d9627b9dcfe SHA512 b2557f22c5a8508899debd35f5f3c891fb1bcffdf3e10c68223248c248701730d1f6d8923f9d405ef9aa4d1354bbae368f303b60c819e6429a9f5068b09d3e36
-EBUILD audacity-3.2.5.ebuild 6979 BLAKE2B 73572e00e3a77240b8b2a92beab27c641c3f7a8d796377576f93e54fa9c83cfd3828971e08d2888f176f1f293a50184fec5ba328f248f7aceaaf08144bfeafe1 SHA512 74a1f5125dd66aa71ad5e6ddc2d1a35c7eba1ec51c6d7c07b164cdb1a8af1193b5382009552bff4998521952df4c7d439b0477b2a5cec9315dc5d1b914867c23
+EBUILD audacity-3.2.5.ebuild 6978 BLAKE2B a1d06a7dab83d0e440104ad8c2e3bfdbf948588c72dae178710788f614c2a8d7b38afef46fbfc9b3a50ddf78ac5c5694aaeb44c501ae18735fce0a344de92c56 SHA512 fe149b7b4558e1739d573dfe03ee66908570bbf0616bebf0213064a857b2999d8b0452d26e790518b1a5acd52744d0a1d8bc4cac391db6fe099ebcd28733bc04
 MISC metadata.xml 1512 BLAKE2B 277533c5356fb9fee5f353c14f43886e2823cf11f50deff855e31b039e197dd9daeab65dd133461e468f6bf2862b72e910ea36f67bceedec00a5e2234a386db5 SHA512 f66ee862c1fa473e825afc68186b1e2ecc3e7f4bb49272fde63b7b52afb2075795632c0690dd37ded5390a180720297d12b33360f34a4050640080b906ea0a28
diff --git a/media-sound/audacity/audacity-3.2.4.ebuild b/media-sound/audacity/audacity-3.2.4.ebuild
deleted file mode 100644
index 9b1ee5735698..000000000000
--- a/media-sound/audacity/audacity-3.2.4.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.2-gtk3"
-
-inherit cmake wxwidgets xdg
-
-MY_P="Audacity-${PV}"
-DOC_PV="${PV}"
-DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="https://web.audacityteam.org/"
-
-# A header-only thread pool library, without a build system, about 100
-# lines of code.  Probably not worth packaging individually.  Check
-# cmake-proxies/CMakeLists.txt and search for "ThreadPool".
-MY_THREADPOOL_DATE=20140926
-MY_THREADPOOL="https://raw.githubusercontent.com/progschj/ThreadPool/9a42ec1329f259a5f4881a291db1dcb8f2ad9040/ThreadPool.h -> progschj-ThreadPool-${MY_THREADPOOL_DATE}.h"
-SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz
-	doc? ( https://github.com/audacity/audacity-manual/releases/download/v${PV}/audacity-manual-${PV}.tar.gz )
-	audiocom? ( ${MY_THREADPOOL} )"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-# GPL-2+, GPL-3 - Audacity itself
-# ZLIB - The ThreadPool single-header library
-# CC-BY-3.0 - Documentation
-LICENSE="GPL-2+
-	GPL-3
-	doc? ( CC-BY-3.0 )
-	audiocom? ( ZLIB )
-"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-IUSE="alsa audiocom doc ffmpeg +flac id3tag +ladspa +lv2 mad mpg123 ogg
-	opus +portmixer sbsms twolame vamp +vorbis wavpack"
-
-# The testsuite consists of two tests, 50% of which fail.
-RESTRICT="test"
-
-# dev-db/sqlite:3 hard dependency.
-# dev-libs/glib:2, x11-libs/gtk+:3 hard dependency, from
-#   cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake
-# sys-apps/util-linux hard dependency, from cmake-proxies/CMakeLists.txt
-#   for libuuid
-# portmidi became non-optional: building without it results in build
-#   failures, even with some of the Debian patches.  It's probably not
-#   in our best interest to fix that as a patch series.
-# glib, gtk and gdk are all directly relied on in the source, not just
-
-# Libraries used at runtime via dlopen:
-# - dev-libs/{serd,sord} - for LV2 support
-# - media-libs/{opus,sratom} :: For Opus and LV2 respectively
-# - media-sound/lame :: For MP3 export
-# - media-video/ffmpeg :: For generic FFMPEG export
-#   This one has the interesting property of many versions being
-#   supported at runtime.  See: libraries/lib-ffmpeg-support/impl
-#   Current support grid:
-#   - Lavf - 5[789]
-#   - Lavc - 5[789]
-#   - Lavu - 5[2567]
-
-RDEPEND="dev-db/sqlite:3
-	dev-libs/expat
-	dev-libs/glib:2
-	media-libs/libsndfile
-	media-libs/libsoundtouch:=
-	media-libs/portaudio[alsa?]
-	media-libs/portmidi
-	media-libs/portsmf:=
-	media-libs/soxr
-	media-sound/lame
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	sys-apps/util-linux
-	alsa? ( media-libs/alsa-lib )
-	audiocom? (
-		dev-libs/rapidjson
-		net-misc/curl
-	)
-	ffmpeg? ( media-video/ffmpeg )
-	flac? ( media-libs/flac:=[cxx] )
-	id3tag? ( media-libs/libid3tag:= )
-	lv2? (
-		dev-libs/serd
-		dev-libs/sord
-		media-libs/lilv
-		media-libs/lv2
-		media-libs/sratom
-		media-libs/suil
-	)
-	mad? ( media-libs/libmad )
-	mpg123? ( media-sound/mpg123 )
-	ogg? ( media-libs/libogg )
-	opus? ( media-libs/opus )
-	sbsms? ( media-libs/libsbsms )
-	twolame? ( media-sound/twolame )
-	vamp? ( media-libs/vamp-plugin-sdk )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="app-arch/unzip
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="
-	mad? ( !mpg123 )
-"
-
-PATCHES=(
-	# Equivalent to previous versions
-	"${FILESDIR}/${PN}-3.2.3-disable-ccache.patch"
-	# From Debian
-	"${FILESDIR}/${PN}-3.2.3-fix-rpaths.patch"
-
-	# Disables some header-based detection
-	"${FILESDIR}/${PN}-3.2.3-allow-overriding-alsa-jack.patch"
-
-	# For has_networking
-	"${FILESDIR}/${PN}-3.2.3-remove-conan-threadpool.patch"
-	"${FILESDIR}/${PN}-3.2.3-allow-finding-rapidjson-pkgconfig.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	local header_subs="${S}/lib-src/header-substitutes"
-	cat <<-EOF >"${header_subs}/allegro.h" || die
-	/* Hack the allegro.h header substitute to use system headers.  */
-	#include <portsmf/allegro.h>
-	EOF
-
-	# Keep in sync with has_networking and the ThreadPool.h SRC_URI.
-	if use audiocom; then
-		mkdir -p "${S}/"/lib-src/threadpool/ThreadPool/ || die
-		cp "${DISTDIR}"/progschj-ThreadPool-"${MY_THREADPOOL_DATE}".h \
-		   "${S}"/lib-src/threadpool/ThreadPool/ThreadPool.h || die
-	fi
-}
-
-src_configure() {
-	setup-wxwidgets
-
-	# * always use system libraries if possible
-	# * options listed roughly in the order specified in
-	#   cmake-proxies/CMakeLists.txt
-	# * USE_VST was omitted, it appears to no longer have dependencies
-	#   (this is different from VST3)
-	local mycmakeargs=(
-		# Tell the CMake-based build system it's building a release.
-		-DAUDACITY_BUILD_LEVEL=2
-		-Daudacity_use_nyquist=local
-		#-Daudacity_use_pch leaving it to the default behavior
-		-Daudacity_use_portmixer=$(usex portmixer system off)
-		-Daudacity_use_soxr=system
-
-		-Daudacity_conan_enabled=OFF
-
-		-Daudacity_has_networking=$(usex audiocom on off)
-		# Not useful on Gentoo.
-		-Daudacity_has_updates_check=OFF
-		-Daudacity_has_audiocom_upload=$(usex audiocom on off)
-		-Daudacity_has_threadpool=local
-
-		# The VST3 SDK is unpackaged, and it appears to be under a breed
-		# of a proprietary license and the GPL.
-		-Daudacity_has_vst3=OFF
-		-Daudacity_lib_preference=system
-		-Daudacity_obey_system_dependencies=ON
-		-Daudacity_use_expat=system
-		-Daudacity_use_ffmpeg=$(usex ffmpeg loaded off)
-		-Daudacity_use_libid3tag=$(usex id3tag system off)
-		-Daudacity_use_ladspa=$(usex ladspa)
-		-Daudacity_use_lame=system
-		-Daudacity_use_wxwidgets=system
-		-Daudacity_use_libmp3lame=system
-		-Daudacity_use_libmpg123=$(usex mpg123 system off)
-		-Daudacity_use_libmad=$(usex mad system off)
-		-Daudacity_use_wavpack=$(usex wavpack system off)
-		-Daudacity_use_libogg=$(usex ogg system off)
-		-Daudacity_use_libflac=$(usex flac system off)
-		-Daudacity_use_libopus=$(usex flac system off)
-		-Daudacity_use_libvorbis=$(usex vorbis system off)
-		-Daudacity_use_libsndfile=system
-		-Daudacity_use_portaudio=system
-		-Daudacity_use_midi=system
-		-Daudacity_use_vamp=$(usex vamp system off)
-		-Daudacity_use_lv2=$(usex lv2 system off)
-		-Daudacity_use_portsmf=system
-		-Daudacity_use_sbsms=$(usex sbsms system off)
-		-Daudacity_use_soundtouch=system
-		-Daudacity_use_twolame=$(usex twolame system off)
-
-		# Disable telemetry features.
-		-Daudacity_has_sentry_reporting=off
-		-Daudacity_has_crashreports=off
-
-		# See the allow-overriding-alsa-jack.patch patch
-		-DPA_HAS_ALSA=$(usex alsa on off)
-		## Keep watch of PA_HAS_OSS in lib-src/portmixer/CMakeLists.txt;
-		## AFAICT it introduces no deps as-is, but that could change.
-		## Similar goes for PA_HAS_JACK.
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# Remove bad doc install
-	rm -r "${ED}"/usr/share/doc || die
-
-	if use doc ; then
-		docinto html
-		dodoc -r "${WORKDIR}"/help/manual/{m,man}
-		dodoc "${WORKDIR}"/help/manual/{favicon.ico,index.html,quick_help.html}
-		dosym ../../doc/${PF}/html /usr/share/${PN}/help/manual
-	fi
-}
diff --git a/media-sound/audacity/audacity-3.2.5.ebuild b/media-sound/audacity/audacity-3.2.5.ebuild
index 0d2e26a3d311..8a011864b2d7 100644
--- a/media-sound/audacity/audacity-3.2.5.ebuild
+++ b/media-sound/audacity/audacity-3.2.5.ebuild
@@ -31,7 +31,7 @@ LICENSE="GPL-2+
 	audiocom? ( ZLIB )
 "
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 IUSE="alsa audiocom doc ffmpeg +flac id3tag +ladspa +lv2 mad mpg123 ogg
 	opus +portmixer sbsms twolame vamp +vorbis wavpack"