gentoo resync : 28.04.2021

4 files changed, 9 insertions, 187 deletions

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 04d5920b80c6..c2fb7159d743 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,6 +1,5 @@
-DIST Ardour-6.5.0.tar.bz2 12000901 BLAKE2B a44ba0b6b071e6b0c9b4bad86c1454584e4f1ee360de490e176af022d5862d57bde97edbe5f8d0ed2fbc5597ab6d8d1ef7f4a2691e7183d59b38d5a143c2d5e7 SHA512 28bb0939c12b687e136de7a8b1ce28f1065d4040bdc171e228c648586bd5d3bd25ab00c677aa55f835e060cc8cbd0a1d1c283c018e4ab0d72d8bde0eb0a26f2a
 DIST Ardour-6.6.0.tar.bz2 12046173 BLAKE2B d3a61ebe97fc26d89eee3f7a43c1ac47f5fda28251b76dcd635bba8c794541436a48fa288f40d1e156f01841e085588b60c8fa962b958c2f4bc6d7cdb4b1af75 SHA512 e175100bc03921865c5b387de68e30c21dd3e65dbf3868783092d165d5106a883aa4fca74e71b2e267e50b3c2f5c7b707a73967bbc93e66808d25aa3065b425f
-EBUILD ardour-6.5-r2.ebuild 4776 BLAKE2B 957265c747d35808bca1f4bb55e8aea7228bb5f4f2cc36d2516a990114924f2fb48160af3343125ad241d4d7796aabe0ae22e1da12933ee35d7362330d3dc331 SHA512 f8d58d2858d18860cfd129f617dc730ffa64491a3f4c3eafced05015e15720602b362c7e100c29d7514b0c47cf3d1419bee87ddd14fb5ab224a530c6dc3b6a04
-EBUILD ardour-6.6.ebuild 4785 BLAKE2B ebdc896f8ab0e98223af0f0f7c838007eaf25406b6ef069ee3a983bc3d5fe929eca6cc3a7801dafef783d8579a791fd4f4096b34240cdd044d734ff10c2cb5e4 SHA512 0f85bbe81ffd388716ea4683e6f3377894076109305927d28570eab765c6084695cb1c85917eed34ee1007c9e4d67c13ba4af1b203491551f7c71ace7c856d69
-EBUILD ardour-9999.ebuild 4786 BLAKE2B 01ecb43a3cb8ebe2cdcc25af1e880b118f7d64d5884bbb3397514816f33076c20d15e4b798a6fc8d8781900f8775154056930b87b5a13d588dde261f5a383af1 SHA512 81ab09a2043ca58cb8c01d7d6d07df49e9c7adfed9107a669e437c8555f69e39171aab389fb1dbe78dbc3ccf09e80602158f9473675836288e18039d762bc4c8
+DIST ardour-6.6-volatile-atomic-glib-2.68.patch.gz 22322 BLAKE2B cd113f721d0c6c63c85372873cd43782e3a43b8963c4f9222e771039c4b397585582ffd4cb77d4928bcdc656ef533e4a4b40799ff0c32355985c592589766466 SHA512 3fa2ede8b943881b9c77b233892f146e354c4722265f6599417d55fdf69961d65f6d54ed2c74f53f1f835d006ee99e44adcb03ee117ba44a7be3bedbae2c8efc
+EBUILD ardour-6.6-r1.ebuild 4945 BLAKE2B dda6893230c2d51602a747fb457112a7936bf9a2e2a655704e4f63ebc8dfa9733b432350a2ae68aabc4b16332777d35eebc0ac802e2239a1e90c39bfa795b3da SHA512 7e1e73686843a064bfcf6721e833f149b1fed9e31db00e67da6408bb2c9b8839c2bd909c22dccbc89043769deadb843bfbcdf4273857c5f40bc0dde4683a9414
+EBUILD ardour-9999.ebuild 4792 BLAKE2B ecb861308230b9cedd58ee98920a3e5c0c72a725ec51b3a8fe8fc55365835a072ff5a038b7891151c10b4f62e6a1138f984063190560cfc7ac4d033a53b10c36 SHA512 fe12fe655495d6ca027de5348e88dff7a41d1c1361e667cd35aa8d7e506acecc955db62d8f4ec786e231e6d26f4c5ac809e84e16114c95e65d9ef907d1f6d3e1
 MISC metadata.xml 450 BLAKE2B 1b17e6d54f2b963b5fe406bb724735dee2c71b982e35acc8e22f6f9737a3519b42d6c9fa20af80359468a57c1596df2b83f525078603d3416a8b66b15df1db75 SHA512 480478c33714996c12180962aa503ca1fbb6d44195abc83203e8be60be5477a9815e9a5ebac7e475f83a731629213d517565b217087c39c4e4f03d02cdb5e68e
diff --git a/media-sound/ardour/ardour-6.5-r2.ebuild b/media-sound/ardour/ardour-6.5-r2.ebuild
deleted file mode 100644
index 8db68c8d6a82..000000000000
--- a/media-sound/ardour/ardour-6.5-r2.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE='threads(+)'
-PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh"
-inherit eutils toolchain-funcs flag-o-matic l10n python-any-r1 waf-utils 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="6"
-IUSE="altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
-
-RDEPEND="
-	dev-cpp/glibmm:2
-	dev-cpp/gtkmm:2.4
-	dev-cpp/libgnomecanvasmm:2.6
-	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
-	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 )"
-
-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
-	xdg_src_prepare
-
-	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
-	}
-	l10n_for_each_disabled_locale_do my_lcmsg
-}
-
-src_configure() {
-	local backends="alsa"
-	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 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
-
-	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
-
-	insinto /usr/share/metainfo
-	doins build/gtk2_ardour/ardour${SLOT}.appdata.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-6.6.ebuild b/media-sound/ardour/ardour-6.6-r1.ebuild
index 94b4609a1c39..fd67dc625453 100644
--- a/media-sound/ardour/ardour-6.6.ebuild
+++ b/media-sound/ardour/ardour-6.6-r1.ebuild
@@ -14,8 +14,9 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
 	inherit git-r3
 else
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
+	SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${P}-volatile-atomic-glib-2.68.patch.gz"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi
 
@@ -87,6 +88,8 @@ src_prepare() {
 	default
 	xdg_src_prepare
 
+	eapply "${WORKDIR}/${P}-volatile-atomic-glib-2.68.patch"
+
 	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
 	MARCH=$(get-flag march)
 	OPTFLAGS=""
@@ -119,7 +122,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local backends="alsa"
+	local backends="alsa,dummy"
 	use jack && backends+=",jack"
 	use pulseaudio && backends+=",pulseaudio"
 
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index ceeb6768060f..a2199b8d3d87 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -119,7 +119,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local backends="alsa"
+	local backends="alsa,dummy"
 	use jack && backends+=",jack"
 	use pulseaudio && backends+=",pulseaudio"