gentoo resync : 30.05.2020

4 files changed, 168 insertions, 12 deletions

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 1d04e3b6732f..2dbc422e835d 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,5 +1,7 @@
 AUX ardour-4.x-revision-naming.patch 1107 BLAKE2B 18378f1cbc3bb7871ed599dd03c963e7d808796477838b84e9a1010bf31d175edcbba62dc076a37ff3cdf20868f32fc42c2fb2a687616be27a0ecf00b97afc3e SHA512 f9c742345b4f89bc0cabc7a7fe86c4084c99f962c3b3770a0e14b259fa4ca9a3f2cdac35c3b9214816f895fd083befab16e38d2b753cbe6ab94ca7da7b251580
+DIST Ardour-6.0.0.tar.bz2 10999598 BLAKE2B d403a76bb95a7c8dc411b45b54d9b1afb64ab0ba104c283c6890ec5bb152c9f67b825222460bb7b29a28724e7581023e5d3c7ce3b7ff9c88f3d584fab8cb03f7 SHA512 42cd5ea69200aefc60fc93ca7347f08fc511a9821a03023c4362d626f0957570ba0a7b174af67016f7fa27a29eed3c932d502e090d780125c63b5690faa642a3
 DIST ardour-5.12.tar.bz2 8852834 BLAKE2B 0409d920ab0abc9e52a40cc343c5481d53292bea6e5c89c58328f95c53f7f09f30ce421f2ed0da0e3fdb4eaeeb5a25da0d07ed1d4c382b5b607f3b89324eca1b SHA512 c4b4332bddb2406924119c181622801725f4a7dd7741c1a66ddbc2236542764b786337da2f0a751f3bbe6e0389b5da765eb19b14a6a90c8f8a7fd68231e5067d
 EBUILD ardour-5.12.ebuild 3827 BLAKE2B 7f80117bd65829746161d7bc06397e3356213a03d180218a1d0791bd2d7a7054455d2eaa12e57d3d6a2fc49f6cc49e30f2729fa88da8047c9bf189afd228ef80 SHA512 1fcd75469e64d3b55d34198ca430d966f24fbc00a0f2f17ddbafd156100b16e576760f9630921b2f6747d92257737f8fc5acaa2c78865e86f82fa864cd422535
