gentoo resync : 22.01.2021

3 files changed, 3 insertions, 156 deletions

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index c74326f7497e..29bf1d7130bb 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,5 +1,4 @@
 DIST Ardour-6.5.0.tar.bz2 12000901 BLAKE2B a44ba0b6b071e6b0c9b4bad86c1454584e4f1ee360de490e176af022d5862d57bde97edbe5f8d0ed2fbc5597ab6d8d1ef7f4a2691e7183d59b38d5a143c2d5e7 SHA512 28bb0939c12b687e136de7a8b1ce28f1065d4040bdc171e228c648586bd5d3bd25ab00c677aa55f835e060cc8cbd0a1d1c283c018e4ab0d72d8bde0eb0a26f2a
-EBUILD ardour-6.5-r1.ebuild 4778 BLAKE2B 936077b146fde6bce25de65c7b0a3f9c7a9a0f47455cc96657273ca7d88b1b20f1b7596938e38b53d638a2661c39d76d967e27be06f943b95dd385e3d9e00878 SHA512 c910db0ef73eebe05de80aa5cc013aed4a0f2cc4766f7a41933e42c5bc934cc1ab4cd0e38063a710dbe440f81ebd95b85c3b7cddcbf9f2bdcc53b1d57a413e04
-EBUILD ardour-6.5.ebuild 4308 BLAKE2B 9a95267bbb82a5cb0821414a9f4c87723cd28f1f25cb842aac3c396b1bae53a6bd0d28e8ca8a782845f8a05eeadb1fd91c5ce2001b28642bdde207fda65d07c5 SHA512 6009da8f6c1b26e0349a855e371d0f9009039b1482272d3d9533a02004f555e671dfd36c30afb38ad63cfbc1e22b2cb0232e29f52e01b412d6ff6524ff4c0929
+EBUILD ardour-6.5-r1.ebuild 4776 BLAKE2B 44eab49e0d057ec448b2df0c85c9d5f23e96248bc9086d33a175cad9ee5f184eaa45f4864e76ef6b81641223c2da04f059e617ad8a086be129650e4b5975c748 SHA512 b4d2bd8714d965469c6b037503342a464c1be6cd720c18aebbd47bf3220c11755ce404537989a3574e0d199d6a02d5275c7163b2184fa9a08a65b25c64bdc281
 EBUILD ardour-9999.ebuild 4778 BLAKE2B 936077b146fde6bce25de65c7b0a3f9c7a9a0f47455cc96657273ca7d88b1b20f1b7596938e38b53d638a2661c39d76d967e27be06f943b95dd385e3d9e00878 SHA512 c910db0ef73eebe05de80aa5cc013aed4a0f2cc4766f7a41933e42c5bc934cc1ab4cd0e38063a710dbe440f81ebd95b85c3b7cddcbf9f2bdcc53b1d57a413e04
 MISC metadata.xml 450 BLAKE2B 1b17e6d54f2b963b5fe406bb724735dee2c71b982e35acc8e22f6f9737a3519b42d6c9fa20af80359468a57c1596df2b83f525078603d3416a8b66b15df1db75 SHA512 480478c33714996c12180962aa503ca1fbb6d44195abc83203e8be60be5477a9815e9a5ebac7e475f83a731629213d517565b217087c39c4e4f03d02cdb5e68e
diff --git a/media-sound/ardour/ardour-6.5-r1.ebuild b/media-sound/ardour/ardour-6.5-r1.ebuild
index 225b16116073..bb8049a79cb9 100644
--- a/media-sound/ardour/ardour-6.5-r1.ebuild
+++ b/media-sound/ardour/ardour-6.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ 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"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi
diff --git a/media-sound/ardour/ardour-6.5.ebuild b/media-sound/ardour/ardour-6.5.ebuild
deleted file mode 100644
index 348085665a1e..000000000000
--- a/media-sound/ardour/ardour-6.5.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,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
-
-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
-	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}
-	jack? ( virtual/jack )
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )"
-
-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
-	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}"
-	waf-utils_src_configure \
-		--destdir="${D}" \
-		--configdir=/etc \
-		--optimize \
-		--with-backends=${backends} \
-		$(usex doc "--docs" '') \
-		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
-		$(usex phonehome "--phone-home" "--no-phone-home") \
-		$(usex nls "--nls" "--no-nls")
-#not possible right now		--use-external-libs
-}
-src_compile() {
-	waf-utils_src_compile
-	use nls && waf-utils_src_compile i18n
-}
-src_install() {
-	waf-utils_src_install
-	mv ${PN}.1 ${PN}${SLOT}.1
-	doman ${PN}${SLOT}.1
-	newicon "${S}/gtk2_ardour/resources/Ardour-icon_48px.png" ${PN}${SLOT}.png
-	make_desktop_entry ardour6 ardour6 ardour6 AudioVideo
-}
-
-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."
-}