-EBUILD ardour-9999.ebuild 3827 BLAKE2B de58e55c2bb58de79ad407298c9912a877ca1a3535a83dbb1e74e3b596b316e4fd0db3b1089129e0432a85ba04ba4fb067d1828a0a3fa9b7888c7d9182c1fac6 SHA512 52211b39cd7b6cf55cc92860bbffef44646438f2aac5e6aedf3e3557b6c913d7af000a5ccd2f195f5104015460cdb83e1aef49ec98871be5e29e80205765adcc
-MISC metadata.xml 347 BLAKE2B 055877000b928bdbc38be9fec8b34e2b5ad6b0c9533e59406bfa6ebdc81fcb2990cfebe577f920f110aa57bc8e20a26f896f4ce8e5ab949177727905656119c3 SHA512 30f231423671c8c1a0911b9591a6239431d55860679c45452b430ce974defafeaa86e8a0f5b950e6176fccb986259780f3a13fa73df0e03c4a5f7e5e60cbcb63
+EBUILD ardour-6.0.ebuild 4264 BLAKE2B 1e95704755c6e2f4f90745380eef759d9c010b00088ea6dcd4f9ef21d23c08882b4b2ba4defa4c86571714326d71395d43aecf2709746e072d8717a42bd5bf59 SHA512 aa51000af3536c25a38effdd439fe9967737a1bc9eb4f8c1e391196d519676f457dcba01f495298a8bd7feb5c7c17321dafed4444cfe1b0fb72009cc64ea9a33
+EBUILD ardour-9999.ebuild 4264 BLAKE2B 1e95704755c6e2f4f90745380eef759d9c010b00088ea6dcd4f9ef21d23c08882b4b2ba4defa4c86571714326d71395d43aecf2709746e072d8717a42bd5bf59 SHA512 aa51000af3536c25a38effdd439fe9967737a1bc9eb4f8c1e391196d519676f457dcba01f495298a8bd7feb5c7c17321dafed4444cfe1b0fb72009cc64ea9a33
+MISC metadata.xml 450 BLAKE2B 1b17e6d54f2b963b5fe406bb724735dee2c71b982e35acc8e22f6f9737a3519b42d6c9fa20af80359468a57c1596df2b83f525078603d3416a8b66b15df1db75 SHA512 480478c33714996c12180962aa503ca1fbb6d44195abc83203e8be60be5477a9815e9a5ebac7e475f83a731629213d517565b217087c39c4e4f03d02cdb5e68e
diff --git a/media-sound/ardour/ardour-6.0.ebuild b/media-sound/ardour/ardour-6.0.ebuild
new file mode 100644
index 000000000000..304e08fcb604
--- /dev/null
+++ b/media-sound/ardour/ardour-6.0.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+#EPYTHON='python2.7'
+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="http://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://community.ardour.org/src/Ardour-${PV}.0.tar.bz2"
+	S="${WORKDIR}/Ardour-${PV}.0"
+fi
+
+LICENSE="GPL-2"
+SLOT="6"
+IUSE="altivec doc jack nls phonehome cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+
+RDEPEND="
+	>=dev-cpp/glibmm-2.32.0
+	>=dev-cpp/gtkmm-2.16:2.4
+	>=dev-cpp/libgnomecanvasmm-2.26:2.6
+	dev-libs/boost:=
+	>=dev-libs/glib-2.10.1:2
+	dev-libs/libsigc++:2
+	>=dev-libs/libxml2-2.6: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-0.4.0-r20
+	>=media-libs/libsamplerate-0.1
+	>=media-libs/libsndfile-1.0.18
+	>=media-libs/libsoundtouch-1.6.0
+	media-libs/raptor:2
+	>=media-libs/rubberband-1.6.0
+	>=media-libs/taglib-1.7
+	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.8.1:2
+	x11-libs/pango
+	jack? ( virtual/jack )
+	media-libs/lilv
+	media-libs/sratom
+	dev-libs/sord
+	>=media-libs/suil-0.6.10
+	>=media-libs/lv2-1.4.0"
+#	!bundled-libs? ( media-sound/fluidsynth ) at leat 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_setup() {
+	if has_version \>=dev-libs/libsigc++-2.6 ; then
+		append-cxxflags -std=c++11
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply_user
+	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() {
+	tc-export CC CXX
+	mkdir -p "${D}"
+	waf-utils_src_configure \
+                $(usex doc "--docs" '') \
+                $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
+                $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
+		$( use phonehome && echo "--phone-home" ) || echo "--no-phone-home" \
+                $( use nls && echo "--nls" ) || echo --no-nls \
+		--destdir="${D}" \
+                --prefix=/usr \
+                --configdir=/etc \
+                --optimize
+#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."
+}
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 36ca3e797777..304e08fcb604 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -5,7 +5,8 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE='threads(+)'
 #EPYTHON='python2.7'
-inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
+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="http://ardour.org/"
@@ -15,13 +16,13 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	SRC_URI="https://community.ardour.org/src/Ardour-${PV}.0.tar.bz2"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi
 
 LICENSE="GPL-2"
 SLOT="6"
-IUSE="altivec doc jack cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+IUSE="altivec doc jack nls phonehome cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
 
 RDEPEND="
 	>=dev-cpp/glibmm-2.32.0
@@ -60,6 +61,7 @@ RDEPEND="
 	dev-libs/sord
 	>=media-libs/suil-0.6.10
 	>=media-libs/lv2-1.4.0"
+#	!bundled-libs? ( media-sound/fluidsynth ) at leat libltc is missing to be able to unbundle...
 
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
@@ -77,10 +79,6 @@ pkg_setup() {
 
 src_prepare() {
 	eapply_user
-	if ! [[ ${PV} == *9999* ]]; then
-		eapply "${FILESDIR}"/${PN}-4.x-revision-naming.patch
-		touch "${S}/libs/ardour/revision.cc"
-	fi
 	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
 	MARCH=$(get-flag march)
 	OPTFLAGS=""
@@ -106,6 +104,10 @@ src_prepare() {
 	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() {
@@ -115,13 +117,18 @@ src_configure() {
                 $(usex doc "--docs" '') \
                 $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
                 $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
-                --destdir="${D}" \
+		$( use phonehome && echo "--phone-home" ) || echo "--no-phone-home" \
+                $( use nls && echo "--nls" ) || echo --no-nls \
+		--destdir="${D}" \
                 --prefix=/usr \
                 --configdir=/etc \
-                --nls \
                 --optimize
+#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
diff --git a/media-sound/ardour/metadata.xml b/media-sound/ardour/metadata.xml
index 20dec2c8d4e9..1f9044f06bed 100644
--- a/media-sound/ardour/metadata.xml
+++ b/media-sound/ardour/metadata.xml
@@ -8,4 +8,7 @@
   <upstream>
     <remote-id type="github">Ardour/ardour</remote-id>
   </upstream>
+  <use>
+    <flag name="phonehome">contact ardour.org at startup for new announcements</flag>
+  </use>
 </pkgmetadata>