[gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2016-02-22 16:38 Andreas Schuerch
  0 siblings, 0 replies; 118+ messages in thread
From: Andreas Schuerch @ 2016-02-22 16:38 UTC (permalink / raw
  To: gentoo-commits

commit:     5b590a7b0e492a1a9857c8f99a137c078ed6afef
Author:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 22 16:37:21 2016 +0000
Commit:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 16:37:21 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b590a7b

media-sound/ardour: bump to 4.7

Package-Manager: portage-2.2.26

 media-sound/ardour/Manifest          |   1 +
 media-sound/ardour/ardour-4.7.ebuild | 139 +++++++++++++++++++++++++++++++++++
 2 files changed, 140 insertions(+)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index ceb6b7e..a31aa3d 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -9,3 +9,4 @@ DIST ardour-4.1.tar.gz 9247567 SHA256 1d5eac009f3c84aee11c4e7d1c548747cb5a43edda
 DIST ardour-4.2.tar.gz 9484009 SHA256 c8af454e974be3222bceb374d5b3d126af6c9766326f7e276acb8ef2fa21cfa4 SHA512 cb1d8144216ff959dac1b371c5ec2b99e0fc2137c105fda5c38460c7f148d7f575761453b24ea5ab7c58139a6839b92ee863c6a5485ab4a009da7c362471a2b3 WHIRLPOOL f9d7df4687c4d1a402c43ba43acee9f3b1423f8dcc691ef69590554f49530be5df0ef57f0f20b67ba0efb50690cdc744015f1917bb2051857d496c5cf000f948
 DIST ardour-4.4.tar.gz 9511090 SHA256 d567e99c4476c0122006c85d09a8e4eab93db28be7be99d338ea66be8581bfcf SHA512 8df3e4552b0ccdd76c5ccf06224594325bb8c02f897bb79bd983531a2f4f56c60185b6080e2f8eddb6a274b9d48dc93a47ddc5471e05b253d492c09be816dde0 WHIRLPOOL 86e298b7defa5249c0632368bae64ddde2175e5f5ece66b4932485a4216ae0613b81e2f736f54e7f00a600be5e238fe41559fe2290f3aebbb36b208184aefc25
 DIST ardour-4.6.tar.gz 10033725 SHA256 79a3b063f2413d79c4bb2930505e0f6628848258051869095588a50940f49f6b SHA512 8fdda5f6efde18a66d89605f0a4d14756ce573ffc5de54e7229c7aa76ab11cbba33bdb775fb5c5dde86f4d308c2a96b904a0298d7b9c598300ab35e835f2ea0a WHIRLPOOL 0f4e054cdb2a1022f860354d70e4517bebee66e0711f16b4e3b19ebc8f354e364fd1a91e64aa3f7c692f3251ee261cdc2fda29215cef58c9a8cebcc20708af72
+DIST ardour-4.7.tar.gz 9863149 SHA256 dfa3d102b3f7bb0702969153d22d9311ac98c587f691760ab0f1d3f4f455a86d SHA512 5daff563ec0b2dc38ec6ca55bb12526ef54da9d8d5a29a9fd6d869f54b83e6fe5ff3c28ef654e6700455110b4a46ce42a33902eb66d96330c6c0948eb3cd3096 WHIRLPOOL eb94b56a919d0088a312414f45475f53ee8c7f618d85f9ffcf5f27719422c2035ff4608108ecbe0f521d54ed1ad40c06ada0a1cb8f7d70531320f40aa107e4b4

diff --git a/media-sound/ardour/ardour-4.7.ebuild b/media-sound/ardour/ardour-4.7.ebuild
new file mode 100644
index 0000000..6ef94c0
--- /dev/null
+++ b/media-sound/ardour/ardour-4.7.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+#EPYTHON='python2.7'
+inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="http://ardour.org/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-2"
+SLOT="4"
+IUSE="altivec doc jack lv2 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
+	sci-libs/fftw:3.0
+	virtual/libusb:0
+	x11-libs/cairo
+	>=x11-libs/gtk+-2.8.1:2
+	x11-libs/pango
+	jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
+	lv2? (
+		>=media-libs/slv2-0.6.1
+		media-libs/lilv
+		media-libs/sratom
+		dev-libs/sord
+		>=media-libs/suil-0.6.10
+		>=media-libs/lv2-1.4.0
+	)"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
+	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(){
+	if ! [[ ${PV} == *9999* ]]; then
+		epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
+		touch "${S}/libs/ardour/revision.cc"
+	fi
+	use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
+	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
+}
+
+src_configure() {
+	tc-export CC CXX
+	mkdir -p "${D}"
+	waf-utils_src_configure \
+		--destdir="${D}" \
+		--prefix=/usr \
+		--configdir=/etc \
+		--nls \
+		--optimize \
+		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
+		$(usex lv2 "--lv2" "--no-lv2") \
+		$(usex doc "--docs" '') \
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+}
+
+src_install() {
+	waf-utils_src_install
+	mv ${PN}.1 ${PN}${SLOT}.1
+	doman ${PN}${SLOT}.1
+	newicon icons/icon/ardour_icon_tango_48px_red.png ${PN}${SLOT}.png
+	make_desktop_entry ardour4 ardour4 ardour4 AudioVideo
+}
+
+pkg_postinst() {
+	elog "If you are using Ardour and want to keep its development alive"
+	elog "then please consider to make a donation upstream at ${HOMEPAGE}"
+}


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2024-09-15 10:27 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2024-09-15 10:27 UTC (permalink / raw
  To: gentoo-commits

commit:     c3932f19e7542a09636eca760ee81057a7f0ee03
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 15 10:27:17 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Sep 15 10:27:17 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3932f19

media-sound/ardour: updated live ebuild

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/ardour-9999.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 3eb5cde4c590..d3af7b789e27 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -71,7 +71,6 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-6.8-metadata.patch"
-	"${FILESDIR}/${PN}-6.8-boost-1.85.patch"
 )
 
 pkg_pretend() {


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2024-09-13  7:17 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2024-09-13  7:17 UTC (permalink / raw
  To: gentoo-commits

commit:     934b09d4d5ec68ec87bcf4d4534ae78d715965f3
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 13 07:16:52 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Sep 13 07:16:58 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=934b09d4

media-sound/ardour: bump to 8.7 + python 3.13

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/Manifest                                  | 1 +
 media-sound/ardour/ardour-8.6-r1.ebuild                      | 2 +-
 media-sound/ardour/{ardour-9999.ebuild => ardour-8.7.ebuild} | 2 +-
 media-sound/ardour/ardour-9999.ebuild                        | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 497da85e1998..4d138dc00905 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1 +1,2 @@
 DIST Ardour-8.6.0.tar.bz2 17588463 BLAKE2B e8d3b603fecaf453eae9e0c2cac531a5c2d35850b282d27c25dbd22a930a6537fbbff3f1fa58f4dcc525dcc65ef8343172642d16ad473c8b80b0e373364a06cb SHA512 c4a3b6369fe1a1789ba2b5cbcfd23b6ac6b93f819b016aac2c071f1135e32826ca4f5bb99d4c3e4e1d8f91f82719ae17bcf2991eb29072c14e60f282545f934a
+DIST Ardour-8.7.0.tar.bz2 17807972 BLAKE2B 9bbe4ed5c3ad62d643518881a45b71642f5ce41c8620eb4c82befcb9df1053b08b60d3683961d78825f99e3a74222404c511073491972f138edaaaea445c6961 SHA512 cd2cdc1360b01d23cd3df62ee949ecab9d5d8da5112636438c2ef8a88d188503bcd7f09f2a5d8e07460dacbc35cecd96e8edbc748adccc50b5a90375f2f742d0

diff --git a/media-sound/ardour/ardour-8.6-r1.ebuild b/media-sound/ardour/ardour-8.6-r1.ebuild
index f52d764936e0..fa3ba391ecf7 100644
--- a/media-sound/ardour/ardour-8.6-r1.ebuild
+++ b/media-sound/ardour/ardour-8.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{9..13} )
 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

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-8.7.ebuild
similarity index 99%
copy from media-sound/ardour/ardour-9999.ebuild
copy to media-sound/ardour/ardour-8.7.ebuild
index cba836bba78d..3eb5cde4c590 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-8.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{9..13} )
 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

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index cba836bba78d..3eb5cde4c590 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{9..13} )
 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


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2024-08-20 10:37 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2024-08-20 10:37 UTC (permalink / raw
  To: gentoo-commits

commit:     33dd24ea293e4c4cc75807991dcd6635f6989fa4
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 20 10:37:04 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Aug 20 10:37:04 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33dd24ea

media-sound/ardour: dropped obsolete 8.6

Bug: https://bugs.gentoo.org/938176
Closes: https://bugs.gentoo.org/936131
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/ardour-8.6.ebuild | 199 -----------------------------------
 1 file changed, 199 deletions(-)

diff --git a/media-sound/ardour/ardour-8.6.ebuild b/media-sound/ardour/ardour-8.6.ebuild
deleted file mode 100644
index 365ac6ace241..000000000000
--- a/media-sound/ardour/ardour-8.6.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2024 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="8"
-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-text/doxygen[dot] )
-	jack? ( virtual/jack )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.8-metadata.patch"
-	"${FILESDIR}/${PN}-6.8-boost-1.85.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"
-
-	# -Werror=odr
-	# https://tracker.ardour.org/view.php?id=9649
-	# https://bugs.gentoo.org/917095
-	filter-lto
-
-	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 '' || echo "--no-fpu-optimization")
-		$(usex doc "--docs" '')
-		$(usex nls '' "--no-nls")
-		$(usex phonehome '' "--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."
-}


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2024-08-19 10:51 Arthur Zamarin
  0 siblings, 0 replies; 118+ messages in thread
From: Arthur Zamarin @ 2024-08-19 10:51 UTC (permalink / raw
  To: gentoo-commits

commit:     6d899a9d469ef654f1bf455260c44d9d19a49161
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 19 10:51:30 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 19 10:51:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d899a9d

media-sound/ardour: Stabilize 8.6-r1 amd64, #938176

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 media-sound/ardour/ardour-8.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/ardour/ardour-8.6-r1.ebuild b/media-sound/ardour/ardour-8.6-r1.ebuild
index cba836bba78d..f52d764936e0 100644
--- a/media-sound/ardour/ardour-8.6-r1.ebuild
+++ b/media-sound/ardour/ardour-8.6-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~loong ~x86"
+	KEYWORDS="amd64 ~loong ~x86"
 	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2024-07-20  9:55 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2024-07-20  9:55 UTC (permalink / raw
  To: gentoo-commits

commit:     1b4ad675c03bd45029ccee0a8a32b46a63829094
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Fri Jul 19 07:11:08 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Jul 20 09:38:53 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b4ad675

media-sound/ardour: use system gtk2 instead of ytk

ytk is an internal stripped down version of gtk2 intended for distros
who decided to remove gtk2. gtk2 is not yet removed from gentoo, so
lets continue to use it for now.

As a bonus this should fix build on musl.

Bug: https://bugs.gentoo.org/936131
Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Closes: https://github.com/gentoo/gentoo/pull/37614
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/{ardour-9999.ebuild => ardour-8.6-r1.ebuild} | 1 +
 media-sound/ardour/ardour-9999.ebuild                           | 1 +
 2 files changed, 2 insertions(+)

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-8.6-r1.ebuild
similarity index 99%
copy from media-sound/ardour/ardour-9999.ebuild
copy to media-sound/ardour/ardour-8.6-r1.ebuild
index ffe4801efe13..cba836bba78d 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-8.6-r1.ebuild
@@ -146,6 +146,7 @@ src_configure() {
 		--freedesktop
 		--noconfirm
 		--optimize
+		--no-ytk
 		--with-backends=${backends}
 		$({ use cpu_flags_ppc_altivec || use cpu_flags_x86_sse; } && \
 			echo '' || echo "--no-fpu-optimization")

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index ffe4801efe13..cba836bba78d 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -146,6 +146,7 @@ src_configure() {
 		--freedesktop
 		--noconfirm
 		--optimize
+		--no-ytk
 		--with-backends=${backends}
 		$({ use cpu_flags_ppc_altivec || use cpu_flags_x86_sse; } && \
 			echo '' || echo "--no-fpu-optimization")


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2024-05-18  9:54 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2024-05-18  9:54 UTC (permalink / raw
  To: gentoo-commits

commit:     2cf5bd6dd449e1f484dcaebd8edf4ff4c3068fca
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat May 18 09:54:17 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat May 18 09:54:17 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cf5bd6d

media-sound/ardour: dropped obsolete 8.4

Bug: https://bugs.gentoo.org/932081
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/Manifest          |   1 -
 media-sound/ardour/ardour-8.4.ebuild | 198 -----------------------------------
 2 files changed, 199 deletions(-)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 1667aa11aae7..497da85e1998 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,2 +1 @@
-DIST Ardour-8.4.0.tar.bz2 17574218 BLAKE2B a71be1af5577cf3cbded339c2cb25f3124f973bf8966bd663b1c53cdea51e069a61217e844b2ecbf329ddbc54c61e4e4364fc70c9f90cf38871d0ff55e496846 SHA512 838eae28867f1bf108207d171ac60e50d4d7f467a3fd64f95e8c9585d1b2b02ded1af0405c0a363664f9ea3a007143e9ec4e54f36a7df5387b5e12549b804719
 DIST Ardour-8.6.0.tar.bz2 17588463 BLAKE2B e8d3b603fecaf453eae9e0c2cac531a5c2d35850b282d27c25dbd22a930a6537fbbff3f1fa58f4dcc525dcc65ef8343172642d16ad473c8b80b0e373364a06cb SHA512 c4a3b6369fe1a1789ba2b5cbcfd23b6ac6b93f819b016aac2c071f1135e32826ca4f5bb99d4c3e4e1d8f91f82719ae17bcf2991eb29072c14e60f282545f934a

diff --git a/media-sound/ardour/ardour-8.4.ebuild b/media-sound/ardour/ardour-8.4.ebuild
deleted file mode 100644
index 51d880ba1dae..000000000000
--- a/media-sound/ardour/ardour-8.4.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2024 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="8"
-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-text/doxygen[dot] )
-	jack? ( virtual/jack )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.8-metadata.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"
-
-	# -Werror=odr
-	# https://tracker.ardour.org/view.php?id=9649
-	# https://bugs.gentoo.org/917095
-	filter-lto
-
-	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 '' || echo "--no-fpu-optimization")
-		$(usex doc "--docs" '')
-		$(usex nls '' "--no-nls")
-		$(usex phonehome '' "--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."
-}


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2024-05-17 13:05 Sam James
  0 siblings, 0 replies; 118+ messages in thread
From: Sam James @ 2024-05-17 13:05 UTC (permalink / raw
  To: gentoo-commits

commit:     f6517c6659a6b5e9aeebb766e0376aaa9781c094
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 17 13:04:37 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 17 13:04:37 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6517c66

media-sound/ardour: Stabilize 8.6 amd64, #932081

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/ardour/ardour-8.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/ardour/ardour-8.6.ebuild b/media-sound/ardour/ardour-8.6.ebuild
index cee5f390d988..51d880ba1dae 100644
--- a/media-sound/ardour/ardour-8.6.ebuild
+++ b/media-sound/ardour/ardour-8.6.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~loong ~x86"
+	KEYWORDS="amd64 ~loong ~x86"
 	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2024-04-15  7:37 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2024-04-15  7:37 UTC (permalink / raw
  To: gentoo-commits

commit:     2acf5207ba8f52865c0e0af5b34e198b3140591e
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 15 07:37:18 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Apr 15 07:37:28 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2acf5207

media-sound/ardour: bump to 8.6, dropped 8.5

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/Manifest                                 | 2 +-
 media-sound/ardour/{ardour-8.5.ebuild => ardour-8.6.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 99b203f40211..1667aa11aae7 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,2 +1,2 @@
 DIST Ardour-8.4.0.tar.bz2 17574218 BLAKE2B a71be1af5577cf3cbded339c2cb25f3124f973bf8966bd663b1c53cdea51e069a61217e844b2ecbf329ddbc54c61e4e4364fc70c9f90cf38871d0ff55e496846 SHA512 838eae28867f1bf108207d171ac60e50d4d7f467a3fd64f95e8c9585d1b2b02ded1af0405c0a363664f9ea3a007143e9ec4e54f36a7df5387b5e12549b804719
-DIST Ardour-8.5.0.tar.bz2 17589054 BLAKE2B 43cb8be9e5afd1957d7b9672d3f0a77d00bef8805363dd0b117cc1037f6fd509da708fe301a2a17b975ab66350c96cfe650be3f61ed66b659a4b8651900960b9 SHA512 515b9684e8394d591d66b7ed65e8cb6525e20fe23c2755ed7bc28ac1311b14c408a9d7a5218cdf40e60983e6cd400fbab7f3cf2c9385e855efdbe2c713fa2fca
+DIST Ardour-8.6.0.tar.bz2 17588463 BLAKE2B e8d3b603fecaf453eae9e0c2cac531a5c2d35850b282d27c25dbd22a930a6537fbbff3f1fa58f4dcc525dcc65ef8343172642d16ad473c8b80b0e373364a06cb SHA512 c4a3b6369fe1a1789ba2b5cbcfd23b6ac6b93f819b016aac2c071f1135e32826ca4f5bb99d4c3e4e1d8f91f82719ae17bcf2991eb29072c14e60f282545f934a

diff --git a/media-sound/ardour/ardour-8.5.ebuild b/media-sound/ardour/ardour-8.6.ebuild
similarity index 100%
rename from media-sound/ardour/ardour-8.5.ebuild
rename to media-sound/ardour/ardour-8.6.ebuild


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2024-04-12  9:13 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2024-04-12  9:13 UTC (permalink / raw
  To: gentoo-commits

commit:     7edff0b6ea77c4550b83dbe9ff85a7cb23945e36
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 12 09:13:37 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Apr 12 09:13:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7edff0b6

media-sound/ardour: bump to 8.5

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/Manifest          |   1 +
 media-sound/ardour/ardour-8.5.ebuild | 198 +++++++++++++++++++++++++++++++++++
 2 files changed, 199 insertions(+)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 47b40997f3a8..99b203f40211 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1 +1,2 @@
 DIST Ardour-8.4.0.tar.bz2 17574218 BLAKE2B a71be1af5577cf3cbded339c2cb25f3124f973bf8966bd663b1c53cdea51e069a61217e844b2ecbf329ddbc54c61e4e4364fc70c9f90cf38871d0ff55e496846 SHA512 838eae28867f1bf108207d171ac60e50d4d7f467a3fd64f95e8c9585d1b2b02ded1af0405c0a363664f9ea3a007143e9ec4e54f36a7df5387b5e12549b804719
+DIST Ardour-8.5.0.tar.bz2 17589054 BLAKE2B 43cb8be9e5afd1957d7b9672d3f0a77d00bef8805363dd0b117cc1037f6fd509da708fe301a2a17b975ab66350c96cfe650be3f61ed66b659a4b8651900960b9 SHA512 515b9684e8394d591d66b7ed65e8cb6525e20fe23c2755ed7bc28ac1311b14c408a9d7a5218cdf40e60983e6cd400fbab7f3cf2c9385e855efdbe2c713fa2fca

diff --git a/media-sound/ardour/ardour-8.5.ebuild b/media-sound/ardour/ardour-8.5.ebuild
new file mode 100644
index 000000000000..cee5f390d988
--- /dev/null
+++ b/media-sound/ardour/ardour-8.5.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2024 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="8"
+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-text/doxygen[dot] )
+	jack? ( virtual/jack )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.8-metadata.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"
+
+	# -Werror=odr
+	# https://tracker.ardour.org/view.php?id=9649
+	# https://bugs.gentoo.org/917095
+	filter-lto
+
+	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 '' || echo "--no-fpu-optimization")
+		$(usex doc "--docs" '')
+		$(usex nls '' "--no-nls")
+		$(usex phonehome '' "--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."
+}


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2024-03-27  8:34 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2024-03-27  8:34 UTC (permalink / raw
  To: gentoo-commits

commit:     26135c8ce33afc61e2131a6fbf8a480cb8c1b141
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 27 08:34:27 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Mar 27 08:34:27 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26135c8c

media-sound/ardour: dropped obsolete 8.2

Bug: https://bugs.gentoo.org/927772
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/Manifest          |   1 -
 media-sound/ardour/ardour-8.2.ebuild | 193 -----------------------------------
 2 files changed, 194 deletions(-)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 1e71b8eb2649..47b40997f3a8 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,2 +1 @@
-DIST Ardour-8.2.0.tar.bz2 13897958 BLAKE2B 54916b2f0ac3925f160df9536db61b1ece4ace3f9f4a09880c00661e328835a32c04a8faa2b04bb3fe34aeeb97064e0139f4e19524be1a17f33d7e773b893e1b SHA512 62962929201c649a0028c2cfc1e7e6acce3ab9ee24adbc5ebb5a7c3d70f73430c579801788f696769afd2d14d766eb2ef4936b5957dce2288a30cf671ca62ee1
 DIST Ardour-8.4.0.tar.bz2 17574218 BLAKE2B a71be1af5577cf3cbded339c2cb25f3124f973bf8966bd663b1c53cdea51e069a61217e844b2ecbf329ddbc54c61e4e4364fc70c9f90cf38871d0ff55e496846 SHA512 838eae28867f1bf108207d171ac60e50d4d7f467a3fd64f95e8c9585d1b2b02ded1af0405c0a363664f9ea3a007143e9ec4e54f36a7df5387b5e12549b804719

diff --git a/media-sound/ardour/ardour-8.2.ebuild b/media-sound/ardour/ardour-8.2.ebuild
deleted file mode 100644
index b72cb0880944..000000000000
--- a/media-sound/ardour/ardour-8.2.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2024 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="8"
-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-text/doxygen[dot] )
-	jack? ( virtual/jack )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.8-metadata.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 '' || echo "--no-fpu-optimization")
-		$(usex doc "--docs" '')
-		$(usex nls '' "--no-nls")
-		$(usex phonehome '' "--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."
-}


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2024-03-25 10:13 Sam James
  0 siblings, 0 replies; 118+ messages in thread
From: Sam James @ 2024-03-25 10:13 UTC (permalink / raw
  To: gentoo-commits

commit:     b7b9476440483b43febab9a423c37ddd95ed0a08
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 25 10:13:41 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 10:13:41 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7b94764

media-sound/ardour: Stabilize 8.4 amd64, #927772

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/ardour/ardour-8.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/ardour/ardour-8.4.ebuild b/media-sound/ardour/ardour-8.4.ebuild
index cee5f390d988..51d880ba1dae 100644
--- a/media-sound/ardour/ardour-8.4.ebuild
+++ b/media-sound/ardour/ardour-8.4.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~loong ~x86"
+	KEYWORDS="amd64 ~loong ~x86"
 	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2024-02-29  0:51 Sam James
  0 siblings, 0 replies; 118+ messages in thread
From: Sam James @ 2024-02-29  0:51 UTC (permalink / raw
  To: gentoo-commits

commit:     38655534205d0c3d6ffe696d134c88afb6e01603
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Thu Feb 29 00:46:59 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 29 00:51:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38655534

media-sound/ardour: mark as LTO-unsafe

See https://tracker.ardour.org/view.php?id=9649 for details.

Closes: https://bugs.gentoo.org/917095
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/ardour/ardour-8.4.ebuild  | 5 +++++
 media-sound/ardour/ardour-9999.ebuild | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/media-sound/ardour/ardour-8.4.ebuild b/media-sound/ardour/ardour-8.4.ebuild
index 4f99e58488e4..cee5f390d988 100644
--- a/media-sound/ardour/ardour-8.4.ebuild
+++ b/media-sound/ardour/ardour-8.4.ebuild
@@ -130,6 +130,11 @@ src_configure() {
 	# avoid bug https://bugs.gentoo.org/800067
 	local -x AS="$(tc-getCC) -c"
 
+	# -Werror=odr
+	# https://tracker.ardour.org/view.php?id=9649
+	# https://bugs.gentoo.org/917095
+	filter-lto
+
 	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 4f99e58488e4..cee5f390d988 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -130,6 +130,11 @@ src_configure() {
 	# avoid bug https://bugs.gentoo.org/800067
 	local -x AS="$(tc-getCC) -c"
 
+	# -Werror=odr
+	# https://tracker.ardour.org/view.php?id=9649
+	# https://bugs.gentoo.org/917095
+	filter-lto
+
 	local backends="alsa,dummy"
 	use jack && backends+=",jack"
 	use pulseaudio && backends+=",pulseaudio"


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2024-02-21  9:53 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2024-02-21  9:53 UTC (permalink / raw
  To: gentoo-commits

commit:     4e1f1e521247cf971e23759bfc916889ea7beeec
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 21 09:53:24 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Feb 21 09:53:24 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e1f1e52

media-sound/ardour: bump to 8.4

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/Manifest          |   1 +
 media-sound/ardour/ardour-8.4.ebuild | 193 +++++++++++++++++++++++++++++++++++
 2 files changed, 194 insertions(+)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 063cf413e698..1e71b8eb2649 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1 +1,2 @@
 DIST Ardour-8.2.0.tar.bz2 13897958 BLAKE2B 54916b2f0ac3925f160df9536db61b1ece4ace3f9f4a09880c00661e328835a32c04a8faa2b04bb3fe34aeeb97064e0139f4e19524be1a17f33d7e773b893e1b SHA512 62962929201c649a0028c2cfc1e7e6acce3ab9ee24adbc5ebb5a7c3d70f73430c579801788f696769afd2d14d766eb2ef4936b5957dce2288a30cf671ca62ee1
+DIST Ardour-8.4.0.tar.bz2 17574218 BLAKE2B a71be1af5577cf3cbded339c2cb25f3124f973bf8966bd663b1c53cdea51e069a61217e844b2ecbf329ddbc54c61e4e4364fc70c9f90cf38871d0ff55e496846 SHA512 838eae28867f1bf108207d171ac60e50d4d7f467a3fd64f95e8c9585d1b2b02ded1af0405c0a363664f9ea3a007143e9ec4e54f36a7df5387b5e12549b804719

diff --git a/media-sound/ardour/ardour-8.4.ebuild b/media-sound/ardour/ardour-8.4.ebuild
new file mode 100644
index 000000000000..4f99e58488e4
--- /dev/null
+++ b/media-sound/ardour/ardour-8.4.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2024 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="8"
+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-text/doxygen[dot] )
+	jack? ( virtual/jack )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.8-metadata.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 '' || echo "--no-fpu-optimization")
+		$(usex doc "--docs" '')
+		$(usex nls '' "--no-nls")
+		$(usex phonehome '' "--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."
+}


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2024-01-13 13:01 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2024-01-13 13:01 UTC (permalink / raw
  To: gentoo-commits

commit:     1006e11883a439337e9801abd515180b93157893
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 13 13:00:52 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Jan 13 13:00:52 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1006e118

media-sound/ardour: dropped obsolete 8.1

Bug: https://bugs.gentoo.org/921978
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/Manifest          |   1 -
 media-sound/ardour/ardour-8.1.ebuild | 193 -----------------------------------
 2 files changed, 194 deletions(-)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 10a2579f9759..063cf413e698 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,2 +1 @@
-DIST Ardour-8.1.0.tar.bz2 13835817 BLAKE2B 1d1e048ea8a23ba0a6b6cabda7c3d21ff9630ea02d70025fc414661612f8d674ffc2143578b3cd9cb43240a0fb823d731bbe14eac6b33816047ce4b04c4ff09f SHA512 d8e534b67b0b7daba0c6b384cb718d077739c538ee3371b3dd415589b34d03bdaf6270e8e2f953c6fd404ac52930a4e485cf0639b02fd5681a7b38584f5ce14c
 DIST Ardour-8.2.0.tar.bz2 13897958 BLAKE2B 54916b2f0ac3925f160df9536db61b1ece4ace3f9f4a09880c00661e328835a32c04a8faa2b04bb3fe34aeeb97064e0139f4e19524be1a17f33d7e773b893e1b SHA512 62962929201c649a0028c2cfc1e7e6acce3ab9ee24adbc5ebb5a7c3d70f73430c579801788f696769afd2d14d766eb2ef4936b5957dce2288a30cf671ca62ee1

diff --git a/media-sound/ardour/ardour-8.1.ebuild b/media-sound/ardour/ardour-8.1.ebuild
deleted file mode 100644
index b72cb0880944..000000000000
--- a/media-sound/ardour/ardour-8.1.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2024 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="8"
-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-text/doxygen[dot] )
-	jack? ( virtual/jack )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.8-metadata.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 '' || echo "--no-fpu-optimization")
-		$(usex doc "--docs" '')
-		$(usex nls '' "--no-nls")
-		$(usex phonehome '' "--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."
-}


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2024-01-13 12:49 Arthur Zamarin
  0 siblings, 0 replies; 118+ messages in thread
From: Arthur Zamarin @ 2024-01-13 12:49 UTC (permalink / raw
  To: gentoo-commits

commit:     0266c591c80da5beb493b65667ac964fb10c73b2
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 13 12:48:47 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 13 12:48:47 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0266c591

media-sound/ardour: Stabilize 8.2 amd64, #921978

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 media-sound/ardour/ardour-8.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/ardour/ardour-8.2.ebuild b/media-sound/ardour/ardour-8.2.ebuild
index 4f99e58488e4..b72cb0880944 100644
--- a/media-sound/ardour/ardour-8.2.ebuild
+++ b/media-sound/ardour/ardour-8.2.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~loong ~x86"
+	KEYWORDS="amd64 ~loong ~x86"
 	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2023-12-13 22:46 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2023-12-13 22:46 UTC (permalink / raw
  To: gentoo-commits

commit:     7f8ac5bb0b90b8569c13e586d78d7c258d5f1df6
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 13 22:46:26 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Dec 13 22:46:26 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f8ac5bb

media-sound/ardour: bump to 8.2

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/Manifest          |   1 +
 media-sound/ardour/ardour-8.2.ebuild | 193 +++++++++++++++++++++++++++++++++++
 2 files changed, 194 insertions(+)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index f6ac30aff411..1c2296eb8879 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,2 +1,3 @@
 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

diff --git a/media-sound/ardour/ardour-8.2.ebuild b/media-sound/ardour/ardour-8.2.ebuild
new file mode 100644
index 000000000000..1f492cf44559
--- /dev/null
+++ b/media-sound/ardour/ardour-8.2.ebuild
@@ -0,0 +1,193 @@
+# 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="8"
+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"
+)
+
+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 '' || echo "--no-fpu-optimization")
+		$(usex doc "--docs" '')
+		$(usex nls '' "--no-nls")
+		$(usex phonehome '' "--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."
+}


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2023-11-22 11:16 Arthur Zamarin
  0 siblings, 0 replies; 118+ messages in thread
From: Arthur Zamarin @ 2023-11-22 11:16 UTC (permalink / raw
  To: gentoo-commits

commit:     6c7de3748b90c72f76a7adc6c63cab7f321d0f03
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 22 11:15:35 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 11:15:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c7de374

media-sound/ardour: Stabilize 8.1 amd64, #917663

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 media-sound/ardour/ardour-8.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/ardour/ardour-8.1.ebuild b/media-sound/ardour/ardour-8.1.ebuild
index 1f492cf44559..f5f3b85ba401 100644
--- a/media-sound/ardour/ardour-8.1.ebuild
+++ b/media-sound/ardour/ardour-8.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~loong ~x86"
+	KEYWORDS="amd64 ~loong ~x86"
 	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2023-10-21  8:12 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2023-10-21  8:12 UTC (permalink / raw
  To: gentoo-commits

commit:     e0490d8ab7deae2fcc309cd190ebfa97228f8ce0
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 21 08:08:08 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Oct 21 08:08:08 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0490d8a

media-sound/ardour: bump to 8.1 (bugfix release), dropped 8.0

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/Manifest                                 | 2 +-
 media-sound/ardour/{ardour-8.0.ebuild => ardour-8.1.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 030599dd1643..f6ac30aff411 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,2 +1,2 @@
 DIST Ardour-7.5.0.tar.bz2 13465772 BLAKE2B 647a6f952431c77ec6a66837e9668c75b69eb1a228c32c87772baf9a6dc18ab3554eea2c4056fe9d31c38acc398a3e55f681b66413bac49a9c8069f002c592c8 SHA512 9c3e37b5e4c12f2efd0fa567c2c0c7a324d3b4e6b86e2931b6574ca9bfdbc1e8af08bdf4d84bdc7cad9372d8015adb27410385bee0d6d8efec090bb26c319f8e
-DIST Ardour-8.0.0.tar.bz2 13828001 BLAKE2B 3ea0b6195a21f69e1ba240d728a2ebe41d55d3cd50e02daf432567b65043632ede9d095ad160ab46677124aa070751f55c66697c86ddf6978cf860cc8d8297d5 SHA512 c9354cc64c36841a7662b88cdef86438b13b5dda753cd06c76ca4839fa3532e468e3e4c42b4c09b032521438c978410a13663158c5d899295b641bcc61c041c2
+DIST Ardour-8.1.0.tar.bz2 13835817 BLAKE2B 1d1e048ea8a23ba0a6b6cabda7c3d21ff9630ea02d70025fc414661612f8d674ffc2143578b3cd9cb43240a0fb823d731bbe14eac6b33816047ce4b04c4ff09f SHA512 d8e534b67b0b7daba0c6b384cb718d077739c538ee3371b3dd415589b34d03bdaf6270e8e2f953c6fd404ac52930a4e485cf0639b02fd5681a7b38584f5ce14c

diff --git a/media-sound/ardour/ardour-8.0.ebuild b/media-sound/ardour/ardour-8.1.ebuild
similarity index 100%
rename from media-sound/ardour/ardour-8.0.ebuild
rename to media-sound/ardour/ardour-8.1.ebuild


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2023-10-15 21:09 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2023-10-15 21:09 UTC (permalink / raw
  To: gentoo-commits

commit:     2d7965c1692dbdad4db8556d5ca82fb43592c0ab
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 15 21:08:57 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Oct 15 21:09:15 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d7965c1

media-sound/ardour: fixed a config switch in 8.0 and live

Closes: https://bugs.gentoo.org/915829
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/ardour-8.0.ebuild  | 2 +-
 media-sound/ardour/ardour-9999.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/ardour/ardour-8.0.ebuild b/media-sound/ardour/ardour-8.0.ebuild
index dc901064219f..1f492cf44559 100644
--- a/media-sound/ardour/ardour-8.0.ebuild
+++ b/media-sound/ardour/ardour-8.0.ebuild
@@ -145,7 +145,7 @@ src_configure() {
 			echo '' || echo "--no-fpu-optimization")
 		$(usex doc "--docs" '')
 		$(usex nls '' "--no-nls")
-		$(usex phonehome "--phone-home" "--no-phone-home")
+		$(usex phonehome '' "--no-phone-home")
 		# not possible right now  --use-external-libs
 		# missing dependency: https://github.com/c4dm/qm-dsp
 	)

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index dc901064219f..1f492cf44559 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -145,7 +145,7 @@ src_configure() {
 			echo '' || echo "--no-fpu-optimization")
 		$(usex doc "--docs" '')
 		$(usex nls '' "--no-nls")
-		$(usex phonehome "--phone-home" "--no-phone-home")
+		$(usex phonehome '' "--no-phone-home")
 		# not possible right now  --use-external-libs
 		# missing dependency: https://github.com/c4dm/qm-dsp
 	)


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2023-10-09 11:33 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2023-10-09 11:33 UTC (permalink / raw
  To: gentoo-commits

commit:     c2ef47c6398c5b969451586997ff2dbb306b0642
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  9 11:33:41 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Oct  9 11:33:41 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2ef47c6

media-sound/ardour: bump to 8.0

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/Manifest          |   1 +
 media-sound/ardour/ardour-8.0.ebuild | 193 +++++++++++++++++++++++++++++++++++
 2 files changed, 194 insertions(+)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 65460172da1b..030599dd1643 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1 +1,2 @@
 DIST Ardour-7.5.0.tar.bz2 13465772 BLAKE2B 647a6f952431c77ec6a66837e9668c75b69eb1a228c32c87772baf9a6dc18ab3554eea2c4056fe9d31c38acc398a3e55f681b66413bac49a9c8069f002c592c8 SHA512 9c3e37b5e4c12f2efd0fa567c2c0c7a324d3b4e6b86e2931b6574ca9bfdbc1e8af08bdf4d84bdc7cad9372d8015adb27410385bee0d6d8efec090bb26c319f8e
+DIST Ardour-8.0.0.tar.bz2 13828001 BLAKE2B 3ea0b6195a21f69e1ba240d728a2ebe41d55d3cd50e02daf432567b65043632ede9d095ad160ab46677124aa070751f55c66697c86ddf6978cf860cc8d8297d5 SHA512 c9354cc64c36841a7662b88cdef86438b13b5dda753cd06c76ca4839fa3532e468e3e4c42b4c09b032521438c978410a13663158c5d899295b641bcc61c041c2

diff --git a/media-sound/ardour/ardour-8.0.ebuild b/media-sound/ardour/ardour-8.0.ebuild
new file mode 100644
index 000000000000..dc901064219f
--- /dev/null
+++ b/media-sound/ardour/ardour-8.0.ebuild
@@ -0,0 +1,193 @@
+# 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="8"
+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"
+)
+
+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 '' || echo "--no-fpu-optimization")
+		$(usex doc "--docs" '')
+		$(usex 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."
+}


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2023-10-08  8:58 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2023-10-08  8:58 UTC (permalink / raw
  To: gentoo-commits

commit:     2d426c5f8fb389aabbe2eeb76cb30d4fc6771e11
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  8 08:58:13 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Oct  8 08:58:26 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d426c5f

media-sound/ardour: added dependency on net-libs/libwebsockets

Closes: https://bugs.gentoo.org/915143
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/{ardour-7.5-r2.ebuild => ardour-7.5-r3.ebuild} | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-sound/ardour/ardour-7.5-r2.ebuild b/media-sound/ardour/ardour-7.5-r3.ebuild
similarity index 99%
rename from media-sound/ardour/ardour-7.5-r2.ebuild
rename to media-sound/ardour/ardour-7.5-r3.ebuild
index 82c6d9e313d4..dbd8b4331e81 100644
--- a/media-sound/ardour/ardour-7.5-r2.ebuild
+++ b/media-sound/ardour/ardour-7.5-r3.ebuild
@@ -44,6 +44,7 @@ RDEPEND="
 	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]


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2023-10-03 22:02 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2023-10-03 22:02 UTC (permalink / raw
  To: gentoo-commits

commit:     09714d5ce7591dd8f9a1f7f0cb48d10df4b319a0
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  3 22:02:05 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Oct  3 22:02:33 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09714d5c

synced with live ebuild

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../ardour/{ardour-7.5-r1.ebuild => ardour-7.5-r2.ebuild}        | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/media-sound/ardour/ardour-7.5-r1.ebuild b/media-sound/ardour/ardour-7.5-r2.ebuild
similarity index 96%
rename from media-sound/ardour/ardour-7.5-r1.ebuild
rename to media-sound/ardour/ardour-7.5-r2.ebuild
index c68a856a7726..82c6d9e313d4 100644
--- a/media-sound/ardour/ardour-7.5-r1.ebuild
+++ b/media-sound/ardour/ardour-7.5-r2.ebuild
@@ -88,7 +88,10 @@ 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
@@ -110,9 +113,13 @@ src_prepare() {
 	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
 	}
@@ -140,6 +147,7 @@ src_configure() {
 		$(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[@]}"
@@ -173,6 +181,7 @@ src_install() {
 
 	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() {


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2023-10-03 21:51 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2023-10-03 21:51 UTC (permalink / raw
  To: gentoo-commits

commit:     4ed1a0d02171698e27f9d70052f215b0e8c515ca
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  3 21:45:30 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Oct  3 21:51:04 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ed1a0d0

media-sound/ardour: added python3.12

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/ardour-7.5-r1.ebuild | 2 +-
 media-sound/ardour/ardour-9999.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/ardour/ardour-7.5-r1.ebuild b/media-sound/ardour/ardour-7.5-r1.ebuild
index bf49fc7991dd..c68a856a7726 100644
--- a/media-sound/ardour/ardour-7.5-r1.ebuild
+++ b/media-sound/ardour/ardour-7.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+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

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 65be1faeb514..dc901064219f 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+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


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2023-10-03 21:51 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2023-10-03 21:51 UTC (permalink / raw
  To: gentoo-commits

commit:     6f343e89c0109e4960dd7a45915446d543acf2fd
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  3 21:40:00 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Oct  3 21:50:59 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f343e89

media-sound/ardour: dropped unused dependency

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/ardour-7.5-r1.ebuild | 1 -
 media-sound/ardour/ardour-9999.ebuild   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/media-sound/ardour/ardour-7.5-r1.ebuild b/media-sound/ardour/ardour-7.5-r1.ebuild
index eb2d466bd5c7..bf49fc7991dd 100644
--- a/media-sound/ardour/ardour-7.5-r1.ebuild
+++ b/media-sound/ardour/ardour-7.5-r1.ebuild
@@ -35,7 +35,6 @@ RDEPEND="
 	media-libs/aubio
 	media-libs/flac:=
 	media-libs/freetype:2
-	media-libs/libart_lgpl
 	media-libs/liblo
 	media-libs/liblrdf
 	media-libs/libsamplerate

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index dd0ad0671839..65be1faeb514 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -35,7 +35,6 @@ RDEPEND="
 	media-libs/aubio
 	media-libs/flac:=
 	media-libs/freetype:2
-	media-libs/libart_lgpl
 	media-libs/liblo
 	media-libs/liblrdf
 	media-libs/libsamplerate


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2023-10-03 21:34 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2023-10-03 21:34 UTC (permalink / raw
  To: gentoo-commits

commit:     27bbe563dd0c86d055dd0244b209f9f3302dd44a
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  3 21:32:34 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Oct  3 21:34:10 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27bbe563

media-sound/ardour: dropped D variable from src_configure

Closes: https://bugs.gentoo.org/836075
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/ardour-7.5-r1.ebuild | 1 -
 media-sound/ardour/ardour-9999.ebuild   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/media-sound/ardour/ardour-7.5-r1.ebuild b/media-sound/ardour/ardour-7.5-r1.ebuild
index 65e86add3cdf..eb2d466bd5c7 100644
--- a/media-sound/ardour/ardour-7.5-r1.ebuild
+++ b/media-sound/ardour/ardour-7.5-r1.ebuild
@@ -129,7 +129,6 @@ src_configure() {
 	use pulseaudio && backends+=",pulseaudio"
 
 	tc-export CC CXX
-	mkdir -p "${D}"
 	local myconf=(
 		--configdir=/etc
 		--freedesktop

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index e5e14cd43ea4..dd0ad0671839 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -136,7 +136,6 @@ src_configure() {
 	use pulseaudio && backends+=",pulseaudio"
 
 	tc-export CC CXX
-	mkdir -p "${D}"
 	local myconf=(
 		--configdir=/etc
 		--freedesktop


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2023-10-03 21:18 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2023-10-03 21:18 UTC (permalink / raw
  To: gentoo-commits

commit:     d87d765a9a84da866c8815d4b502d366d0faac51
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  3 21:18:38 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Oct  3 21:18:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d87d765a

media-sound/ardour: dropped obsolete 7.4-r3

Bug: https://bugs.gentoo.org/911236
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/Manifest             |   1 -
 media-sound/ardour/ardour-7.4-r3.ebuild | 186 --------------------------------
 2 files changed, 187 deletions(-)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 00cc8fbcec20..65460172da1b 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,2 +1 @@
-DIST Ardour-7.4.0.tar.bz2 12940403 BLAKE2B 4f3ca19e44a9ab5908fb6a6cf29adefb6a7abf4a9f43f810f0a0fdbe8fc1e11cdb49e2a66336fddb0e5d49a0780ac5af7b9363d2f14d9e309b787ceb8c8dd060 SHA512 2533167986a8b7550848e03475931fcd1409f188abed0c7c2a5999869995a73576976d02080cf2ac310113b57ff62d39031615c92cb4fafbe5d96edfc3a4ec45
 DIST Ardour-7.5.0.tar.bz2 13465772 BLAKE2B 647a6f952431c77ec6a66837e9668c75b69eb1a228c32c87772baf9a6dc18ab3554eea2c4056fe9d31c38acc398a3e55f681b66413bac49a9c8069f002c592c8 SHA512 9c3e37b5e4c12f2efd0fa567c2c0c7a324d3b4e6b86e2931b6574ca9bfdbc1e8af08bdf4d84bdc7cad9372d8015adb27410385bee0d6d8efec090bb26c319f8e

diff --git a/media-sound/ardour/ardour-7.4-r3.ebuild b/media-sound/ardour/ardour-7.4-r3.ebuild
deleted file mode 100644
index c9ac3af6d6f0..000000000000
--- a/media-sound/ardour/ardour-7.4-r3.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-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 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/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-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
-
-	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
-	}
-	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
-	mkdir -p "${D}"
-	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
-	)
-
-	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
-}
-
-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."
-}


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2023-10-03 21:17 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2023-10-03 21:17 UTC (permalink / raw
  To: gentoo-commits

commit:     5042887ad34839040e0e73c49a0b11c768a2a7be
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  3 21:16:45 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Oct  3 21:16:45 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5042887a

media-sound/ardour: stabilized x86 (bug ignored), bug #911236

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/ardour-7.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/ardour/ardour-7.5-r1.ebuild b/media-sound/ardour/ardour-7.5-r1.ebuild
index b4284c57729e..65e86add3cdf 100644
--- a/media-sound/ardour/ardour-7.5-r1.ebuild
+++ b/media-sound/ardour/ardour-7.5-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
 	inherit git-r3
 else
-	KEYWORDS="amd64 ~loong ~x86"
+	KEYWORDS="amd64 ~loong x86"
 	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2023-10-03 19:05 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2023-10-03 19:05 UTC (permalink / raw
  To: gentoo-commits

commit:     e1ec76820de921b84b3f4fd432aac07ff7da1897
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  3 19:05:24 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Oct  3 19:05:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1ec7682

media-sound/ardour: fixed live ebuild

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/ardour-9999.ebuild | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index d38fad48fe22..e5e14cd43ea4 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -21,8 +21,8 @@ else
 fi
 
 LICENSE="GPL-2"
-SLOT="7"
-IUSE="doc jack phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+SLOT="8"
+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
@@ -45,6 +45,7 @@ RDEPEND="
 	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]
@@ -88,7 +89,10 @@ 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
@@ -110,9 +114,13 @@ src_prepare() {
 	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
 	}
@@ -135,11 +143,13 @@ src_configure() {
 		--noconfirm
 		--optimize
 		--with-backends=${backends}
-		--no-fpu-optimization
+		$({ use cpu_flags_ppc_altivec || use cpu_flags_x86_sse; } && \
+			echo '' || echo "--no-fpu-optimization")
 		$(usex doc "--docs" '')
-		--no-nls
+		$(usex 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[@]}"
@@ -173,6 +183,7 @@ src_install() {
 
 	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() {


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2023-09-24  7:48 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2023-09-24  7:48 UTC (permalink / raw
  To: gentoo-commits

commit:     441445f817376c4cf58969ca9dea625090bc1d12
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 24 07:47:22 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Sep 24 07:48:10 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=441445f8

media-sound/ardour: some cleanup

dropped dev-libs/libxslt & =gnome-base/libgnomecanvas from all ebuilds
dropped unsupported configuration switched from live ebuild (though it still fails to compile)

Bug: https://bugs.gentoo.org/808381
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/ardour-7.4-r3.ebuild | 2 --
 media-sound/ardour/ardour-7.5-r1.ebuild | 2 --
 media-sound/ardour/ardour-9999.ebuild   | 9 +++------
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/media-sound/ardour/ardour-7.4-r3.ebuild b/media-sound/ardour/ardour-7.4-r3.ebuild
index 0fee9b81252e..c9ac3af6d6f0 100644
--- a/media-sound/ardour/ardour-7.4-r3.ebuild
+++ b/media-sound/ardour/ardour-7.4-r3.ebuild
@@ -31,8 +31,6 @@ RDEPEND="
 	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:=

diff --git a/media-sound/ardour/ardour-7.5-r1.ebuild b/media-sound/ardour/ardour-7.5-r1.ebuild
index e012233b45d4..b4284c57729e 100644
--- a/media-sound/ardour/ardour-7.5-r1.ebuild
+++ b/media-sound/ardour/ardour-7.5-r1.ebuild
@@ -31,8 +31,6 @@ RDEPEND="
 	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:=

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 6416faf2f9b8..d38fad48fe22 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -22,7 +22,7 @@ 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"
+IUSE="doc jack phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
 
 RDEPEND="
 	dev-cpp/glibmm:2
@@ -31,8 +31,6 @@ RDEPEND="
 	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:=
@@ -137,10 +135,9 @@ src_configure() {
 		--noconfirm
 		--optimize
 		--with-backends=${backends}
-		$({ use cpu_flags_ppc_altivec || use cpu_flags_x86_sse; } && \
-			echo "--fpu-optimization" || echo "--no-fpu-optimization")
+		--no-fpu-optimization
 		$(usex doc "--docs" '')
-		$(usex nls "--nls" "--no-nls")
+		--no-nls
 		$(usex phonehome "--phone-home" "--no-phone-home")
 		# not possible right now  --use-external-libs
 	)


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2023-09-06 18:43 WANG Xuerui
  0 siblings, 0 replies; 118+ messages in thread
From: WANG Xuerui @ 2023-09-06 18:43 UTC (permalink / raw
  To: gentoo-commits

commit:     dee0b20c10136da46d94ef9886a7e563e10457f6
Author:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 31 21:11:09 2023 +0000
Commit:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Wed Sep  6 18:29:09 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dee0b20c

media-sound/ardour: keyword 7.5 for ~loong

Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>

 media-sound/ardour/ardour-7.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/ardour/ardour-7.5.ebuild b/media-sound/ardour/ardour-7.5.ebuild
index 8a8f569fbeb5..2bef74d90d7e 100644
--- a/media-sound/ardour/ardour-7.5.ebuild
+++ b/media-sound/ardour/ardour-7.5.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
 	inherit git-r3
 else
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 ~loong ~x86"
 	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2023-09-06 18:43 WANG Xuerui
  0 siblings, 0 replies; 118+ messages in thread
From: WANG Xuerui @ 2023-09-06 18:43 UTC (permalink / raw
  To: gentoo-commits

commit:     47f094ac46178d9e87f002f2c59464546fe1b932
Author:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 31 21:11:11 2023 +0000
Commit:     WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Wed Sep  6 18:29:09 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47f094ac

media-sound/ardour: forward ~loong

Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org>

 media-sound/ardour/ardour-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 93b6a1742f84..607dfeed3930 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~loong ~x86"
 	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2023-07-26 23:11 Sam James
  0 siblings, 0 replies; 118+ messages in thread
From: Sam James @ 2023-07-26 23:11 UTC (permalink / raw
  To: gentoo-commits

commit:     0338403d5239a78b1e27e4dc3996047ed7279131
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 26 23:11:19 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 26 23:11:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0338403d

media-sound/ardour: Stabilize 7.5 amd64, #911236

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/ardour/ardour-7.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/ardour/ardour-7.5.ebuild b/media-sound/ardour/ardour-7.5.ebuild
index 93b6a1742f84..8a8f569fbeb5 100644
--- a/media-sound/ardour/ardour-7.5.ebuild
+++ b/media-sound/ardour/ardour-7.5.ebuild
@@ -15,7 +15,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


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2023-06-25  7:21 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2023-06-25  7:21 UTC (permalink / raw
  To: gentoo-commits

commit:     c6f10e73f3f6004a9c4581933c15157d5fb3c5bf
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 25 07:21:00 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Jun 25 07:21:54 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6f10e73

media-sound/ardour: bump to 7.5

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/Manifest          |   1 +
 media-sound/ardour/ardour-7.5.ebuild | 190 +++++++++++++++++++++++++++++++++++
 2 files changed, 191 insertions(+)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index ae2ac2cf95c6..00cc8fbcec20 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1 +1,2 @@
 DIST Ardour-7.4.0.tar.bz2 12940403 BLAKE2B 4f3ca19e44a9ab5908fb6a6cf29adefb6a7abf4a9f43f810f0a0fdbe8fc1e11cdb49e2a66336fddb0e5d49a0780ac5af7b9363d2f14d9e309b787ceb8c8dd060 SHA512 2533167986a8b7550848e03475931fcd1409f188abed0c7c2a5999869995a73576976d02080cf2ac310113b57ff62d39031615c92cb4fafbe5d96edfc3a4ec45
+DIST Ardour-7.5.0.tar.bz2 13465772 BLAKE2B 647a6f952431c77ec6a66837e9668c75b69eb1a228c32c87772baf9a6dc18ab3554eea2c4056fe9d31c38acc398a3e55f681b66413bac49a9c8069f002c592c8 SHA512 9c3e37b5e4c12f2efd0fa567c2c0c7a324d3b4e6b86e2931b6574ca9bfdbc1e8af08bdf4d84bdc7cad9372d8015adb27410385bee0d6d8efec090bb26c319f8e

diff --git a/media-sound/ardour/ardour-7.5.ebuild b/media-sound/ardour/ardour-7.5.ebuild
new file mode 100644
index 000000000000..93b6a1742f84
--- /dev/null
+++ b/media-sound/ardour/ardour-7.5.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+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 ~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
+	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-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
+
+	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
+	}
+	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
+	mkdir -p "${D}"
+	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
+	)
+
+	[[ "$(tc-get-cxx-stdlib)" = "libc++" ]] && myconf+=( --use-libc++ )
+
+	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
+}
+
+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."
+}


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2023-05-30  5:50 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2023-05-30  5:50 UTC (permalink / raw
  To: gentoo-commits

commit:     37754f73a530ec6b9d7b00258257b7d29a24d54a
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue May 30 05:50:39 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue May 30 05:50:39 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37754f73

media-sound/ardour: dropped obsolete 6.9-r2 & 7.3-r1

Bug: https://bugs.gentoo.org/884239
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/Manifest             |   2 -
 media-sound/ardour/ardour-6.9-r2.ebuild | 183 -------------------------------
 media-sound/ardour/ardour-7.3-r1.ebuild | 186 --------------------------------
 3 files changed, 371 deletions(-)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index d8cf7dc01774..ae2ac2cf95c6 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,3 +1 @@
-DIST Ardour-6.9.0.tar.bz2 12297369 BLAKE2B 62037130b9f2d15a7f527b549c552a281105298dc85e3019d0f7ac09cb791f2b5460c4a7bd2f2098ccade6b87c70a16e6414691d90ec4baafeb6065f26d10a66 SHA512 ace45f5bfe6d0c9e4bb1712ae53ebaee2f15f883045650cae3ddcae251d4fd2f645ba745effb739b47c73a0568ae9e8ae443b711dd610584e04575fd9046b234
-DIST Ardour-7.3.0.tar.bz2 12897398 BLAKE2B 518de10fd43220e843c775c9374347cf827562ff979a99ecdb9507f69daad642345a1c2ddec6f601511b599167a6904905dcdd25ac15f71616c3cb432897545d SHA512 4c0119768015aea447ea5c4ef15708a6440e189bd3578aca74b8ea2cac86920a8c8bd975e03f2af25108f76231d8afccf0003e6a2f8de1de28bcdce9085fe98c
 DIST Ardour-7.4.0.tar.bz2 12940403 BLAKE2B 4f3ca19e44a9ab5908fb6a6cf29adefb6a7abf4a9f43f810f0a0fdbe8fc1e11cdb49e2a66336fddb0e5d49a0780ac5af7b9363d2f14d9e309b787ceb8c8dd060 SHA512 2533167986a8b7550848e03475931fcd1409f188abed0c7c2a5999869995a73576976d02080cf2ac310113b57ff62d39031615c92cb4fafbe5d96edfc3a4ec45

diff --git a/media-sound/ardour/ardour-6.9-r2.ebuild b/media-sound/ardour/ardour-6.9-r2.ebuild
deleted file mode 100644
index 7d328f9b56f6..000000000000
--- a/media-sound/ardour/ardour-6.9-r2.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE='threads(+)'
-PLOCALES="cs de el en_GB es eu fr it ja 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 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="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
-	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[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"
-)
-
-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() {
-	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
-	}
-	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
-	mkdir -p "${D}"
-	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
-	)
-
-	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
-}
-
-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-7.3-r1.ebuild b/media-sound/ardour/ardour-7.3-r1.ebuild
deleted file mode 100644
index b956ddf4cfa5..000000000000
--- a/media-sound/ardour/ardour-7.3-r1.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-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 ~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
-	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[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"
-)
-
-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
-	}
-	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
-	mkdir -p "${D}"
-	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
-	)
-
-	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
-}
-
-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."
-}


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2023-05-29 17:57 Arthur Zamarin
  0 siblings, 0 replies; 118+ messages in thread
From: Arthur Zamarin @ 2023-05-29 17:57 UTC (permalink / raw
  To: gentoo-commits

commit:     accc6a0478681d2bbb42cb45401f8ad190c0d5c6
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon May 29 17:57:42 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon May 29 17:57:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=accc6a04

media-sound/ardour: Stabilize 7.4-r2 x86, #884239

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 media-sound/ardour/ardour-7.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/ardour/ardour-7.4-r2.ebuild b/media-sound/ardour/ardour-7.4-r2.ebuild
index c6a5540799d5..7393250c576f 100644
--- a/media-sound/ardour/ardour-7.4-r2.ebuild
+++ b/media-sound/ardour/ardour-7.4-r2.ebuild
@@ -15,7 +15,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


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2023-05-29 17:57 Arthur Zamarin
  0 siblings, 0 replies; 118+ messages in thread
From: Arthur Zamarin @ 2023-05-29 17:57 UTC (permalink / raw
  To: gentoo-commits

commit:     e0f7408a35e408f84ac2b3ec9446fa3fa8ca8cf2
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon May 29 17:57:04 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon May 29 17:57:04 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0f7408a

media-sound/ardour: Stabilize 7.4-r2 amd64, #884239

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 media-sound/ardour/ardour-7.4-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/ardour/ardour-7.4-r2.ebuild b/media-sound/ardour/ardour-7.4-r2.ebuild
index 0d0ba16716f4..c6a5540799d5 100644
--- a/media-sound/ardour/ardour-7.4-r2.ebuild
+++ b/media-sound/ardour/ardour-7.4-r2.ebuild
@@ -15,7 +15,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


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2023-05-29 13:11 Andreas Sturmlechner
  0 siblings, 0 replies; 118+ messages in thread
From: Andreas Sturmlechner @ 2023-05-29 13:11 UTC (permalink / raw
  To: gentoo-commits

commit:     104020af1de0af8c568c608a14f9592a37ba3fdb
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 29 09:28:02 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May 29 13:10:53 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=104020af

media-sound/ardour: Switch IUSE=pulseaudio to media-libs/libpulse

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-sound/ardour/ardour-9999.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index b956ddf4cfa5..0d0ba16716f4 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
 PYTHON_COMPAT=( python3_{9..11} )
 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"
@@ -54,7 +55,7 @@ RDEPEND="
 	x11-libs/gtk+:2
 	x11-libs/pango
 	jack? ( virtual/jack )
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? ( media-libs/libpulse )
 	media-libs/lilv
 	media-libs/sratom
 	dev-libs/sord


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2023-05-29 13:11 Andreas Sturmlechner
  0 siblings, 0 replies; 118+ messages in thread
From: Andreas Sturmlechner @ 2023-05-29 13:11 UTC (permalink / raw
  To: gentoo-commits

commit:     d854f01cdc9737705bb0a51c0b961aa821279aa3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 29 10:53:04 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May 29 13:10:54 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d854f01c

media-sound/ardour: 7.4: Switch IUSE=pulseaudio to media-libs/libpulse

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-sound/ardour/{ardour-7.4-r1.ebuild => ardour-7.4-r2.ebuild} | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media-sound/ardour/ardour-7.4-r1.ebuild b/media-sound/ardour/ardour-7.4-r2.ebuild
similarity index 99%
rename from media-sound/ardour/ardour-7.4-r1.ebuild
rename to media-sound/ardour/ardour-7.4-r2.ebuild
index b956ddf4cfa5..0d0ba16716f4 100644
--- a/media-sound/ardour/ardour-7.4-r1.ebuild
+++ b/media-sound/ardour/ardour-7.4-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
 PYTHON_COMPAT=( python3_{9..11} )
 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"
@@ -54,7 +55,7 @@ RDEPEND="
 	x11-libs/gtk+:2
 	x11-libs/pango
 	jack? ( virtual/jack )
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? ( media-libs/libpulse )
 	media-libs/lilv
 	media-libs/sratom
 	dev-libs/sord


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2023-05-21  7:46 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2023-05-21  7:46 UTC (permalink / raw
  To: gentoo-commits

commit:     f78b62df98d79228a5e3fbc7103f69f02f1f6d1f
Author:     Violet Purcell <vimproved <AT> inventati <DOT> org>
AuthorDate: Sun May 21 03:00:23 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun May 21 07:46:00 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f78b62df

media-sound/ardour: add media-libs/suil[X] usedep

Signed-off-by: Violet Purcell <vimproved <AT> inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/31112
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/ardour-6.9-r2.ebuild                        | 5 +++--
 media-sound/ardour/{ardour-7.3.ebuild => ardour-7.3-r1.ebuild} | 5 +++--
 media-sound/ardour/{ardour-7.4.ebuild => ardour-7.4-r1.ebuild} | 5 +++--
 media-sound/ardour/ardour-9999.ebuild                          | 5 +++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/media-sound/ardour/ardour-6.9-r2.ebuild b/media-sound/ardour/ardour-6.9-r2.ebuild
index 9cce4dcd47e0..7d328f9b56f6 100644
--- a/media-sound/ardour/ardour-6.9-r2.ebuild
+++ b/media-sound/ardour/ardour-6.9-r2.ebuild
@@ -58,7 +58,7 @@ RDEPEND="
 	media-libs/lilv
 	media-libs/sratom
 	dev-libs/sord
-	media-libs/suil[gtk2]
+	media-libs/suil[X,gtk2]
 	media-libs/lv2"
 #	!bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle...
 
@@ -136,7 +136,8 @@ src_configure() {
 		--noconfirm
 		--optimize
 		--with-backends=${backends}
-		$({ use cpu_flags_ppc_altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+		$({ 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")

diff --git a/media-sound/ardour/ardour-7.3.ebuild b/media-sound/ardour/ardour-7.3-r1.ebuild
similarity index 96%
rename from media-sound/ardour/ardour-7.3.ebuild
rename to media-sound/ardour/ardour-7.3-r1.ebuild
index 534c435d20b3..b956ddf4cfa5 100644
--- a/media-sound/ardour/ardour-7.3.ebuild
+++ b/media-sound/ardour/ardour-7.3-r1.ebuild
@@ -58,7 +58,7 @@ RDEPEND="
 	media-libs/lilv
 	media-libs/sratom
 	dev-libs/sord
-	media-libs/suil[gtk2]
+	media-libs/suil[X,gtk2]
 	media-libs/lv2"
 #	!bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle...
 
@@ -136,7 +136,8 @@ src_configure() {
 		--noconfirm
 		--optimize
 		--with-backends=${backends}
-		$({ use cpu_flags_ppc_altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+		$({ 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")

diff --git a/media-sound/ardour/ardour-7.4.ebuild b/media-sound/ardour/ardour-7.4-r1.ebuild
similarity index 96%
rename from media-sound/ardour/ardour-7.4.ebuild
rename to media-sound/ardour/ardour-7.4-r1.ebuild
index 534c435d20b3..b956ddf4cfa5 100644
--- a/media-sound/ardour/ardour-7.4.ebuild
+++ b/media-sound/ardour/ardour-7.4-r1.ebuild
@@ -58,7 +58,7 @@ RDEPEND="
 	media-libs/lilv
 	media-libs/sratom
 	dev-libs/sord
-	media-libs/suil[gtk2]
+	media-libs/suil[X,gtk2]
 	media-libs/lv2"
 #	!bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle...
 
@@ -136,7 +136,8 @@ src_configure() {
 		--noconfirm
 		--optimize
 		--with-backends=${backends}
-		$({ use cpu_flags_ppc_altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+		$({ 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")

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 534c435d20b3..b956ddf4cfa5 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -58,7 +58,7 @@ RDEPEND="
 	media-libs/lilv
 	media-libs/sratom
 	dev-libs/sord
-	media-libs/suil[gtk2]
+	media-libs/suil[X,gtk2]
 	media-libs/lv2"
 #	!bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle...
 
@@ -136,7 +136,8 @@ src_configure() {
 		--noconfirm
 		--optimize
 		--with-backends=${backends}
-		$({ use cpu_flags_ppc_altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+		$({ 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")


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2023-04-28  6:45 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2023-04-28  6:45 UTC (permalink / raw
  To: gentoo-commits

commit:     f32ed13d4e1de492bd47eba31ef5c88b66a9a9db
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 28 06:45:31 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Apr 28 06:45:36 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f32ed13d

media-sound/ardour: bump to 7.4

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/Manifest          |   1 +
 media-sound/ardour/ardour-7.4.ebuild | 185 +++++++++++++++++++++++++++++++++++
 2 files changed, 186 insertions(+)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 33ef2c14d55b..d8cf7dc01774 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,2 +1,3 @@
 DIST Ardour-6.9.0.tar.bz2 12297369 BLAKE2B 62037130b9f2d15a7f527b549c552a281105298dc85e3019d0f7ac09cb791f2b5460c4a7bd2f2098ccade6b87c70a16e6414691d90ec4baafeb6065f26d10a66 SHA512 ace45f5bfe6d0c9e4bb1712ae53ebaee2f15f883045650cae3ddcae251d4fd2f645ba745effb739b47c73a0568ae9e8ae443b711dd610584e04575fd9046b234
 DIST Ardour-7.3.0.tar.bz2 12897398 BLAKE2B 518de10fd43220e843c775c9374347cf827562ff979a99ecdb9507f69daad642345a1c2ddec6f601511b599167a6904905dcdd25ac15f71616c3cb432897545d SHA512 4c0119768015aea447ea5c4ef15708a6440e189bd3578aca74b8ea2cac86920a8c8bd975e03f2af25108f76231d8afccf0003e6a2f8de1de28bcdce9085fe98c
+DIST Ardour-7.4.0.tar.bz2 12940403 BLAKE2B 4f3ca19e44a9ab5908fb6a6cf29adefb6a7abf4a9f43f810f0a0fdbe8fc1e11cdb49e2a66336fddb0e5d49a0780ac5af7b9363d2f14d9e309b787ceb8c8dd060 SHA512 2533167986a8b7550848e03475931fcd1409f188abed0c7c2a5999869995a73576976d02080cf2ac310113b57ff62d39031615c92cb4fafbe5d96edfc3a4ec45

diff --git a/media-sound/ardour/ardour-7.4.ebuild b/media-sound/ardour/ardour-7.4.ebuild
new file mode 100644
index 000000000000..534c435d20b3
--- /dev/null
+++ b/media-sound/ardour/ardour-7.4.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+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 ~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
+	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[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"
+)
+
+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
+	}
+	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
+	mkdir -p "${D}"
+	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
+	)
+
+	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
+}
+
+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."
+}


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2023-02-27  6:30 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2023-02-27  6:30 UTC (permalink / raw
  To: gentoo-commits

commit:     07283d5a01e78f8a28f2d1d4700adaf53d5abf69
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 27 06:30:06 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Feb 27 06:30:06 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07283d5a

media-sound/ardour: updated langs in the latest and live ebuild

Closes: https://bugs.gentoo.org/831752
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/ardour-7.3.ebuild  | 2 +-
 media-sound/ardour/ardour-9999.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/ardour/ardour-7.3.ebuild b/media-sound/ardour/ardour-7.3.ebuild
index 4c32a9d5eadb..534c435d20b3 100644
--- a/media-sound/ardour/ardour-7.3.ebuild
+++ b/media-sound/ardour/ardour-7.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE='threads(+)'
-PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh"
+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"

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 4c32a9d5eadb..534c435d20b3 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE='threads(+)'
-PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh"
+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"


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2023-02-16  9:48 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2023-02-16  9:48 UTC (permalink / raw
  To: gentoo-commits

commit:     0ebf16473af779f14aba40c52ec3ee753ebe67ab
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 16 09:18:01 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 09:48:51 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ebf1647

media-sound/ardour: bump to 7.3 + eapi8 + updated live

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/Manifest                                  | 1 +
 media-sound/ardour/{ardour-9999.ebuild => ardour-7.3.ebuild} | 4 ++--
 media-sound/ardour/ardour-9999.ebuild                        | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 818f8d5db6aa..c05def17cf61 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,3 +1,4 @@
 DIST Ardour-6.9.0.tar.bz2 12297369 BLAKE2B 62037130b9f2d15a7f527b549c552a281105298dc85e3019d0f7ac09cb791f2b5460c4a7bd2f2098ccade6b87c70a16e6414691d90ec4baafeb6065f26d10a66 SHA512 ace45f5bfe6d0c9e4bb1712ae53ebaee2f15f883045650cae3ddcae251d4fd2f645ba745effb739b47c73a0568ae9e8ae443b711dd610584e04575fd9046b234
 DIST Ardour-7.1.0.tar.bz2 12731494 BLAKE2B 1473d89089b378db9d7cb665d0d3fb9980abe5344e3e35114352141116547490fba1446d61c1ff4ee1262ac114e78baec994a4671e8362a1c146ff7f6020332d SHA512 e5fb26a03059eb96df3000977544f622e30aae0772f9265f5acb7da8f88460624dfed500423786975d69a6629821340dd74a03343f2c7ff70f959434e795c0fd
 DIST Ardour-7.2.0.tar.bz2 12882609 BLAKE2B fe4912e4e6be318605f41cbd58ea51711d6ae6537c673c5534ff48a74455e54d92bcb6aa14b18b0014d8ebf4463d630e817696013b5b56255529183471a51566 SHA512 a8e1337324eed503e864f8fe3da34410b2a21e61a2b243a27ac68ac4d41b59ac3417e7713497f38f310a57b8d9885e758b99b00fec992b77756076a86f5ef7b3
+DIST Ardour-7.3.0.tar.bz2 12897398 BLAKE2B 518de10fd43220e843c775c9374347cf827562ff979a99ecdb9507f69daad642345a1c2ddec6f601511b599167a6904905dcdd25ac15f71616c3cb432897545d SHA512 4c0119768015aea447ea5c4ef15708a6440e189bd3578aca74b8ea2cac86920a8c8bd975e03f2af25108f76231d8afccf0003e6a2f8de1de28bcdce9085fe98c

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-7.3.ebuild
similarity index 99%
copy from media-sound/ardour/ardour-9999.ebuild
copy to media-sound/ardour/ardour-7.3.ebuild
index 2fb765891251..4c32a9d5eadb 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-7.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE='threads(+)'
 PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh"
@@ -87,7 +87,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	xdg_src_prepare
+	default
 
 	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
 	MARCH=$(get-flag march)

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 2fb765891251..4c32a9d5eadb 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE='threads(+)'
 PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh"
@@ -87,7 +87,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	xdg_src_prepare
+	default
 
 	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
 	MARCH=$(get-flag march)


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2022-12-14  8:09 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2022-12-14  8:09 UTC (permalink / raw
  To: gentoo-commits

commit:     b065771b7791fc95e213bc0ad10c6dc209cfa09e
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 14 08:09:41 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Dec 14 08:09:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b065771b

media-sound/ardour: bump to 7.2

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/Manifest          |   1 +
 media-sound/ardour/ardour-7.2.ebuild | 185 +++++++++++++++++++++++++++++++++++
 2 files changed, 186 insertions(+)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 6156fb6b574d..818f8d5db6aa 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,2 +1,3 @@
 DIST Ardour-6.9.0.tar.bz2 12297369 BLAKE2B 62037130b9f2d15a7f527b549c552a281105298dc85e3019d0f7ac09cb791f2b5460c4a7bd2f2098ccade6b87c70a16e6414691d90ec4baafeb6065f26d10a66 SHA512 ace45f5bfe6d0c9e4bb1712ae53ebaee2f15f883045650cae3ddcae251d4fd2f645ba745effb739b47c73a0568ae9e8ae443b711dd610584e04575fd9046b234
 DIST Ardour-7.1.0.tar.bz2 12731494 BLAKE2B 1473d89089b378db9d7cb665d0d3fb9980abe5344e3e35114352141116547490fba1446d61c1ff4ee1262ac114e78baec994a4671e8362a1c146ff7f6020332d SHA512 e5fb26a03059eb96df3000977544f622e30aae0772f9265f5acb7da8f88460624dfed500423786975d69a6629821340dd74a03343f2c7ff70f959434e795c0fd
+DIST Ardour-7.2.0.tar.bz2 12882609 BLAKE2B fe4912e4e6be318605f41cbd58ea51711d6ae6537c673c5534ff48a74455e54d92bcb6aa14b18b0014d8ebf4463d630e817696013b5b56255529183471a51566 SHA512 a8e1337324eed503e864f8fe3da34410b2a21e61a2b243a27ac68ac4d41b59ac3417e7713497f38f310a57b8d9885e758b99b00fec992b77756076a86f5ef7b3

diff --git a/media-sound/ardour/ardour-7.2.ebuild b/media-sound/ardour/ardour-7.2.ebuild
new file mode 100644
index 000000000000..463082c09921
--- /dev/null
+++ b/media-sound/ardour/ardour-7.2.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE='threads(+)'
+PLOCALES="cs de el en_GB es eu fr it ja 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 ~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
+	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[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"
+)
+
+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() {
+	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
+	}
+	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
+	mkdir -p "${D}"
+	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
+	)
+
+	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
+}
+
+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."
+}


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2022-11-04  7:40 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2022-11-04  7:40 UTC (permalink / raw
  To: gentoo-commits

commit:     bba46a0a1d6427e2653a8f4400038b392fd79dea
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  4 07:40:10 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Nov  4 07:40:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bba46a0a

media-sound/ardour: bump to 7.1, dropped 7.0 (serious bugs)

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/Manifest                                 | 2 +-
 media-sound/ardour/{ardour-7.0.ebuild => ardour-7.1.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 580feef8f94b..6156fb6b574d 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,2 +1,2 @@
 DIST Ardour-6.9.0.tar.bz2 12297369 BLAKE2B 62037130b9f2d15a7f527b549c552a281105298dc85e3019d0f7ac09cb791f2b5460c4a7bd2f2098ccade6b87c70a16e6414691d90ec4baafeb6065f26d10a66 SHA512 ace45f5bfe6d0c9e4bb1712ae53ebaee2f15f883045650cae3ddcae251d4fd2f645ba745effb739b47c73a0568ae9e8ae443b711dd610584e04575fd9046b234
-DIST Ardour-7.0.0.tar.bz2 12681139 BLAKE2B 7549c627ca085f40b4224ecd8a8f6e2a7a8a9a662e8a97048e9af3a0c6a0463ce69cea8ea20b867ae98649c3ab1b5940efed39978579b6b319b29ba5beb75d4d SHA512 5eeb84973f9a08e3bd2fbf9b829e902e001137ce330bcb26404f7a9da4ab3e89fdecca867511df7ae7bd3c744f7f2a5f9235b3de56c0d0c90d0a95dd6c043a27
+DIST Ardour-7.1.0.tar.bz2 12731494 BLAKE2B 1473d89089b378db9d7cb665d0d3fb9980abe5344e3e35114352141116547490fba1446d61c1ff4ee1262ac114e78baec994a4671e8362a1c146ff7f6020332d SHA512 e5fb26a03059eb96df3000977544f622e30aae0772f9265f5acb7da8f88460624dfed500423786975d69a6629821340dd74a03343f2c7ff70f959434e795c0fd

diff --git a/media-sound/ardour/ardour-7.0.ebuild b/media-sound/ardour/ardour-7.1.ebuild
similarity index 100%
rename from media-sound/ardour/ardour-7.0.ebuild
rename to media-sound/ardour/ardour-7.1.ebuild


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2022-10-16  4:53 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2022-10-16  4:53 UTC (permalink / raw
  To: gentoo-commits

commit:     9185c4a4b00c4a811d3a3e330ca9f7ece185d111
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 16 04:51:12 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Oct 16 04:51:12 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9185c4a4

media-sound/ardour: bump to 7.0

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/Manifest          |   1 +
 media-sound/ardour/ardour-7.0.ebuild | 185 +++++++++++++++++++++++++++++++++++
 2 files changed, 186 insertions(+)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 8194e131ce35..580feef8f94b 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1 +1,2 @@
 DIST Ardour-6.9.0.tar.bz2 12297369 BLAKE2B 62037130b9f2d15a7f527b549c552a281105298dc85e3019d0f7ac09cb791f2b5460c4a7bd2f2098ccade6b87c70a16e6414691d90ec4baafeb6065f26d10a66 SHA512 ace45f5bfe6d0c9e4bb1712ae53ebaee2f15f883045650cae3ddcae251d4fd2f645ba745effb739b47c73a0568ae9e8ae443b711dd610584e04575fd9046b234
+DIST Ardour-7.0.0.tar.bz2 12681139 BLAKE2B 7549c627ca085f40b4224ecd8a8f6e2a7a8a9a662e8a97048e9af3a0c6a0463ce69cea8ea20b867ae98649c3ab1b5940efed39978579b6b319b29ba5beb75d4d SHA512 5eeb84973f9a08e3bd2fbf9b829e902e001137ce330bcb26404f7a9da4ab3e89fdecca867511df7ae7bd3c744f7f2a5f9235b3de56c0d0c90d0a95dd6c043a27

diff --git a/media-sound/ardour/ardour-7.0.ebuild b/media-sound/ardour/ardour-7.0.ebuild
new file mode 100644
index 000000000000..6b4cd2f9e9be
--- /dev/null
+++ b/media-sound/ardour/ardour-7.0.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE='threads(+)'
+PLOCALES="cs de el en_GB es eu fr it ja 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 ~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
+	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-0.10.16-r1[gtk2] <media-libs/suil-0.10.16-r1[gtk] )
+	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"
+)
+
+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() {
+	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
+	}
+	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
+	mkdir -p "${D}"
+	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
+	)
+
+	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
+}
+
+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."
+}


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2022-10-16  4:53 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2022-10-16  4:53 UTC (permalink / raw
  To: gentoo-commits

commit:     db39ae81c26dbf98f1b299447bea2e62855bf8c5
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 16 04:53:38 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Oct 16 04:53:38 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db39ae81

media-sound/ardour: dropped reference to non-existent suil version

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/ardour-6.9-r2.ebuild | 2 +-
 media-sound/ardour/ardour-7.0.ebuild    | 2 +-
 media-sound/ardour/ardour-9999.ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-sound/ardour/ardour-6.9-r2.ebuild b/media-sound/ardour/ardour-6.9-r2.ebuild
index 21e7af85210c..3f85c9a41e8f 100644
--- a/media-sound/ardour/ardour-6.9-r2.ebuild
+++ b/media-sound/ardour/ardour-6.9-r2.ebuild
@@ -58,7 +58,7 @@ RDEPEND="
 	media-libs/lilv
 	media-libs/sratom
 	dev-libs/sord
-	|| ( >=media-libs/suil-0.10.16-r1[gtk2] <media-libs/suil-0.10.16-r1[gtk] )
+	media-libs/suil[gtk2]
 	media-libs/lv2"
 #	!bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle...
 

diff --git a/media-sound/ardour/ardour-7.0.ebuild b/media-sound/ardour/ardour-7.0.ebuild
index 6b4cd2f9e9be..463082c09921 100644
--- a/media-sound/ardour/ardour-7.0.ebuild
+++ b/media-sound/ardour/ardour-7.0.ebuild
@@ -58,7 +58,7 @@ RDEPEND="
 	media-libs/lilv
 	media-libs/sratom
 	dev-libs/sord
-	|| ( >=media-libs/suil-0.10.16-r1[gtk2] <media-libs/suil-0.10.16-r1[gtk] )
+	media-libs/suil[gtk2]
 	media-libs/lv2"
 #	!bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle...
 

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 6b4cd2f9e9be..463082c09921 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -58,7 +58,7 @@ RDEPEND="
 	media-libs/lilv
 	media-libs/sratom
 	dev-libs/sord
-	|| ( >=media-libs/suil-0.10.16-r1[gtk2] <media-libs/suil-0.10.16-r1[gtk] )
+	media-libs/suil[gtk2]
 	media-libs/lv2"
 #	!bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle...
 


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2022-09-18 13:34 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2022-09-18 13:34 UTC (permalink / raw
  To: gentoo-commits

commit:     b92a8a2f9a01b5ca49218444ab133e887c7ccfec
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 18 13:34:02 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 13:34:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b92a8a2f

media-sound/ardour: updated python versions, dropped eutils.eclass, updated to changes in media-libs/suil

Bug: https://bugs.gentoo.org/863614
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/ardour-6.9-r2.ebuild | 6 +++---
 media-sound/ardour/ardour-9999.ebuild   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/media-sound/ardour/ardour-6.9-r2.ebuild b/media-sound/ardour/ardour-6.9-r2.ebuild
index d25d23fb3095..21e7af85210c 100644
--- a/media-sound/ardour/ardour-6.9-r2.ebuild
+++ b/media-sound/ardour/ardour-6.9-r2.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8..11} )
 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 plocale python-any-r1 waf-utils desktop xdg
+inherit toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop xdg
 
 DESCRIPTION="Digital Audio Workstation"
 HOMEPAGE="https://ardour.org/"
@@ -58,7 +58,7 @@ RDEPEND="
 	media-libs/lilv
 	media-libs/sratom
 	dev-libs/sord
-	media-libs/suil[gtk]
+	|| ( >=media-libs/suil-0.10.16-r1[gtk2] <media-libs/suil-0.10.16-r1[gtk] )
 	media-libs/lv2"
 #	!bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle...
 

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 19e5493895f8..6b4cd2f9e9be 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8..11} )
 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 plocale python-any-r1 waf-utils desktop xdg
+inherit toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop xdg
 
 DESCRIPTION="Digital Audio Workstation"
 HOMEPAGE="https://ardour.org/"
@@ -58,7 +58,7 @@ RDEPEND="
 	media-libs/lilv
 	media-libs/sratom
 	dev-libs/sord
-	media-libs/suil[gtk]
+	|| ( >=media-libs/suil-0.10.16-r1[gtk2] <media-libs/suil-0.10.16-r1[gtk] )
 	media-libs/lv2"
 #	!bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle...
 


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2022-09-10  8:41 Sam James
  0 siblings, 0 replies; 118+ messages in thread
From: Sam James @ 2022-09-10  8:41 UTC (permalink / raw
  To: gentoo-commits

commit:     625225b100e8b271eac480f0567edb505a5f2818
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 10 08:32:45 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 10 08:40:29 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=625225b1

media-sound/ardour: add media-libs/flac subslot dep

media-libs/flac-1.4.0 breaks ABI.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/ardour/{ardour-6.9-r1.ebuild => ardour-6.9-r2.ebuild} | 2 +-
 media-sound/ardour/ardour-9999.ebuild                             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/ardour/ardour-6.9-r1.ebuild b/media-sound/ardour/ardour-6.9-r2.ebuild
similarity index 99%
rename from media-sound/ardour/ardour-6.9-r1.ebuild
rename to media-sound/ardour/ardour-6.9-r2.ebuild
index e258a1144663..d25d23fb3095 100644
--- a/media-sound/ardour/ardour-6.9-r1.ebuild
+++ b/media-sound/ardour/ardour-6.9-r2.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 	>=gnome-base/libgnomecanvas-2
 	media-libs/alsa-lib
 	media-libs/aubio
-	media-libs/flac
+	media-libs/flac:=
 	media-libs/freetype:2
 	media-libs/libart_lgpl
 	media-libs/liblo

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 9309627c651a..19e5493895f8 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -34,7 +34,7 @@ RDEPEND="
 	>=gnome-base/libgnomecanvas-2
 	media-libs/alsa-lib
 	media-libs/aubio
-	media-libs/flac
+	media-libs/flac:=
 	media-libs/freetype:2
 	media-libs/libart_lgpl
 	media-libs/liblo


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2022-07-15  7:58 David Seifert
  0 siblings, 0 replies; 118+ messages in thread
From: David Seifert @ 2022-07-15  7:58 UTC (permalink / raw
  To: gentoo-commits

commit:     c5847446077555f498556bb7aec7eb2ee9599aba
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 15 07:58:00 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 07:58:00 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5847446

media-sound/ardour: altivec -> cpu_flags_ppc_altivec

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 media-sound/ardour/ardour-6.9-r1.ebuild | 4 ++--
 media-sound/ardour/ardour-9999.ebuild   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-sound/ardour/ardour-6.9-r1.ebuild b/media-sound/ardour/ardour-6.9-r1.ebuild
index 95a824b4d2d7..e258a1144663 100644
--- a/media-sound/ardour/ardour-6.9-r1.ebuild
+++ b/media-sound/ardour/ardour-6.9-r1.ebuild
@@ -21,7 +21,7 @@ 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"
+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
@@ -136,7 +136,7 @@ src_configure() {
 		--noconfirm
 		--optimize
 		--with-backends=${backends}
-		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+		$({ 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")

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 4b3a74958f62..9309627c651a 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="7"
-IUSE="altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+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
@@ -136,7 +136,7 @@ src_configure() {
 		--noconfirm
 		--optimize
 		--with-backends=${backends}
-		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+		$({ 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")


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2022-03-20 21:55 Sam James
  0 siblings, 0 replies; 118+ messages in thread
From: Sam James @ 2022-03-20 21:55 UTC (permalink / raw
  To: gentoo-commits

commit:     e9526a355ffb2cc4dd787d3ec621db565728703a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 21:51:03 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 21:54:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9526a35

media-sound/ardour: drop stale dev-cpp/libgnomecanvasmm dependency

Dep doesn't build with Clang for a start which is how we noticed
(thanks Jannik), but actually, the dep was dropped upstream in.. 2007!

Thanks-to: Jannik Glückert <jannik.glueckert <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/ardour/{ardour-6.9.ebuild => ardour-6.9-r1.ebuild} | 3 +--
 media-sound/ardour/ardour-9999.ebuild                          | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/media-sound/ardour/ardour-6.9.ebuild b/media-sound/ardour/ardour-6.9-r1.ebuild
similarity index 98%
rename from media-sound/ardour/ardour-6.9.ebuild
rename to media-sound/ardour/ardour-6.9-r1.ebuild
index db6b4df64dd7..95a824b4d2d7 100644
--- a/media-sound/ardour/ardour-6.9.ebuild
+++ b/media-sound/ardour/ardour-6.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,6 @@ IUSE="altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_
 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

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index d4f641297a64..4b3a74958f62 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,6 @@ IUSE="altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_
 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


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2021-11-18  8:35 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2021-11-18  8:35 UTC (permalink / raw
  To: gentoo-commits

commit:     2dd9c2c1164df2e57ca5e5082ea506fd31f628d2
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 18 08:34:58 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Nov 18 08:35:13 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dd9c2c1

media-sound/ardour: added for media-libs/suil[gtk] for plugins

Closes: https://bugs.gentoo.org/820353
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/ardour-6.9.ebuild  | 2 +-
 media-sound/ardour/ardour-9999.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/ardour/ardour-6.9.ebuild b/media-sound/ardour/ardour-6.9.ebuild
index c8eefac90452..db6b4df64dd7 100644
--- a/media-sound/ardour/ardour-6.9.ebuild
+++ b/media-sound/ardour/ardour-6.9.ebuild
@@ -59,7 +59,7 @@ RDEPEND="
 	media-libs/lilv
 	media-libs/sratom
 	dev-libs/sord
-	media-libs/suil
+	media-libs/suil[gtk]
 	media-libs/lv2"
 #	!bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle...
 

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index b6fc5f46d356..d4f641297a64 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -59,7 +59,7 @@ RDEPEND="
 	media-libs/lilv
 	media-libs/sratom
 	dev-libs/sord
-	media-libs/suil
+	media-libs/suil[gtk]
 	media-libs/lv2"
 #	!bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle...
 


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2021-09-24  7:23 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2021-09-24  7:23 UTC (permalink / raw
  To: gentoo-commits

commit:     bcfe2b2185d80387ff654efd790c0fd65e5ecd7f
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 24 07:23:02 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Sep 24 07:23:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcfe2b21

media-sound/ardour: removed obsolete 6.8-r1

Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/Manifest             |   1 -
 media-sound/ardour/ardour-6.8-r1.ebuild | 183 --------------------------------
 2 files changed, 184 deletions(-)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 7470fc34c31..8194e131ce3 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,2 +1 @@
-DIST Ardour-6.8.0.tar.bz2 12152361 BLAKE2B 9f00a0eeae40fcb1f24e3138a639d1063a9cdbaecae2f17425bce133edee5e34ce4d0a1455be4da00725e52389bc1f9d829825b7ef5c591df2c5b0ce5538f463 SHA512 9f829df99fd6d857d54491e18a5c936b4a9b5e55715d71618454dc7c23fb3aaaaa2878a0ec87035c226a69da604111e27ddb00cd28087e34a46e24810c0ff403
 DIST Ardour-6.9.0.tar.bz2 12297369 BLAKE2B 62037130b9f2d15a7f527b549c552a281105298dc85e3019d0f7ac09cb791f2b5460c4a7bd2f2098ccade6b87c70a16e6414691d90ec4baafeb6065f26d10a66 SHA512 ace45f5bfe6d0c9e4bb1712ae53ebaee2f15f883045650cae3ddcae251d4fd2f645ba745effb739b47c73a0568ae9e8ae443b711dd610584e04575fd9046b234

diff --git a/media-sound/ardour/ardour-6.8-r1.ebuild b/media-sound/ardour/ardour-6.8-r1.ebuild
deleted file mode 100644
index f1e41fea895..00000000000
--- a/media-sound/ardour/ardour-6.8-r1.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-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 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 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 )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-metadata.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() {
-	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
-	}
-	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
-	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
-}
-
-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."
-}


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2021-09-24  7:00 Agostino Sarubbo
  0 siblings, 0 replies; 118+ messages in thread
From: Agostino Sarubbo @ 2021-09-24  7:00 UTC (permalink / raw
  To: gentoo-commits

commit:     c26c6131bd2ce8804c8c380e44c8ba521b68d949
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 24 07:00:29 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Sep 24 07:00:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c26c6131

media-sound/ardour: x86 stable wrt bug #814446

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 media-sound/ardour/ardour-6.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/ardour/ardour-6.9.ebuild b/media-sound/ardour/ardour-6.9.ebuild
index cc9b3325fdf..c8eefac9045 100644
--- a/media-sound/ardour/ardour-6.9.ebuild
+++ b/media-sound/ardour/ardour-6.9.ebuild
@@ -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


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2021-09-23 13:58 Agostino Sarubbo
  0 siblings, 0 replies; 118+ messages in thread
From: Agostino Sarubbo @ 2021-09-23 13:58 UTC (permalink / raw
  To: gentoo-commits

commit:     ea413e1dc44ca4d508247b20400acece8a062861
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 23 13:57:41 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Sep 23 13:57:41 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea413e1d

media-sound/ardour: amd64 stable wrt bug #814446

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 media-sound/ardour/ardour-6.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/ardour/ardour-6.9.ebuild b/media-sound/ardour/ardour-6.9.ebuild
index 41b264273ca..cc9b3325fdf 100644
--- a/media-sound/ardour/ardour-6.9.ebuild
+++ b/media-sound/ardour/ardour-6.9.ebuild
@@ -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


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2021-08-14 19:53 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2021-08-14 19:53 UTC (permalink / raw
  To: gentoo-commits

commit:     472f2d7db90e3cb04d5a9072e2e3271b1114f2a3
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 14 19:53:18 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Aug 14 19:53:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=472f2d7d

media-sound/ardour: updated live for slot 7

Closes: https://bugs.gentoo.org/808096
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/ardour-9999.ebuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 41b264273ca..b6fc5f46d35 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -20,7 +20,7 @@ else
 fi
 
 LICENSE="GPL-2"
-SLOT="6"
+SLOT="7"
 IUSE="altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
 
 RDEPEND="
@@ -164,6 +164,9 @@ src_install() {
 		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;/' \


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2021-08-14  7:11 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2021-08-14  7:11 UTC (permalink / raw
  To: gentoo-commits

commit:     bfb9de727c9d833ad0f45d09684ac152e82c8195
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 14 07:08:20 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Aug 14 07:11:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfb9de72

media-sound/ardour: bump to 6.9

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/Manifest          |   1 +
 media-sound/ardour/ardour-6.9.ebuild | 183 +++++++++++++++++++++++++++++++++++
 2 files changed, 184 insertions(+)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index c5abd59e599..7470fc34c31 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1 +1,2 @@
 DIST Ardour-6.8.0.tar.bz2 12152361 BLAKE2B 9f00a0eeae40fcb1f24e3138a639d1063a9cdbaecae2f17425bce133edee5e34ce4d0a1455be4da00725e52389bc1f9d829825b7ef5c591df2c5b0ce5538f463 SHA512 9f829df99fd6d857d54491e18a5c936b4a9b5e55715d71618454dc7c23fb3aaaaa2878a0ec87035c226a69da604111e27ddb00cd28087e34a46e24810c0ff403
+DIST Ardour-6.9.0.tar.bz2 12297369 BLAKE2B 62037130b9f2d15a7f527b549c552a281105298dc85e3019d0f7ac09cb791f2b5460c4a7bd2f2098ccade6b87c70a16e6414691d90ec4baafeb6065f26d10a66 SHA512 ace45f5bfe6d0c9e4bb1712ae53ebaee2f15f883045650cae3ddcae251d4fd2f645ba745effb739b47c73a0568ae9e8ae443b711dd610584e04575fd9046b234

diff --git a/media-sound/ardour/ardour-6.9.ebuild b/media-sound/ardour/ardour-6.9.ebuild
new file mode 100644
index 00000000000..41b264273ca
--- /dev/null
+++ b/media-sound/ardour/ardour-6.9.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+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 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 ~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 )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.8-metadata.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() {
+	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
+	}
+	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
+	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
+}
+
+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."
+}


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2021-08-11  6:47 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2021-08-11  6:47 UTC (permalink / raw
  To: gentoo-commits

commit:     f43a50d215885c1c39c42859a3367f57053af1c2
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 11 06:47:39 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Aug 11 06:47:52 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f43a50d2

media-sound/ardour: removed obsolete 6.7

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/Manifest          |   1 -
 media-sound/ardour/ardour-6.7.ebuild | 180 -----------------------------------
 2 files changed, 181 deletions(-)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 9b4b0fa1934..c5abd59e599 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,2 +1 @@
-DIST Ardour-6.7.0.tar.bz2 12135868 BLAKE2B 3b217340187e16d3da9302e3505c499c3bba8da7e3be82ff12e8aa99e1c934d42e71c62ae357d7a1265e668293c933a2192ae2f6d6b97f21a2f7c379caf5e9be SHA512 73cf6fff40c838c42c3b29842e15d2e2b991f1e92d57ef0a8e68ef75b39ec8075906ac3ded322b521f2c5fd9fa9d1b7f9c7770b4cc6deee9efe1796889aeffe2
 DIST Ardour-6.8.0.tar.bz2 12152361 BLAKE2B 9f00a0eeae40fcb1f24e3138a639d1063a9cdbaecae2f17425bce133edee5e34ce4d0a1455be4da00725e52389bc1f9d829825b7ef5c591df2c5b0ce5538f463 SHA512 9f829df99fd6d857d54491e18a5c936b4a9b5e55715d71618454dc7c23fb3aaaaa2878a0ec87035c226a69da604111e27ddb00cd28087e34a46e24810c0ff403

diff --git a/media-sound/ardour/ardour-6.7.ebuild b/media-sound/ardour/ardour-6.7.ebuild
deleted file mode 100644
index a86c358a226..00000000000
--- a/media-sound/ardour/ardour-6.7.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-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 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 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
-	}
-	plocale_for_each_disabled_locale my_lcmsg
-}
-
-src_configure() {
-	local backends="alsa,dummy"
-	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."
-}


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2021-08-11  6:43 Agostino Sarubbo
  0 siblings, 0 replies; 118+ messages in thread
From: Agostino Sarubbo @ 2021-08-11  6:43 UTC (permalink / raw
  To: gentoo-commits

commit:     e636704c086e8a4587f6125606457c284b2629d6
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 11 06:43:09 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Aug 11 06:43:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e636704c

media-sound/ardour: x86 stable wrt bug #806812

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 media-sound/ardour/ardour-6.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/ardour/ardour-6.8-r1.ebuild b/media-sound/ardour/ardour-6.8-r1.ebuild
index 5d2ed1d239d..f1e41fea895 100644
--- a/media-sound/ardour/ardour-6.8-r1.ebuild
+++ b/media-sound/ardour/ardour-6.8-r1.ebuild
@@ -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


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2021-08-07  5:10 Agostino Sarubbo
  0 siblings, 0 replies; 118+ messages in thread
From: Agostino Sarubbo @ 2021-08-07  5:10 UTC (permalink / raw
  To: gentoo-commits

commit:     a43a57c711ab638ec2ca8e099b81d4d4d5f616a7
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  7 05:09:14 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Aug  7 05:09:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a43a57c7

media-sound/ardour: amd64 stable wrt bug #806812

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 media-sound/ardour/ardour-6.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/ardour/ardour-6.8-r1.ebuild b/media-sound/ardour/ardour-6.8-r1.ebuild
index f3108601e72..5d2ed1d239d 100644
--- a/media-sound/ardour/ardour-6.8-r1.ebuild
+++ b/media-sound/ardour/ardour-6.8-r1.ebuild
@@ -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


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2021-07-02 19:32 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2021-07-02 19:32 UTC (permalink / raw
  To: gentoo-commits

commit:     b7a739e00c17aed95e77919efb3eef17516d960e
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  2 19:32:13 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Jul  2 19:32:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7a739e0

media-sound/ardour: bump to 6.8

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/Manifest          |   1 +
 media-sound/ardour/ardour-6.8.ebuild | 180 +++++++++++++++++++++++++++++++++++
 2 files changed, 181 insertions(+)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 20798aa982a..9b4b0fa1934 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1 +1,2 @@
 DIST Ardour-6.7.0.tar.bz2 12135868 BLAKE2B 3b217340187e16d3da9302e3505c499c3bba8da7e3be82ff12e8aa99e1c934d42e71c62ae357d7a1265e668293c933a2192ae2f6d6b97f21a2f7c379caf5e9be SHA512 73cf6fff40c838c42c3b29842e15d2e2b991f1e92d57ef0a8e68ef75b39ec8075906ac3ded322b521f2c5fd9fa9d1b7f9c7770b4cc6deee9efe1796889aeffe2
+DIST Ardour-6.8.0.tar.bz2 12152361 BLAKE2B 9f00a0eeae40fcb1f24e3138a639d1063a9cdbaecae2f17425bce133edee5e34ce4d0a1455be4da00725e52389bc1f9d829825b7ef5c591df2c5b0ce5538f463 SHA512 9f829df99fd6d857d54491e18a5c936b4a9b5e55715d71618454dc7c23fb3aaaaa2878a0ec87035c226a69da604111e27ddb00cd28087e34a46e24810c0ff403

diff --git a/media-sound/ardour/ardour-6.8.ebuild b/media-sound/ardour/ardour-6.8.ebuild
new file mode 100644
index 00000000000..c275eb05302
--- /dev/null
+++ b/media-sound/ardour/ardour-6.8.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+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 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 ~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,dummy"
+	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."
+}


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2021-06-30  6:45 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2021-06-30  6:45 UTC (permalink / raw
  To: gentoo-commits

commit:     0d7ff8a108279605ffddabcaf7b6bd2996f86b83
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 30 06:44:45 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Jun 30 06:44:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d7ff8a1

media-sound/ardour: removed obsolete 6.6-r1

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/Manifest             |   2 -
 media-sound/ardour/ardour-6.6-r1.ebuild | 183 --------------------------------
 2 files changed, 185 deletions(-)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index a7955a638ed..20798aa982a 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,3 +1 @@
-DIST Ardour-6.6.0.tar.bz2 12046173 BLAKE2B d3a61ebe97fc26d89eee3f7a43c1ac47f5fda28251b76dcd635bba8c794541436a48fa288f40d1e156f01841e085588b60c8fa962b958c2f4bc6d7cdb4b1af75 SHA512 e175100bc03921865c5b387de68e30c21dd3e65dbf3868783092d165d5106a883aa4fca74e71b2e267e50b3c2f5c7b707a73967bbc93e66808d25aa3065b425f
 DIST Ardour-6.7.0.tar.bz2 12135868 BLAKE2B 3b217340187e16d3da9302e3505c499c3bba8da7e3be82ff12e8aa99e1c934d42e71c62ae357d7a1265e668293c933a2192ae2f6d6b97f21a2f7c379caf5e9be SHA512 73cf6fff40c838c42c3b29842e15d2e2b991f1e92d57ef0a8e68ef75b39ec8075906ac3ded322b521f2c5fd9fa9d1b7f9c7770b4cc6deee9efe1796889aeffe2
-DIST ardour-6.6-volatile-atomic-glib-2.68.patch.gz 22322 BLAKE2B cd113f721d0c6c63c85372873cd43782e3a43b8963c4f9222e771039c4b397585582ffd4cb77d4928bcdc656ef533e4a4b40799ff0c32355985c592589766466 SHA512 3fa2ede8b943881b9c77b233892f146e354c4722265f6599417d55fdf69961d65f6d54ed2c74f53f1f835d006ee99e44adcb03ee117ba44a7be3bedbae2c8efc

diff --git a/media-sound/ardour/ardour-6.6-r1.ebuild b/media-sound/ardour/ardour-6.6-r1.ebuild
deleted file mode 100644
index fd67dc62545..00000000000
--- a/media-sound/ardour/ardour-6.6-r1.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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 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 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
-
-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
-
-	eapply "${WORKDIR}/${P}-volatile-atomic-glib-2.68.patch"
-
-	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,dummy"
-	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."
-}


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2021-06-29 21:24 Sam James
  0 siblings, 0 replies; 118+ messages in thread
From: Sam James @ 2021-06-29 21:24 UTC (permalink / raw
  To: gentoo-commits

commit:     47bfb204839a863b0422efb9250287e799d2ef65
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 29 21:23:56 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 29 21:23:56 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47bfb204

media-sound/ardour: Stabilize 6.7 amd64, #797508

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/ardour/ardour-6.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/ardour/ardour-6.7.ebuild b/media-sound/ardour/ardour-6.7.ebuild
index 9480507f8e0..b596036aa4a 100644
--- a/media-sound/ardour/ardour-6.7.ebuild
+++ b/media-sound/ardour/ardour-6.7.ebuild
@@ -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


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2021-06-24 21:47 Sam James
  0 siblings, 0 replies; 118+ messages in thread
From: Sam James @ 2021-06-24 21:47 UTC (permalink / raw
  To: gentoo-commits

commit:     959ab807731e5a17e9336cf05948fb7c2758fe00
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 24 21:44:30 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 24 21:44:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=959ab807

media-sound/ardour: Stabilize 6.7 x86, #797508

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/ardour/ardour-6.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/ardour/ardour-6.7.ebuild b/media-sound/ardour/ardour-6.7.ebuild
index c275eb05302..9480507f8e0 100644
--- a/media-sound/ardour/ardour-6.7.ebuild
+++ b/media-sound/ardour/ardour-6.7.ebuild
@@ -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


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2021-05-22  8:37 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2021-05-22  8:37 UTC (permalink / raw
  To: gentoo-commits

commit:     20487a802d3902bd2be68a0108a233eaa5011f68
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat May 22 08:37:11 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat May 22 08:37:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20487a80

media-sound/ardour: bump to 6.7 + py3.10

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/Manifest                                  | 1 +
 media-sound/ardour/{ardour-9999.ebuild => ardour-6.7.ebuild} | 2 +-
 media-sound/ardour/ardour-9999.ebuild                        | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 400b25ec05a..a7955a638ed 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,2 +1,3 @@
 DIST Ardour-6.6.0.tar.bz2 12046173 BLAKE2B d3a61ebe97fc26d89eee3f7a43c1ac47f5fda28251b76dcd635bba8c794541436a48fa288f40d1e156f01841e085588b60c8fa962b958c2f4bc6d7cdb4b1af75 SHA512 e175100bc03921865c5b387de68e30c21dd3e65dbf3868783092d165d5106a883aa4fca74e71b2e267e50b3c2f5c7b707a73967bbc93e66808d25aa3065b425f
+DIST Ardour-6.7.0.tar.bz2 12135868 BLAKE2B 3b217340187e16d3da9302e3505c499c3bba8da7e3be82ff12e8aa99e1c934d42e71c62ae357d7a1265e668293c933a2192ae2f6d6b97f21a2f7c379caf5e9be SHA512 73cf6fff40c838c42c3b29842e15d2e2b991f1e92d57ef0a8e68ef75b39ec8075906ac3ded322b521f2c5fd9fa9d1b7f9c7770b4cc6deee9efe1796889aeffe2
 DIST ardour-6.6-volatile-atomic-glib-2.68.patch.gz 22322 BLAKE2B cd113f721d0c6c63c85372873cd43782e3a43b8963c4f9222e771039c4b397585582ffd4cb77d4928bcdc656ef533e4a4b40799ff0c32355985c592589766466 SHA512 3fa2ede8b943881b9c77b233892f146e354c4722265f6599417d55fdf69961d65f6d54ed2c74f53f1f835d006ee99e44adcb03ee117ba44a7be3bedbae2c8efc

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-6.7.ebuild
similarity index 99%
copy from media-sound/ardour/ardour-9999.ebuild
copy to media-sound/ardour/ardour-6.7.ebuild
index a2199b8d3d8..c275eb05302 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-6.7.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 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 desktop xdg

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index a2199b8d3d8..c275eb05302 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 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 desktop xdg


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2021-04-18 17:53 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2021-04-18 17:53 UTC (permalink / raw
  To: gentoo-commits

commit:     0e460531878507ce554bb1fa18cb3ae088c6e084
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 18 17:53:06 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Apr 18 17:53:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e460531

media-sound/ardour: reverted back to stable

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/ardour-6.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/ardour/ardour-6.6-r1.ebuild b/media-sound/ardour/ardour-6.6-r1.ebuild
index a2199b8d3d8..d55b9f5ed21 100644
--- a/media-sound/ardour/ardour-6.6-r1.ebuild
+++ b/media-sound/ardour/ardour-6.6-r1.ebuild
@@ -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


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2021-04-18 17:52 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2021-04-18 17:52 UTC (permalink / raw
  To: gentoo-commits

commit:     8e0f7b78bcbd8a30cbaee1fa107827bb750c2ae5
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 18 17:51:44 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Apr 18 17:51:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e0f7b78

media-sound/ardour: added cli tools

Closes: https://bugs.gentoo.org/781047
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/{ardour-6.6.ebuild => ardour-6.6-r1.ebuild} | 4 ++--
 media-sound/ardour/ardour-9999.ebuild                          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-sound/ardour/ardour-6.6.ebuild b/media-sound/ardour/ardour-6.6-r1.ebuild
similarity index 98%
rename from media-sound/ardour/ardour-6.6.ebuild
rename to media-sound/ardour/ardour-6.6-r1.ebuild
index cb35c8c520d..a2199b8d3d8 100644
--- a/media-sound/ardour/ardour-6.6.ebuild
+++ b/media-sound/ardour/ardour-6.6-r1.ebuild
@@ -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
@@ -119,7 +119,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 ceeb6768060..a2199b8d3d8 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"
 


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2021-03-29  6:51 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2021-03-29  6:51 UTC (permalink / raw
  To: gentoo-commits

commit:     fa0ab80f07194fb00d009515183185e19df1588f
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 29 06:48:49 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Mar 29 06:48:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa0ab80f

media-sound/ardour: removed obsolete 6.5-r2

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/Manifest             |   1 -
 media-sound/ardour/ardour-6.5-r2.ebuild | 180 --------------------------------
 2 files changed, 181 deletions(-)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 71cee235744..f22a710c46f 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,2 +1 @@
-DIST Ardour-6.5.0.tar.bz2 12000901 BLAKE2B a44ba0b6b071e6b0c9b4bad86c1454584e4f1ee360de490e176af022d5862d57bde97edbe5f8d0ed2fbc5597ab6d8d1ef7f4a2691e7183d59b38d5a143c2d5e7 SHA512 28bb0939c12b687e136de7a8b1ce28f1065d4040bdc171e228c648586bd5d3bd25ab00c677aa55f835e060cc8cbd0a1d1c283c018e4ab0d72d8bde0eb0a26f2a
 DIST Ardour-6.6.0.tar.bz2 12046173 BLAKE2B d3a61ebe97fc26d89eee3f7a43c1ac47f5fda28251b76dcd635bba8c794541436a48fa288f40d1e156f01841e085588b60c8fa962b958c2f4bc6d7cdb4b1af75 SHA512 e175100bc03921865c5b387de68e30c21dd3e65dbf3868783092d165d5106a883aa4fca74e71b2e267e50b3c2f5c7b707a73967bbc93e66808d25aa3065b425f

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 8db68c8d6a8..00000000000
--- 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."
-}


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2021-03-28 18:18 Sam James
  0 siblings, 0 replies; 118+ messages in thread
From: Sam James @ 2021-03-28 18:18 UTC (permalink / raw
  To: gentoo-commits

commit:     c7e27584c7265d63d4eca2132d19e3453ea19524
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 28 18:18:09 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 28 18:18:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7e27584

media-sound/ardour: Stabilize 6.6 x86, #778347

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/ardour/ardour-6.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/ardour/ardour-6.6.ebuild b/media-sound/ardour/ardour-6.6.ebuild
index 94b4609a1c3..cb35c8c520d 100644
--- a/media-sound/ardour/ardour-6.6.ebuild
+++ b/media-sound/ardour/ardour-6.6.ebuild
@@ -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


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2021-03-26 21:36 Sam James
  0 siblings, 0 replies; 118+ messages in thread
From: Sam James @ 2021-03-26 21:36 UTC (permalink / raw
  To: gentoo-commits

commit:     8c901462af831bac4002f5e597ff65f1570887b8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 26 21:35:17 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 26 21:35:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c901462

media-sound/ardour: Stabilize 6.6 amd64, #778347

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/ardour/ardour-6.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/ardour/ardour-6.6.ebuild b/media-sound/ardour/ardour-6.6.ebuild
index ceeb6768060..94b4609a1c3 100644
--- a/media-sound/ardour/ardour-6.6.ebuild
+++ b/media-sound/ardour/ardour-6.6.ebuild
@@ -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


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2021-02-24 10:53 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2021-02-24 10:53 UTC (permalink / raw
  To: gentoo-commits

commit:     5083b843ecb0de5ed2133ff3bf38023e007befa2
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 24 10:52:37 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Feb 24 10:52:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5083b843

media-sound/ardour: bump to 6.6, eapi7 + updated live

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/Manifest                                  | 1 +
 media-sound/ardour/{ardour-9999.ebuild => ardour-6.6.ebuild} | 4 ++--
 media-sound/ardour/ardour-9999.ebuild                        | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index f555e57cd9b..71cee235744 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1 +1,2 @@
 DIST Ardour-6.5.0.tar.bz2 12000901 BLAKE2B a44ba0b6b071e6b0c9b4bad86c1454584e4f1ee360de490e176af022d5862d57bde97edbe5f8d0ed2fbc5597ab6d8d1ef7f4a2691e7183d59b38d5a143c2d5e7 SHA512 28bb0939c12b687e136de7a8b1ce28f1065d4040bdc171e228c648586bd5d3bd25ab00c677aa55f835e060cc8cbd0a1d1c283c018e4ab0d72d8bde0eb0a26f2a
+DIST Ardour-6.6.0.tar.bz2 12046173 BLAKE2B d3a61ebe97fc26d89eee3f7a43c1ac47f5fda28251b76dcd635bba8c794541436a48fa288f40d1e156f01841e085588b60c8fa962b958c2f4bc6d7cdb4b1af75 SHA512 e175100bc03921865c5b387de68e30c21dd3e65dbf3868783092d165d5106a883aa4fca74e71b2e267e50b3c2f5c7b707a73967bbc93e66808d25aa3065b425f

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-6.6.ebuild
similarity index 99%
copy from media-sound/ardour/ardour-9999.ebuild
copy to media-sound/ardour/ardour-6.6.ebuild
index 9d4f2f8cc5a..ceeb6768060 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-6.6.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 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
+inherit eutils toolchain-funcs flag-o-matic l10n python-any-r1 waf-utils desktop xdg
 
 DESCRIPTION="Digital Audio Workstation"
 HOMEPAGE="https://ardour.org/"

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 9d4f2f8cc5a..ceeb6768060 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 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
+inherit eutils toolchain-funcs flag-o-matic l10n python-any-r1 waf-utils desktop xdg
 
 DESCRIPTION="Digital Audio Workstation"
 HOMEPAGE="https://ardour.org/"


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2021-02-16  2:12 Matt Turner
  0 siblings, 0 replies; 118+ messages in thread
From: Matt Turner @ 2021-02-16  2:12 UTC (permalink / raw
  To: gentoo-commits

commit:     9d33bf973865dcdb67e558b162ae8f227c00c242
Author:     David Michael <fedora.dm0 <AT> gmail <DOT> com>
AuthorDate: Sat Feb  6 22:24:54 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Feb 16 01:25:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d33bf97

media-sound/ardour: Specify the glibmm slot

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: David Michael <fedora.dm0 <AT> gmail.com>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 media-sound/ardour/{ardour-6.5-r1.ebuild => ardour-6.5-r2.ebuild} | 2 +-
 media-sound/ardour/ardour-9999.ebuild                             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-sound/ardour/ardour-6.5-r1.ebuild b/media-sound/ardour/ardour-6.5-r2.ebuild
similarity index 99%
rename from media-sound/ardour/ardour-6.5-r1.ebuild
rename to media-sound/ardour/ardour-6.5-r2.ebuild
index 7a6e537e563..8db68c8d6a8 100644
--- a/media-sound/ardour/ardour-6.5-r1.ebuild
+++ b/media-sound/ardour/ardour-6.5-r2.ebuild
@@ -24,7 +24,7 @@ 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/glibmm:2
 	dev-cpp/gtkmm:2.4
 	dev-cpp/libgnomecanvasmm:2.6
 	dev-libs/boost:=

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 9cc16d9c4da..9d4f2f8cc5a 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.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
@@ -24,7 +24,7 @@ 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/glibmm:2
 	dev-cpp/gtkmm:2.4
 	dev-cpp/libgnomecanvasmm:2.6
 	dev-libs/boost:=


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2021-01-15  8:49 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2021-01-15  8:49 UTC (permalink / raw
  To: gentoo-commits

commit:     78565813ab868b8276832ae905abdb8d44f6c5f4
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 15 08:48:54 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Jan 15 08:49:10 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78565813

media-sound/ardour: removed obsolete 6.5

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/ardour-6.5.ebuild | 152 -----------------------------------
 1 file changed, 152 deletions(-)

diff --git a/media-sound/ardour/ardour-6.5.ebuild b/media-sound/ardour/ardour-6.5.ebuild
deleted file mode 100644
index 348085665a1..00000000000
--- 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."
-}


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2021-01-14 23:59 Sam James
  0 siblings, 0 replies; 118+ messages in thread
From: Sam James @ 2021-01-14 23:59 UTC (permalink / raw
  To: gentoo-commits

commit:     a4f763c1ad3d9ff414e49066c9bc134328e139b9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 14 23:34:17 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 14 23:34:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4f763c1

media-sound/ardour: Stabilize 6.5-r1 amd64, #763504

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/ardour/ardour-6.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/ardour/ardour-6.5-r1.ebuild b/media-sound/ardour/ardour-6.5-r1.ebuild
index 04ce50423c2..bb8049a79cb 100644
--- a/media-sound/ardour/ardour-6.5-r1.ebuild
+++ b/media-sound/ardour/ardour-6.5-r1.ebuild
@@ -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


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2021-01-13  9:18 Sam James
  0 siblings, 0 replies; 118+ messages in thread
From: Sam James @ 2021-01-13  9:18 UTC (permalink / raw
  To: gentoo-commits

commit:     cfa21b93d1878f94be1b5a4150d73b5b9720718d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 13 09:17:44 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 13 09:17:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfa21b93

media-sound/ardour: Stabilize 6.5-r1 x86, #763504

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/ardour/ardour-6.5-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/ardour/ardour-6.5-r1.ebuild b/media-sound/ardour/ardour-6.5-r1.ebuild
index 225b1611607..04ce50423c2 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


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2021-01-06  8:55 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2021-01-06  8:55 UTC (permalink / raw
  To: gentoo-commits

commit:     a091077851dc54beb9e9f99807e2ea46ff4d6d93
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  6 08:55:01 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Jan  6 08:55:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0910778

media-sound/ardour: removed obsolete 6.3

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/Manifest          |   1 -
 media-sound/ardour/ardour-6.3.ebuild | 152 -----------------------------------
 2 files changed, 153 deletions(-)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 94d27c2607f..f555e57cd9b 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,2 +1 @@
-DIST Ardour-6.3.0.tar.bz2 11863993 BLAKE2B 6b50d0e4b1effc8893cf555098f51458920db6c26a2db8f3c75a5eed56a4d8dafa1565717da2a75577f3068cbce4777f502eaf96f275ed3fd042c6388b842487 SHA512 ce1a6f1b92adb2df0c8863ead9b5f3d8c62a810b224262bda75bca4c09b11826266794260c63bb40ec8d75fbba6fb746a0dff4526311ab1035a3a8ebf0de2dd0
 DIST Ardour-6.5.0.tar.bz2 12000901 BLAKE2B a44ba0b6b071e6b0c9b4bad86c1454584e4f1ee360de490e176af022d5862d57bde97edbe5f8d0ed2fbc5597ab6d8d1ef7f4a2691e7183d59b38d5a143c2d5e7 SHA512 28bb0939c12b687e136de7a8b1ce28f1065d4040bdc171e228c648586bd5d3bd25ab00c677aa55f835e060cc8cbd0a1d1c283c018e4ab0d72d8bde0eb0a26f2a

diff --git a/media-sound/ardour/ardour-6.3.ebuild b/media-sound/ardour/ardour-6.3.ebuild
deleted file mode 100644
index fa0b243c2ab..00000000000
--- a/media-sound/ardour/ardour-6.3.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2020 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-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 )
-	pulseaudio? ( media-sound/pulseaudio )
-	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_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."
-}


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2021-01-05 20:51 Sam James
  0 siblings, 0 replies; 118+ messages in thread
From: Sam James @ 2021-01-05 20:51 UTC (permalink / raw
  To: gentoo-commits

commit:     6ebd59e52cc29a92d92adfd7a5764aba9fb9ecbb
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  5 20:48:27 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan  5 20:48:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ebd59e5

media-sound/ardour: Stabilize 6.5 x86, #761556

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/ardour/ardour-6.5.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/ardour/ardour-6.5.ebuild b/media-sound/ardour/ardour-6.5.ebuild
index 5d07fea09b0..348085665a1 100644
--- a/media-sound/ardour/ardour-6.5.ebuild
+++ b/media-sound/ardour/ardour-6.5.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


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2020-12-28 12:10 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2020-12-28 12:10 UTC (permalink / raw
  To: gentoo-commits

commit:     dc754d3f052175838a563d72fbd249a969c20a18
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 28 12:09:37 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 12:10:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc754d3f

media-sound/ardour: updated latest ebuilds

1) ported changes from 6.5 to 6.5-r1
2) fixed installation of icons in 6.5-r1 and live
   (symlinks not grabbed by xdg)

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/ardour-6.5-r1.ebuild | 33 ++++++++++++++++-----------------
 media-sound/ardour/ardour-9999.ebuild   |  3 +--
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/media-sound/ardour/ardour-6.5-r1.ebuild b/media-sound/ardour/ardour-6.5-r1.ebuild
index f1c48e775b0..225b1611607 100644
--- a/media-sound/ardour/ardour-6.5-r1.ebuild
+++ b/media-sound/ardour/ardour-6.5-r1.ebuild
@@ -24,13 +24,13 @@ 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.32.0
-	>=dev-cpp/gtkmm-2.16:2.4
-	>=dev-cpp/libgnomecanvasmm-2.26:2.6
+	dev-cpp/glibmm
+	dev-cpp/gtkmm:2.4
+	dev-cpp/libgnomecanvasmm:2.6
 	dev-libs/boost:=
-	>=dev-libs/glib-2.10.1:2
+	dev-libs/glib:2
 	dev-libs/libsigc++:2
-	>=dev-libs/libxml2-2.6:2
+	dev-libs/libxml2:2
 	dev-libs/libxslt
 	>=gnome-base/libgnomecanvas-2
 	media-libs/alsa-lib
@@ -39,29 +39,29 @@ RDEPEND="
 	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/liblrdf
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	media-libs/libsoundtouch
 	media-libs/raptor:2
-	>=media-libs/rubberband-1.6.0
-	>=media-libs/taglib-1.7
+	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.8.1:2
+	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-0.6.10
-	>=media-libs/lv2-1.4.0"
-#	!bundled-libs? ( media-sound/fluidsynth ) at leat libltc is missing to be able to unbundle...
+	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}
@@ -155,8 +155,7 @@ src_install() {
 	doman ${PN}${SLOT}.1
 
 	for s in 16 22 32 48 256 512; do
-		dosym ../../../../ardour${SLOT}/resources/Ardour-icon_${s}px.png \
-			/usr/share/icons/hicolor/${s}x${s}/apps/ardour${SLOT}.png
+		newicon -s ${s} gtk2_ardour/resources/Ardour-icon_${s}px.png ardour${SLOT}.png
 	done
 
 	sed -i \

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 55fedd0ef1d..225b1611607 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -155,8 +155,7 @@ src_install() {
 	doman ${PN}${SLOT}.1
 
 	for s in 16 22 32 48 256 512; do
-		dosym ../../../../ardour${SLOT}/resources/Ardour-icon_${s}px.png \
-			/usr/share/icons/hicolor/${s}x${s}/apps/ardour${SLOT}.png
+		newicon -s ${s} gtk2_ardour/resources/Ardour-icon_${s}px.png ardour${SLOT}.png
 	done
 
 	sed -i \


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2020-12-28 12:10 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2020-12-28 12:10 UTC (permalink / raw
  To: gentoo-commits

commit:     0a1957fa5c6358025d3a2ade143598fba87dc95c
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Sun Oct 25 00:06:15 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 12:10:01 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a1957fa

media-sound/ardour: Desktop-related improvements

* Install additional freedesktop files.
* Fix blurry application icon by installing (symlinking) icons for all
  provided sizes.
* Install slightly modified upstream .desktop file instead of generating
  our own.
* Use xdg.eclass to update desktop/icon/mimeinfo cache/databases.
* Convert waf configure options into an array.

Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/ardour-6.5-r1.ebuild | 181 ++++++++++++++++++++++++++++++++
 1 file changed, 181 insertions(+)

diff --git a/media-sound/ardour/ardour-6.5-r1.ebuild b/media-sound/ardour/ardour-6.5-r1.ebuild
new file mode 100644
index 00000000000..f1c48e775b0
--- /dev/null
+++ b/media-sound/ardour/ardour-6.5-r1.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2020 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 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.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 )
+	pulseaudio? ( media-sound/pulseaudio )
+	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}
+	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
+		dosym ../../../../ardour${SLOT}/resources/Ardour-icon_${s}px.png \
+			/usr/share/icons/hicolor/${s}x${s}/apps/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."
+}


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2020-12-28 12:10 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2020-12-28 12:10 UTC (permalink / raw
  To: gentoo-commits

commit:     13f0c75b59df12e9cd21d52822e464c61647a8bd
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Sun Oct 25 00:32:25 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 12:10:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13f0c75b

media-sound/ardour: Update live ebuild

Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Closes: https://github.com/gentoo/gentoo/pull/18027
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/ardour-9999.ebuild | 68 ++++++++++++++++++++++++++---------
 1 file changed, 51 insertions(+), 17 deletions(-)

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index b4637a515b8..55fedd0ef1d 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -5,7 +5,7 @@ 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
+inherit eutils toolchain-funcs flag-o-matic l10n python-any-r1 waf-utils xdg
 
 DESCRIPTION="Digital Audio Workstation"
 HOMEPAGE="https://ardour.org/"
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://community.ardour.org/src/Ardour-${PV}.0.tar.bz2"
+	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi
 
@@ -65,10 +65,16 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	jack? ( virtual/jack )
+	dev-util/itstool
 	sys-devel/gettext
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )"
+	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
@@ -78,7 +84,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	eapply_user
+	default
+	xdg_src_prepare
+
 	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
 	MARCH=$(get-flag march)
 	OPTFLAGS=""
@@ -117,30 +125,56 @@ src_configure() {
 
 	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") \
+	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")
-#not possible right now		--use-external-libs
+		$(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
+
+	mv ${PN}.1 ${PN}${SLOT}.1 || die
 	doman ${PN}${SLOT}.1
-	newicon "${S}/gtk2_ardour/resources/Ardour-icon_48px.png" ${PN}${SLOT}.png
-	make_desktop_entry ardour6 ardour6 ardour6 AudioVideo
+
+	for s in 16 22 32 48 256 512; do
+		dosym ../../../../ardour${SLOT}/resources/Ardour-icon_${s}px.png \
+			/usr/share/icons/hicolor/${s}x${s}/apps/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."


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2020-12-26  1:14 Sam James
  0 siblings, 0 replies; 118+ messages in thread
From: Sam James @ 2020-12-26  1:14 UTC (permalink / raw
  To: gentoo-commits

commit:     1c08f73c5e52e30208574214e116971af8f66247
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 26 01:14:17 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 26 01:14:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c08f73c

media-sound/ardour: Stabilize 6.5 amd64, #761556

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/ardour/ardour-6.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/ardour/ardour-6.5.ebuild b/media-sound/ardour/ardour-6.5.ebuild
index 1630d219290..5d07fea09b0 100644
--- a/media-sound/ardour/ardour-6.5.ebuild
+++ b/media-sound/ardour/ardour-6.5.ebuild
@@ -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


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2020-11-25  9:14 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2020-11-25  9:14 UTC (permalink / raw
  To: gentoo-commits

commit:     73a3c7b2a51490b90bac392264c1a91d76f0fbb2
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 25 09:13:52 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 09:14:16 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73a3c7b2

media-sound/ardour: bump to 6.5 + updated live

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/Manifest                        |  1 +
 .../{ardour-9999.ebuild => ardour-6.5.ebuild}      | 39 ++++++++++++----------
 media-sound/ardour/ardour-9999.ebuild              | 30 ++++++++---------
 3 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index a713cb887b9..94d27c2607f 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1 +1,2 @@
 DIST Ardour-6.3.0.tar.bz2 11863993 BLAKE2B 6b50d0e4b1effc8893cf555098f51458920db6c26a2db8f3c75a5eed56a4d8dafa1565717da2a75577f3068cbce4777f502eaf96f275ed3fd042c6388b842487 SHA512 ce1a6f1b92adb2df0c8863ead9b5f3d8c62a810b224262bda75bca4c09b11826266794260c63bb40ec8d75fbba6fb746a0dff4526311ab1035a3a8ebf0de2dd0
+DIST Ardour-6.5.0.tar.bz2 12000901 BLAKE2B a44ba0b6b071e6b0c9b4bad86c1454584e4f1ee360de490e176af022d5862d57bde97edbe5f8d0ed2fbc5597ab6d8d1ef7f4a2691e7183d59b38d5a143c2d5e7 SHA512 28bb0939c12b687e136de7a8b1ce28f1065d4040bdc171e228c648586bd5d3bd25ab00c677aa55f835e060cc8cbd0a1d1c283c018e4ab0d72d8bde0eb0a26f2a

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-6.5.ebuild
similarity index 84%
copy from media-sound/ardour/ardour-9999.ebuild
copy to media-sound/ardour/ardour-6.5.ebuild
index 7df4f32fbde..1630d219290 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-6.5.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://community.ardour.org/src/Ardour-${PV}.0.tar.bz2"
+	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi
 
@@ -24,13 +24,13 @@ 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.32.0
-	>=dev-cpp/gtkmm-2.16:2.4
-	>=dev-cpp/libgnomecanvasmm-2.26:2.6
+	dev-cpp/glibmm
+	dev-cpp/gtkmm:2.4
+	dev-cpp/libgnomecanvasmm:2.6
 	dev-libs/boost:=
-	>=dev-libs/glib-2.10.1:2
+	dev-libs/glib:2
 	dev-libs/libsigc++:2
-	>=dev-libs/libxml2-2.6:2
+	dev-libs/libxml2:2
 	dev-libs/libxslt
 	>=gnome-base/libgnomecanvas-2
 	media-libs/alsa-lib
@@ -39,29 +39,29 @@ RDEPEND="
 	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/liblrdf
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	media-libs/libsoundtouch
 	media-libs/raptor:2
-	>=media-libs/rubberband-1.6.0
-	>=media-libs/taglib-1.7
+	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.8.1:2
+	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-0.6.10
-	>=media-libs/lv2-1.4.0"
-#	!bundled-libs? ( media-sound/fluidsynth ) at leat libltc is missing to be able to unbundle...
+	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}
@@ -70,6 +70,11 @@ DEPEND="${RDEPEND}
 	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
@@ -78,7 +83,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	eapply_user
+	default
 	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
 	MARCH=$(get-flag march)
 	OPTFLAGS=""

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 7df4f32fbde..b4637a515b8 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -24,13 +24,13 @@ 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.32.0
-	>=dev-cpp/gtkmm-2.16:2.4
-	>=dev-cpp/libgnomecanvasmm-2.26:2.6
+	dev-cpp/glibmm
+	dev-cpp/gtkmm:2.4
+	dev-cpp/libgnomecanvasmm:2.6
 	dev-libs/boost:=
-	>=dev-libs/glib-2.10.1:2
+	dev-libs/glib:2
 	dev-libs/libsigc++:2
-	>=dev-libs/libxml2-2.6:2
+	dev-libs/libxml2:2
 	dev-libs/libxslt
 	>=gnome-base/libgnomecanvas-2
 	media-libs/alsa-lib
@@ -39,29 +39,29 @@ RDEPEND="
 	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/liblrdf
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	media-libs/libsoundtouch
 	media-libs/raptor:2
-	>=media-libs/rubberband-1.6.0
-	>=media-libs/taglib-1.7
+	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.8.1:2
+	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-0.6.10
-	>=media-libs/lv2-1.4.0"
-#	!bundled-libs? ( media-sound/fluidsynth ) at leat libltc is missing to be able to unbundle...
+	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}


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2020-11-12 12:28 Sam James
  0 siblings, 0 replies; 118+ messages in thread
From: Sam James @ 2020-11-12 12:28 UTC (permalink / raw
  To: gentoo-commits

commit:     c39a01f1c631b0c937d25326775c220523b670be
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 12 12:25:39 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 12 12:25:39 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c39a01f1

media-sound/ardour: Stabilize 6.3 amd64, #747940

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/ardour/ardour-6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/ardour/ardour-6.3.ebuild b/media-sound/ardour/ardour-6.3.ebuild
index 0957aef44af..fa0b243c2ab 100644
--- a/media-sound/ardour/ardour-6.3.ebuild
+++ b/media-sound/ardour/ardour-6.3.ebuild
@@ -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


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2020-10-18 18:06 Thomas Deutschmann
  0 siblings, 0 replies; 118+ messages in thread
From: Thomas Deutschmann @ 2020-10-18 18:06 UTC (permalink / raw
  To: gentoo-commits

commit:     29370ad670a23bc92595c25d340bddfc43427e0f
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 18 18:02:22 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Oct 18 18:02:22 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29370ad6

media-sound/ardour: x86 stable (bug #747940)

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 media-sound/ardour/ardour-6.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/ardour/ardour-6.3.ebuild b/media-sound/ardour/ardour-6.3.ebuild
index b60e8f88de2..0957aef44af 100644
--- a/media-sound/ardour/ardour-6.3.ebuild
+++ b/media-sound/ardour/ardour-6.3.ebuild
@@ -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


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2020-10-12  7:31 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2020-10-12  7:31 UTC (permalink / raw
  To: gentoo-commits

commit:     267861b7c4ee3ac3c96235a015303fbd2d4ade35
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 07:31:18 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 07:31:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=267861b7

media-sound/ardour: updated homepage to https

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/ardour-6.2-r1.ebuild | 2 +-
 media-sound/ardour/ardour-6.3.ebuild    | 2 +-
 media-sound/ardour/ardour-9999.ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-sound/ardour/ardour-6.2-r1.ebuild b/media-sound/ardour/ardour-6.2-r1.ebuild
index 735fd655538..a35b090054a 100644
--- a/media-sound/ardour/ardour-6.2-r1.ebuild
+++ b/media-sound/ardour/ardour-6.2-r1.ebuild
@@ -8,7 +8,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/"
+HOMEPAGE="https://ardour.org/"
 
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"

diff --git a/media-sound/ardour/ardour-6.3.ebuild b/media-sound/ardour/ardour-6.3.ebuild
index 75cb0848c61..b60e8f88de2 100644
--- a/media-sound/ardour/ardour-6.3.ebuild
+++ b/media-sound/ardour/ardour-6.3.ebuild
@@ -8,7 +8,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/"
+HOMEPAGE="https://ardour.org/"
 
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 9e5b5ec26e1..7df4f32fbde 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -8,7 +8,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/"
+HOMEPAGE="https://ardour.org/"
 
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2020-09-20 12:51 Sam James
  0 siblings, 0 replies; 118+ messages in thread
From: Sam James @ 2020-09-20 12:51 UTC (permalink / raw
  To: gentoo-commits

commit:     fc068cbec47278876c47a6a7e24a0b2326f53898
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 12:50:57 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 12:50:57 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc068cbe

media-sound/ardour: Stabilize 6.2-r1 amd64, #741825

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/ardour/ardour-6.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/ardour/ardour-6.2-r1.ebuild b/media-sound/ardour/ardour-6.2-r1.ebuild
index 7f80d40defc..735fd655538 100644
--- a/media-sound/ardour/ardour-6.2-r1.ebuild
+++ b/media-sound/ardour/ardour-6.2-r1.ebuild
@@ -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


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2020-09-16 17:10 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2020-09-16 17:10 UTC (permalink / raw
  To: gentoo-commits

commit:     a60cf563f907c85cac8bfad68e627141c0eb0454
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 16 17:10:10 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Sep 16 17:10:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a60cf563

media-sound/ardour: added pulseaudio use flag

Closes: https://bugs.gentoo.org/742932
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/ardour-6.2-r1.ebuild | 9 +++++++--
 media-sound/ardour/ardour-6.3.ebuild    | 9 +++++++--
 media-sound/ardour/ardour-9999.ebuild   | 9 +++++++--
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/media-sound/ardour/ardour-6.2-r1.ebuild b/media-sound/ardour/ardour-6.2-r1.ebuild
index 82d1575b195..7f80d40defc 100644
--- a/media-sound/ardour/ardour-6.2-r1.ebuild
+++ b/media-sound/ardour/ardour-6.2-r1.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="6"
-IUSE="altivec doc jack nls phonehome cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+IUSE="altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
 
 RDEPEND="
 	>=dev-cpp/glibmm-2.32.0
@@ -55,6 +55,7 @@ RDEPEND="
 	>=x11-libs/gtk+-2.8.1:2
 	x11-libs/pango
 	jack? ( virtual/jack )
+	pulseaudio? ( media-sound/pulseaudio )
 	media-libs/lilv
 	media-libs/sratom
 	dev-libs/sord
@@ -120,15 +121,19 @@ src_prepare() {
 }
 
 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 jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
 		$(usex phonehome "--phone-home" "--no-phone-home") \
 		$(usex nls "--nls" "--no-nls")
 #not possible right now		--use-external-libs

diff --git a/media-sound/ardour/ardour-6.3.ebuild b/media-sound/ardour/ardour-6.3.ebuild
index 6bd303b0e46..75cb0848c61 100644
--- a/media-sound/ardour/ardour-6.3.ebuild
+++ b/media-sound/ardour/ardour-6.3.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="6"
-IUSE="altivec doc jack nls phonehome cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+IUSE="altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
 
 RDEPEND="
 	>=dev-cpp/glibmm-2.32.0
@@ -55,6 +55,7 @@ RDEPEND="
 	>=x11-libs/gtk+-2.8.1:2
 	x11-libs/pango
 	jack? ( virtual/jack )
+	pulseaudio? ( media-sound/pulseaudio )
 	media-libs/lilv
 	media-libs/sratom
 	dev-libs/sord
@@ -115,15 +116,19 @@ src_prepare() {
 }
 
 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 jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
 		$(usex phonehome "--phone-home" "--no-phone-home") \
 		$(usex nls "--nls" "--no-nls")
 #not possible right now		--use-external-libs

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 43c1789b324..9e5b5ec26e1 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="6"
-IUSE="altivec doc jack nls phonehome cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+IUSE="altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
 
 RDEPEND="
 	>=dev-cpp/glibmm-2.32.0
@@ -55,6 +55,7 @@ RDEPEND="
 	>=x11-libs/gtk+-2.8.1:2
 	x11-libs/pango
 	jack? ( virtual/jack )
+	pulseaudio? ( media-sound/pulseaudio )
 	media-libs/lilv
 	media-libs/sratom
 	dev-libs/sord
@@ -110,15 +111,19 @@ src_prepare() {
 }
 
 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 jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
 		$(usex phonehome "--phone-home" "--no-phone-home") \
 		$(usex nls "--nls" "--no-nls")
 #not possible right now		--use-external-libs


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2020-09-12 10:20 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2020-09-12 10:20 UTC (permalink / raw
  To: gentoo-commits

commit:     d941a57f9a26a39743ad4f610cf5cbb6364ca057
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 12 10:20:02 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Sep 12 10:20:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d941a57f

media-sound/ardour: bump to 6.3

Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/Manifest          |   1 +
 media-sound/ardour/ardour-6.3.ebuild | 147 +++++++++++++++++++++++++++++++++++
 2 files changed, 148 insertions(+)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 4a3220d8015..c97770ccc71 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1 +1,2 @@
 DIST Ardour-6.2.0.tar.bz2 11042230 BLAKE2B 7039b0ea7a8550d5372ce795bc978f3d6129828cc6e93d98ce8ba74c6fab3db0e4343142d75e9684f9dffdaebf1ee634f8ab0165f510eb658d32d890f6417b63 SHA512 d4c20968738ec2fef382fc1109f1b17560863c4eb0f7cf5c42b79e9a610916e57e6c01985a2ca2a66b8647e99c10bd98c16e05eb81a7811e73e482f7af11e4a8
+DIST Ardour-6.3.0.tar.bz2 11863993 BLAKE2B 6b50d0e4b1effc8893cf555098f51458920db6c26a2db8f3c75a5eed56a4d8dafa1565717da2a75577f3068cbce4777f502eaf96f275ed3fd042c6388b842487 SHA512 ce1a6f1b92adb2df0c8863ead9b5f3d8c62a810b224262bda75bca4c09b11826266794260c63bb40ec8d75fbba6fb746a0dff4526311ab1035a3a8ebf0de2dd0

diff --git a/media-sound/ardour/ardour-6.3.ebuild b/media-sound/ardour/ardour-6.3.ebuild
new file mode 100644
index 00000000000..6bd303b0e46
--- /dev/null
+++ b/media-sound/ardour/ardour-6.3.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2020 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="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://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 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_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() {
+	tc-export CC CXX
+	mkdir -p "${D}"
+	waf-utils_src_configure \
+		--destdir="${D}" \
+		--configdir=/etc \
+		--optimize \
+		$(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") \
+		$(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."
+}


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2020-09-07 18:55 Miroslav Šulc
  0 siblings, 0 replies; 118+ messages in thread
From: Miroslav Šulc @ 2020-09-07 18:55 UTC (permalink / raw
  To: gentoo-commits

commit:     3f350748216259e2f4e5b97fe3516e28cabbc182
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  7 18:54:46 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Sep  7 18:54:46 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f350748

media-sound/ardour: added gold linker warning to 6.2-r1

Bug: https://bugs.gentoo.org/733972
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/ardour/ardour-6.2-r1.ebuild | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/media-sound/ardour/ardour-6.2-r1.ebuild b/media-sound/ardour/ardour-6.2-r1.ebuild
index 97893a719d6..97e4502ac21 100644
--- a/media-sound/ardour/ardour-6.2-r1.ebuild
+++ b/media-sound/ardour/ardour-6.2-r1.ebuild
@@ -74,6 +74,11 @@ PATCHES=(
 	"${FILESDIR}/${P}-use-signed-int-for-atomic-operations.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


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2020-08-13  8:37 Lars Wendler
  0 siblings, 0 replies; 118+ messages in thread
From: Lars Wendler @ 2020-08-13  8:37 UTC (permalink / raw
  To: gentoo-commits

commit:     42ab9384887fec19a1aa5f995c4313a275394095
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 13 08:20:00 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Aug 13 08:37:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42ab9384

media-sound/ardour: Revbump to not install config into /usr/etc/

Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../ardour/{ardour-6.2.ebuild => ardour-6.2-r1.ebuild}        | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/media-sound/ardour/ardour-6.2.ebuild b/media-sound/ardour/ardour-6.2-r1.ebuild
similarity index 96%
rename from media-sound/ardour/ardour-6.2.ebuild
rename to media-sound/ardour/ardour-6.2-r1.ebuild
index 62d9c9a3223..43c1789b324 100644
--- a/media-sound/ardour/ardour-6.2.ebuild
+++ b/media-sound/ardour/ardour-6.2-r1.ebuild
@@ -113,15 +113,14 @@ src_configure() {
 	tc-export CC CXX
 	mkdir -p "${D}"
 	waf-utils_src_configure \
+		--destdir="${D}" \
+		--configdir=/etc \
+		--optimize \
 		$(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
+		$(usex phonehome "--phone-home" "--no-phone-home") \
+		$(usex nls "--nls" "--no-nls")
 #not possible right now		--use-external-libs
 }
 src_compile() {


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2020-08-13  8:37 Lars Wendler
  0 siblings, 0 replies; 118+ messages in thread
From: Lars Wendler @ 2020-08-13  8:37 UTC (permalink / raw
  To: gentoo-commits

commit:     2c36d79b1a95df32c4289835b099957619e743dc
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 13 08:22:34 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Aug 13 08:37:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c36d79b

media-sound/ardour: Synced live ebuild

Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-sound/ardour/ardour-9999.ebuild | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 62d9c9a3223..43c1789b324 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -113,15 +113,14 @@ src_configure() {
 	tc-export CC CXX
 	mkdir -p "${D}"
 	waf-utils_src_configure \
+		--destdir="${D}" \
+		--configdir=/etc \
+		--optimize \
 		$(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
+		$(usex phonehome "--phone-home" "--no-phone-home") \
+		$(usex nls "--nls" "--no-nls")
 #not possible right now		--use-external-libs
 }
 src_compile() {


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2020-05-28 14:15 Andreas Schuerch
  0 siblings, 0 replies; 118+ messages in thread
From: Andreas Schuerch @ 2020-05-28 14:15 UTC (permalink / raw
  To: gentoo-commits

commit:     796c79ae5c21967d86132a5913ff16d89b4c1399
Author:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
AuthorDate: Thu May 28 14:11:33 2020 +0000
Commit:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
CommitDate: Thu May 28 14:13:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=796c79ae

media-sound/ardour: version bump to 6.0

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Schuerch <nativemad <AT> gentoo.org>

 media-sound/ardour/Manifest                        |  1 +
 .../{ardour-9999.ebuild => ardour-6.0.ebuild}      | 27 ++++++++++++++--------
 media-sound/ardour/ardour-9999.ebuild              | 27 ++++++++++++++--------
 media-sound/ardour/metadata.xml                    |  3 +++
 4 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 2715b3fb7e1..bf2aa3d6bda 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1 +1,2 @@
+DIST Ardour-6.0.0.tar.bz2 10999598 BLAKE2B d403a76bb95a7c8dc411b45b54d9b1afb64ab0ba104c283c6890ec5bb152c9f67b825222460bb7b29a28724e7581023e5d3c7ce3b7ff9c88f3d584fab8cb03f7 SHA512 42cd5ea69200aefc60fc93ca7347f08fc511a9821a03023c4362d626f0957570ba0a7b174af67016f7fa27a29eed3c932d502e090d780125c63b5690faa642a3
 DIST ardour-5.12.tar.bz2 8852834 BLAKE2B 0409d920ab0abc9e52a40cc343c5481d53292bea6e5c89c58328f95c53f7f09f30ce421f2ed0da0e3fdb4eaeeb5a25da0d07ed1d4c382b5b607f3b89324eca1b SHA512 c4b4332bddb2406924119c181622801725f4a7dd7741c1a66ddbc2236542764b786337da2f0a751f3bbe6e0389b5da765eb19b14a6a90c8f8a7fd68231e5067d

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-6.0.ebuild
similarity index 80%
copy from media-sound/ardour/ardour-9999.ebuild
copy to media-sound/ardour/ardour-6.0.ebuild
index 36ca3e79777..304e08fcb60 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-6.0.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/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 36ca3e79777..304e08fcb60 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 20dec2c8d4e..1f9044f06be 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>


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2020-04-04  6:12 Jason A. Donenfeld
  0 siblings, 0 replies; 118+ messages in thread
From: Jason A. Donenfeld @ 2020-04-04  6:12 UTC (permalink / raw
  To: gentoo-commits

commit:     154cbc15d0766332fd97cf1bbdedff3d7683f6e4
Author:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  4 06:12:07 2020 +0000
Commit:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Sat Apr  4 06:12:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=154cbc15

media-sound/ardour: remove nag text

00:08:29 <@mgorny> zx2c4: just remove that, please
00:09:13 <@mgorny> (postinst, not the package ;-))

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>

 media-sound/ardour/ardour-5.12.ebuild | 2 --
 media-sound/ardour/ardour-9999.ebuild | 2 --
 2 files changed, 4 deletions(-)

diff --git a/media-sound/ardour/ardour-5.12.ebuild b/media-sound/ardour/ardour-5.12.ebuild
index fbd2949eff5..e29d333138f 100644
--- a/media-sound/ardour/ardour-5.12.ebuild
+++ b/media-sound/ardour/ardour-5.12.ebuild
@@ -131,8 +131,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "If you are using Ardour and want to keep its development alive"
-	elog "then please consider to make a donation upstream at ${HOMEPAGE}."
 	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 45dddecc7e5..36ca3e79777 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -131,8 +131,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "If you are using Ardour and want to keep its development alive"
-	elog "then please consider to make a donation upstream at ${HOMEPAGE}."
 	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."


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2019-10-01 13:47 Andreas Schuerch
  0 siblings, 0 replies; 118+ messages in thread
From: Andreas Schuerch @ 2019-10-01 13:47 UTC (permalink / raw
  To: gentoo-commits

commit:     24cc431c3867a76b6e7e4a3a55766b16427217b1
Author:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  1 13:46:13 2019 +0000
Commit:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
CommitDate: Tue Oct  1 13:46:13 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24cc431c

media-sound/ardour: revert slot and desktop entry to 5. Bug 695448

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Schuerch <nativemad <AT> gentoo.org>

 media-sound/ardour/ardour-5.12.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/ardour/ardour-5.12.ebuild b/media-sound/ardour/ardour-5.12.ebuild
index de386a8cd32..223ce5f6bb8 100644
--- a/media-sound/ardour/ardour-5.12.ebuild
+++ b/media-sound/ardour/ardour-5.12.ebuild
@@ -20,7 +20,7 @@ else
 fi
 
 LICENSE="GPL-2"
-SLOT="6"
+SLOT="5"
 IUSE="altivec doc jack cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
 
 RDEPEND="
@@ -127,7 +127,7 @@ 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
+	make_desktop_entry ardour5 ardour5 ardour5 AudioVideo
 }
 
 pkg_postinst() {


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2019-09-20 11:16 Andreas Schuerch
  0 siblings, 0 replies; 118+ messages in thread
From: Andreas Schuerch @ 2019-09-20 11:16 UTC (permalink / raw
  To: gentoo-commits

commit:     e795b3db7ee3e3fe3e735b5a1728aaf81855aef0
Author:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 20 11:17:32 2019 +0000
Commit:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
CommitDate: Fri Sep 20 11:17:32 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e795b3db

media-sound/ardour: few fixes #685516, #688106, #688116

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Schuerch <nativemad <AT> gentoo.org>

 media-sound/ardour/ardour-5.12.ebuild | 28 +++++++++++++---------------
 media-sound/ardour/ardour-9999.ebuild | 22 ++++++++++------------
 2 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/media-sound/ardour/ardour-5.12.ebuild b/media-sound/ardour/ardour-5.12.ebuild
index 8998723b507..de386a8cd32 100644
--- a/media-sound/ardour/ardour-5.12.ebuild
+++ b/media-sound/ardour/ardour-5.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="Digital Audio Workstation"
 HOMEPAGE="http://ardour.org/"
 
 if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
+	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~x86"
@@ -20,7 +20,7 @@ else
 fi
 
 LICENSE="GPL-2"
-SLOT="5"
+SLOT="6"
 IUSE="altivec doc jack cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
 
 RDEPEND="
@@ -50,12 +50,11 @@ RDEPEND="
 	net-misc/curl
 	sys-libs/readline:0=
 	sci-libs/fftw:3.0[threads]
-	virtual/libusb:0
+	virtual/libusb:1
 	x11-libs/cairo
 	>=x11-libs/gtk+-2.8.1:2
 	x11-libs/pango
 	jack? ( virtual/jack )
-	>=media-libs/slv2-0.6.1
 	media-libs/lilv
 	media-libs/sratom
 	dev-libs/sord
@@ -113,15 +112,14 @@ src_configure() {
 	tc-export CC CXX
 	mkdir -p "${D}"
 	waf-utils_src_configure \
-		--destdir="${D}" \
-		--prefix=/usr \
-		--configdir=/etc \
-		--nls \
-		--optimize \
-		--lv2 \
-		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
-		$(usex doc "--docs" '') \
-		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+                $(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}" \
+                --prefix=/usr \
+                --configdir=/etc \
+                --nls \
+                --optimize
 }
 
 src_install() {
@@ -129,7 +127,7 @@ 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 ardour5 ardour5 ardour5 AudioVideo
+	make_desktop_entry ardour6 ardour6 ardour6 AudioVideo
 }
 
 pkg_postinst() {

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index eb88ef6ef38..de386a8cd32 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -50,12 +50,11 @@ RDEPEND="
 	net-misc/curl
 	sys-libs/readline:0=
 	sci-libs/fftw:3.0[threads]
-	virtual/libusb:0
+	virtual/libusb:1
 	x11-libs/cairo
 	>=x11-libs/gtk+-2.8.1:2
 	x11-libs/pango
 	jack? ( virtual/jack )
-	>=media-libs/slv2-0.6.1
 	media-libs/lilv
 	media-libs/sratom
 	dev-libs/sord
@@ -113,15 +112,14 @@ src_configure() {
 	tc-export CC CXX
 	mkdir -p "${D}"
 	waf-utils_src_configure \
-		--destdir="${D}" \
-		--prefix=/usr \
-		--configdir=/etc \
-		--nls \
-		--optimize \
-		--lv2 \
-		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
-		$(usex doc "--docs" '') \
-		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+                $(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}" \
+                --prefix=/usr \
+                --configdir=/etc \
+                --nls \
+                --optimize
 }
 
 src_install() {


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2018-07-04 14:45 Andreas Schuerch
  0 siblings, 0 replies; 118+ messages in thread
From: Andreas Schuerch @ 2018-07-04 14:45 UTC (permalink / raw
  To: gentoo-commits

commit:     33a17dee6a546a50fe71a6996f3bae30533aa82a
Author:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  4 12:32:46 2018 +0000
Commit:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
CommitDate: Wed Jul  4 14:44:55 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33a17dee

media-sound/ardour: move 9999 to ardour6

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-sound/ardour/ardour-9999.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 67a60199f1b..eb88ef6ef38 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="Digital Audio Workstation"
 HOMEPAGE="http://ardour.org/"
 
 if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="git://git.ardour.org/ardour/ardour.git"
+	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~x86"
@@ -20,7 +20,7 @@ else
 fi
 
 LICENSE="GPL-2"
-SLOT="5"
+SLOT="6"
 IUSE="altivec doc jack cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
 
 RDEPEND="
@@ -129,7 +129,7 @@ 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 ardour5 ardour5 ardour5 AudioVideo
+	make_desktop_entry ardour6 ardour6 ardour6 AudioVideo
 }
 
 pkg_postinst() {


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2017-11-29 15:27 Andreas Schuerch
  0 siblings, 0 replies; 118+ messages in thread
From: Andreas Schuerch @ 2017-11-29 15:27 UTC (permalink / raw
  To: gentoo-commits

commit:     b71c33b97a5df99b1438954048998d9fb5d2acf2
Author:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 29 15:26:07 2017 +0000
Commit:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
CommitDate: Wed Nov 29 15:26:54 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b71c33b9

media-sound/ardour: fix USE dep for fftw. Bug 637550

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 media-sound/ardour/ardour-4.7-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/ardour/ardour-4.7-r2.ebuild b/media-sound/ardour/ardour-4.7-r2.ebuild
index 968572f28b5..dfce82a22d0 100644
--- a/media-sound/ardour/ardour-4.7-r2.ebuild
+++ b/media-sound/ardour/ardour-4.7-r2.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
 	>=media-libs/taglib-1.7
 	media-libs/vamp-plugin-sdk
 	net-misc/curl
-	sci-libs/fftw:3.0
+	sci-libs/fftw:3.0[threads]
 	virtual/libusb:0
 	x11-libs/cairo
 	>=x11-libs/gtk+-2.8.1:2


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2017-11-29 15:18 Andreas Schuerch
  0 siblings, 0 replies; 118+ messages in thread
From: Andreas Schuerch @ 2017-11-29 15:18 UTC (permalink / raw
  To: gentoo-commits

commit:     eeb56d66e1243bd036596b32792e1871ab5fb492
Author:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 29 15:16:06 2017 +0000
Commit:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
CommitDate: Wed Nov 29 15:17:11 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eeb56d66

media-sound/ardour: Version bump. Bug 638436

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 media-sound/ardour/Manifest           |  15 ++--
 media-sound/ardour/ardour-5.12.ebuild | 141 ++++++++++++++++++++++++++++++++++
 2 files changed, 149 insertions(+), 7 deletions(-)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 10a167bd24b..a836351b84e 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,8 +1,9 @@
-DIST ardour-2.8.16.tar.bz2 2169916 SHA256 37ee32119ba105fa0883faa7e18c58ecd5276894568da224a554d9ef49075e40 SHA512 02e74883cf466fcd5588ec8f2fd9d032b4611071d630b412c853a7ae7cb46045c0cde4308abbc78da3f54aae0ab1c32a980b8d1e1a965c8633ef43d8e08e0d0d WHIRLPOOL 357b45e506da05b1ce17f006c3e2b22b17150b5556e06785b961b308d958fb66fa82b3e01d1d5e596e43caf6b9d1c83287696a6c694e54114fed5825e2fc5a51
-DIST ardour-4.7.tar.gz 9863149 SHA256 dfa3d102b3f7bb0702969153d22d9311ac98c587f691760ab0f1d3f4f455a86d SHA512 5daff563ec0b2dc38ec6ca55bb12526ef54da9d8d5a29a9fd6d869f54b83e6fe5ff3c28ef654e6700455110b4a46ce42a33902eb66d96330c6c0948eb3cd3096 WHIRLPOOL eb94b56a919d0088a312414f45475f53ee8c7f618d85f9ffcf5f27719422c2035ff4608108ecbe0f521d54ed1ad40c06ada0a1cb8f7d70531320f40aa107e4b4
+DIST ardour-2.8.16.tar.bz2 2169916 BLAKE2B 47db892002f439312efdeec9840d96045a9852b078d4cd88de2fe089f510b904028cb7b0a2d2d39cf004a1bf60127bbfa91af6b9ff1118f3729f9c6d2363d14f SHA512 02e74883cf466fcd5588ec8f2fd9d032b4611071d630b412c853a7ae7cb46045c0cde4308abbc78da3f54aae0ab1c32a980b8d1e1a965c8633ef43d8e08e0d0d
+DIST ardour-4.7.tar.gz 9863149 BLAKE2B 1b81230a1add69506ad703b09cd683fad0ba5c78c30c1701b913ed42690665201541ff01ada9e5b913fc7000df1622cc9fb9b56fa95e46a48d6608ac4fc90f13 SHA512 5daff563ec0b2dc38ec6ca55bb12526ef54da9d8d5a29a9fd6d869f54b83e6fe5ff3c28ef654e6700455110b4a46ce42a33902eb66d96330c6c0948eb3cd3096
 DIST ardour-5.10.tar.bz2 8844840 SHA256 2d88fad771e8f4df4c1ff06836152d486f392a71b4f369759934419b679ddd0f SHA512 4dc8c43ed81b931e855f4a19b5674712a8322edaa06f466d5dd0eb93076a67da12795944c8f17b30b89bb5e87f54279fc2b21d147d48e98e5cb69a3f965a8bb8 WHIRLPOOL 1b8d23c58a5ecb04410df29daa0e73c308b58b843b000a607e4ef2cd78b94e250252654e1c39d34373b5482f141491532914298589bd13e260864044f0ee8b1a
-DIST ardour-5.3.tar.bz2 8244811 SHA256 1289002cb81e372b663f9d66e2923c066b64c48f9bec3a9884f7a59cb007945a SHA512 464c311cd3f3f4a580ad451be7a8143a3f2f7454364426c952e757999aba92af6611d0bc31f4d5e0ca301a3c79e4cd1ec19b01ec9941f34e6fa4cf338149291f WHIRLPOOL b7d999805f2b5dda2dc1fd92cbec76d499b15c0f7517c208e7c6b46b624dcd759b0c25a4ee9ec23d974500873c93a8b76e1f45395a25936d5641e47e3027f038
-DIST ardour-5.5.tar.bz2 9237459 SHA256 867605614f6840341d37c388f6c5acf803579172b7d7edbebb4c8e36c8bfde1f SHA512 63132681dda7890b8f455a8142935f0bdce28e718b98d1d79a9207ad86b25d31698285d28871bb5043b3b859efd8b1fb8b7b7324fa3abd952a7a9c8e1691e09c WHIRLPOOL 16a7cdc5b5893bbd4e6e86bf3f6d06dc236ad3c7062ba51f313fc472fd46e63f9508f761e9d20ff929e915591fc1d3153098b115909671e4c357003b6c21f733
-DIST ardour-5.6.tar.bz2 8590451 SHA256 d8a55121540e1de8c1a040162316434a2c82d75b8c9e9673ab2143662c848372 SHA512 6d7c72f4bb91e0d9d63dfb2273108e3f61bddac9c21f1f58fe6cb73d5f0a028e735d226c3aa2d1404916b566a103d556a2934b083a4c5d629ec7e28c0abd34f9 WHIRLPOOL a55ac78ad64b56678ca0a6f278a6a4e118d5a0aa8e2d5fa7309583c20f87d5df58408b3deee6cbb0b7a1390fa73ec3a766445d08d94709be02869cbc1aa059da
-DIST ardour-5.8.tar.bz2 8669692 SHA256 0138a7cdc30353a3ceb520fab4d636a9ffca2d4d031839d5aa4cd36dcccba886 SHA512 96b3a81f8c48f66839fb8cddeec5ed0c4a95a6092eab15eacb69007cf093cc6572c308e37c8acbc0194eeecf809980c22c04449fe65d683c298d8d0611e7950e WHIRLPOOL 9e2cdda574d39f8abbc9ef2a127124b132011de84eb9808c4d1ae44a746aa96b550ba49365d545d5614559df1fe0d9f844befec59c82bf9c5da956971a77d5e7
-DIST ardour-5.9.tar.bz2 8830842 SHA256 dffebbee16d3fce71e5f5657e99adb97a88515a6607e45397dd774e77b22f559 SHA512 1ba713f3953456260df9d183b30730c959f2707f8c9dd1280a3ab5eb5d9dbdd0e81db98150346f60f777f6bd02eeaaf9f9bcf43cf2ec0b5addce3b50fcbf7413 WHIRLPOOL 6fb7d0711b6d6bfeaf4c7f52bb3f518377f84a94eec3e27364b00998c83964e418127c7ad5d6726b88ef7ecf360a95e176a4d0feb0054018c83956afdeca2678
+DIST ardour-5.12.tar.bz2 8852834 BLAKE2B 0409d920ab0abc9e52a40cc343c5481d53292bea6e5c89c58328f95c53f7f09f30ce421f2ed0da0e3fdb4eaeeb5a25da0d07ed1d4c382b5b607f3b89324eca1b SHA512 c4b4332bddb2406924119c181622801725f4a7dd7741c1a66ddbc2236542764b786337da2f0a751f3bbe6e0389b5da765eb19b14a6a90c8f8a7fd68231e5067d
+DIST ardour-5.3.tar.bz2 8244811 BLAKE2B d2635ef720c03ec84bf481f09244c6fad78b857dcda52d7a40e0da9ce5c0a37f9cf5c8355429f86e17ddccb857a7b75c07481408dae2f10b8c71215e9ef8fa9e SHA512 464c311cd3f3f4a580ad451be7a8143a3f2f7454364426c952e757999aba92af6611d0bc31f4d5e0ca301a3c79e4cd1ec19b01ec9941f34e6fa4cf338149291f
+DIST ardour-5.5.tar.bz2 9237459 BLAKE2B 71e967202e46a7e7db1fc2717a8d27470e411dd686a5fd858da57aff72be1e277e20bd9f2568073cc91d21b6124af3ac3bf6024781fae344b83f4900025dc838 SHA512 63132681dda7890b8f455a8142935f0bdce28e718b98d1d79a9207ad86b25d31698285d28871bb5043b3b859efd8b1fb8b7b7324fa3abd952a7a9c8e1691e09c
+DIST ardour-5.6.tar.bz2 8590451 BLAKE2B ffafbac62d5bddfff2f4b4bda92692c1c7644050eec444e209f6b4d3b5c300c7ee39d46cd249196ca64b8a43c8716e5fc35272895dd059061669de629100697a SHA512 6d7c72f4bb91e0d9d63dfb2273108e3f61bddac9c21f1f58fe6cb73d5f0a028e735d226c3aa2d1404916b566a103d556a2934b083a4c5d629ec7e28c0abd34f9
+DIST ardour-5.8.tar.bz2 8669692 BLAKE2B 6628d0c6f81feb96f1d3bc5453cbeb3d5d7c012a2efa1e800d84fd1101c651bb4092e599ef6725507c6243a94107242a496b1b4f6df884bcaa8954c0f71a6861 SHA512 96b3a81f8c48f66839fb8cddeec5ed0c4a95a6092eab15eacb69007cf093cc6572c308e37c8acbc0194eeecf809980c22c04449fe65d683c298d8d0611e7950e
+DIST ardour-5.9.tar.bz2 8830842 BLAKE2B 4c025475528f7b0b58b18b9a075abab4805efa538af774bd7aa4b86da98c4df1ee639bb253f4326a11924d577c49a7af8c77098edf63a76205c60880bdac31b3 SHA512 1ba713f3953456260df9d183b30730c959f2707f8c9dd1280a3ab5eb5d9dbdd0e81db98150346f60f777f6bd02eeaaf9f9bcf43cf2ec0b5addce3b50fcbf7413

diff --git a/media-sound/ardour/ardour-5.12.ebuild b/media-sound/ardour/ardour-5.12.ebuild
new file mode 100644
index 00000000000..8998723b507
--- /dev/null
+++ b/media-sound/ardour/ardour-5.12.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="http://ardour.org/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://gentoo/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
+	S="${WORKDIR}/Ardour-${PV}.0"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="altivec doc jack 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:0
+	x11-libs/cairo
+	>=x11-libs/gtk+-2.8.1:2
+	x11-libs/pango
+	jack? ( virtual/jack )
+	>=media-libs/slv2-0.6.1
+	media-libs/lilv
+	media-libs/sratom
+	dev-libs/sord
+	>=media-libs/suil-0.6.10
+	>=media-libs/lv2-1.4.0"
+
+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
+	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=""
+	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
+}
+
+src_configure() {
+	tc-export CC CXX
+	mkdir -p "${D}"
+	waf-utils_src_configure \
+		--destdir="${D}" \
+		--prefix=/usr \
+		--configdir=/etc \
+		--nls \
+		--optimize \
+		--lv2 \
+		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
+		$(usex doc "--docs" '') \
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+}
+
+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 ardour5 ardour5 ardour5 AudioVideo
+}
+
+pkg_postinst() {
+	elog "If you are using Ardour and want to keep its development alive"
+	elog "then please consider to make a donation upstream at ${HOMEPAGE}."
+	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."
+}


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2017-07-29 21:47 Michael Weber
  0 siblings, 0 replies; 118+ messages in thread
From: Michael Weber @ 2017-07-29 21:47 UTC (permalink / raw
  To: gentoo-commits

commit:     c1605e6f952e51a129357103f89522fe6e00516c
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 29 21:47:08 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sat Jul 29 21:47:08 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1605e6f

media-sound/ardour: Version bump (bug 626514) after talking to #proaudio-overlay.

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 media-sound/ardour/Manifest           |   1 +
 media-sound/ardour/ardour-5.10.ebuild | 141 ++++++++++++++++++++++++++++++++++
 2 files changed, 142 insertions(+)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 0532bd518a7..10a167bd24b 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,5 +1,6 @@
 DIST ardour-2.8.16.tar.bz2 2169916 SHA256 37ee32119ba105fa0883faa7e18c58ecd5276894568da224a554d9ef49075e40 SHA512 02e74883cf466fcd5588ec8f2fd9d032b4611071d630b412c853a7ae7cb46045c0cde4308abbc78da3f54aae0ab1c32a980b8d1e1a965c8633ef43d8e08e0d0d WHIRLPOOL 357b45e506da05b1ce17f006c3e2b22b17150b5556e06785b961b308d958fb66fa82b3e01d1d5e596e43caf6b9d1c83287696a6c694e54114fed5825e2fc5a51
 DIST ardour-4.7.tar.gz 9863149 SHA256 dfa3d102b3f7bb0702969153d22d9311ac98c587f691760ab0f1d3f4f455a86d SHA512 5daff563ec0b2dc38ec6ca55bb12526ef54da9d8d5a29a9fd6d869f54b83e6fe5ff3c28ef654e6700455110b4a46ce42a33902eb66d96330c6c0948eb3cd3096 WHIRLPOOL eb94b56a919d0088a312414f45475f53ee8c7f618d85f9ffcf5f27719422c2035ff4608108ecbe0f521d54ed1ad40c06ada0a1cb8f7d70531320f40aa107e4b4
+DIST ardour-5.10.tar.bz2 8844840 SHA256 2d88fad771e8f4df4c1ff06836152d486f392a71b4f369759934419b679ddd0f SHA512 4dc8c43ed81b931e855f4a19b5674712a8322edaa06f466d5dd0eb93076a67da12795944c8f17b30b89bb5e87f54279fc2b21d147d48e98e5cb69a3f965a8bb8 WHIRLPOOL 1b8d23c58a5ecb04410df29daa0e73c308b58b843b000a607e4ef2cd78b94e250252654e1c39d34373b5482f141491532914298589bd13e260864044f0ee8b1a
 DIST ardour-5.3.tar.bz2 8244811 SHA256 1289002cb81e372b663f9d66e2923c066b64c48f9bec3a9884f7a59cb007945a SHA512 464c311cd3f3f4a580ad451be7a8143a3f2f7454364426c952e757999aba92af6611d0bc31f4d5e0ca301a3c79e4cd1ec19b01ec9941f34e6fa4cf338149291f WHIRLPOOL b7d999805f2b5dda2dc1fd92cbec76d499b15c0f7517c208e7c6b46b624dcd759b0c25a4ee9ec23d974500873c93a8b76e1f45395a25936d5641e47e3027f038
 DIST ardour-5.5.tar.bz2 9237459 SHA256 867605614f6840341d37c388f6c5acf803579172b7d7edbebb4c8e36c8bfde1f SHA512 63132681dda7890b8f455a8142935f0bdce28e718b98d1d79a9207ad86b25d31698285d28871bb5043b3b859efd8b1fb8b7b7324fa3abd952a7a9c8e1691e09c WHIRLPOOL 16a7cdc5b5893bbd4e6e86bf3f6d06dc236ad3c7062ba51f313fc472fd46e63f9508f761e9d20ff929e915591fc1d3153098b115909671e4c357003b6c21f733
 DIST ardour-5.6.tar.bz2 8590451 SHA256 d8a55121540e1de8c1a040162316434a2c82d75b8c9e9673ab2143662c848372 SHA512 6d7c72f4bb91e0d9d63dfb2273108e3f61bddac9c21f1f58fe6cb73d5f0a028e735d226c3aa2d1404916b566a103d556a2934b083a4c5d629ec7e28c0abd34f9 WHIRLPOOL a55ac78ad64b56678ca0a6f278a6a4e118d5a0aa8e2d5fa7309583c20f87d5df58408b3deee6cbb0b7a1390fa73ec3a766445d08d94709be02869cbc1aa059da

diff --git a/media-sound/ardour/ardour-5.10.ebuild b/media-sound/ardour/ardour-5.10.ebuild
new file mode 100644
index 00000000000..8998723b507
--- /dev/null
+++ b/media-sound/ardour/ardour-5.10.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="http://ardour.org/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://gentoo/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
+	S="${WORKDIR}/Ardour-${PV}.0"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="altivec doc jack 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:0
+	x11-libs/cairo
+	>=x11-libs/gtk+-2.8.1:2
+	x11-libs/pango
+	jack? ( virtual/jack )
+	>=media-libs/slv2-0.6.1
+	media-libs/lilv
+	media-libs/sratom
+	dev-libs/sord
+	>=media-libs/suil-0.6.10
+	>=media-libs/lv2-1.4.0"
+
+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
+	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=""
+	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
+}
+
+src_configure() {
+	tc-export CC CXX
+	mkdir -p "${D}"
+	waf-utils_src_configure \
+		--destdir="${D}" \
+		--prefix=/usr \
+		--configdir=/etc \
+		--nls \
+		--optimize \
+		--lv2 \
+		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
+		$(usex doc "--docs" '') \
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+}
+
+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 ardour5 ardour5 ardour5 AudioVideo
+}
+
+pkg_postinst() {
+	elog "If you are using Ardour and want to keep its development alive"
+	elog "then please consider to make a donation upstream at ${HOMEPAGE}."
+	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."
+}


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2017-05-17 16:32 Andreas Schuerch
  0 siblings, 0 replies; 118+ messages in thread
From: Andreas Schuerch @ 2017-05-17 16:32 UTC (permalink / raw
  To: gentoo-commits

commit:     b2a0dc367845e2236f90fcd197d17e7f2426f8c9
Author:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
AuthorDate: Wed May 17 16:31:34 2017 +0000
Commit:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
CommitDate: Wed May 17 16:31:34 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2a0dc36

media-sound/ardour: bump to 5.9

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 media-sound/ardour/Manifest          |   1 +
 media-sound/ardour/ardour-5.9.ebuild | 141 +++++++++++++++++++++++++++++++++++
 2 files changed, 142 insertions(+)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 968dc1e722f..0532bd518a7 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -4,3 +4,4 @@ DIST ardour-5.3.tar.bz2 8244811 SHA256 1289002cb81e372b663f9d66e2923c066b64c48f9
 DIST ardour-5.5.tar.bz2 9237459 SHA256 867605614f6840341d37c388f6c5acf803579172b7d7edbebb4c8e36c8bfde1f SHA512 63132681dda7890b8f455a8142935f0bdce28e718b98d1d79a9207ad86b25d31698285d28871bb5043b3b859efd8b1fb8b7b7324fa3abd952a7a9c8e1691e09c WHIRLPOOL 16a7cdc5b5893bbd4e6e86bf3f6d06dc236ad3c7062ba51f313fc472fd46e63f9508f761e9d20ff929e915591fc1d3153098b115909671e4c357003b6c21f733
 DIST ardour-5.6.tar.bz2 8590451 SHA256 d8a55121540e1de8c1a040162316434a2c82d75b8c9e9673ab2143662c848372 SHA512 6d7c72f4bb91e0d9d63dfb2273108e3f61bddac9c21f1f58fe6cb73d5f0a028e735d226c3aa2d1404916b566a103d556a2934b083a4c5d629ec7e28c0abd34f9 WHIRLPOOL a55ac78ad64b56678ca0a6f278a6a4e118d5a0aa8e2d5fa7309583c20f87d5df58408b3deee6cbb0b7a1390fa73ec3a766445d08d94709be02869cbc1aa059da
 DIST ardour-5.8.tar.bz2 8669692 SHA256 0138a7cdc30353a3ceb520fab4d636a9ffca2d4d031839d5aa4cd36dcccba886 SHA512 96b3a81f8c48f66839fb8cddeec5ed0c4a95a6092eab15eacb69007cf093cc6572c308e37c8acbc0194eeecf809980c22c04449fe65d683c298d8d0611e7950e WHIRLPOOL 9e2cdda574d39f8abbc9ef2a127124b132011de84eb9808c4d1ae44a746aa96b550ba49365d545d5614559df1fe0d9f844befec59c82bf9c5da956971a77d5e7
+DIST ardour-5.9.tar.bz2 8830842 SHA256 dffebbee16d3fce71e5f5657e99adb97a88515a6607e45397dd774e77b22f559 SHA512 1ba713f3953456260df9d183b30730c959f2707f8c9dd1280a3ab5eb5d9dbdd0e81db98150346f60f777f6bd02eeaaf9f9bcf43cf2ec0b5addce3b50fcbf7413 WHIRLPOOL 6fb7d0711b6d6bfeaf4c7f52bb3f518377f84a94eec3e27364b00998c83964e418127c7ad5d6726b88ef7ecf360a95e176a4d0feb0054018c83956afdeca2678

diff --git a/media-sound/ardour/ardour-5.9.ebuild b/media-sound/ardour/ardour-5.9.ebuild
new file mode 100644
index 00000000000..8998723b507
--- /dev/null
+++ b/media-sound/ardour/ardour-5.9.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="http://ardour.org/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://gentoo/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
+	S="${WORKDIR}/Ardour-${PV}.0"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="altivec doc jack 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:0
+	x11-libs/cairo
+	>=x11-libs/gtk+-2.8.1:2
+	x11-libs/pango
+	jack? ( virtual/jack )
+	>=media-libs/slv2-0.6.1
+	media-libs/lilv
+	media-libs/sratom
+	dev-libs/sord
+	>=media-libs/suil-0.6.10
+	>=media-libs/lv2-1.4.0"
+
+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
+	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=""
+	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
+}
+
+src_configure() {
+	tc-export CC CXX
+	mkdir -p "${D}"
+	waf-utils_src_configure \
+		--destdir="${D}" \
+		--prefix=/usr \
+		--configdir=/etc \
+		--nls \
+		--optimize \
+		--lv2 \
+		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
+		$(usex doc "--docs" '') \
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+}
+
+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 ardour5 ardour5 ardour5 AudioVideo
+}
+
+pkg_postinst() {
+	elog "If you are using Ardour and want to keep its development alive"
+	elog "then please consider to make a donation upstream at ${HOMEPAGE}."
+	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."
+}


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2017-05-10  9:04 Alexis Ballier
  0 siblings, 0 replies; 118+ messages in thread
From: Alexis Ballier @ 2017-05-10  9:04 UTC (permalink / raw
  To: gentoo-commits

commit:     d73c9419d07ee036e6f146f95988e9263a12a5af
Author:     Karl Linden <karl.j.linden <AT> gmail <DOT> com>
AuthorDate: Tue May  9 08:49:56 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed May 10 09:04:03 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d73c9419

media-sound/ardour: depend on virtual/jack

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 .../ardour/{ardour-2.8.16.ebuild => ardour-2.8.16-r1.ebuild}        | 4 ++--
 media-sound/ardour/{ardour-4.7.ebuild => ardour-4.7-r1.ebuild}      | 6 +++---
 media-sound/ardour/{ardour-5.3.ebuild => ardour-5.3-r1.ebuild}      | 4 ++--
 media-sound/ardour/{ardour-5.6.ebuild => ardour-5.5-r1.ebuild}      | 2 +-
 media-sound/ardour/{ardour-5.8.ebuild => ardour-5.6-r1.ebuild}      | 2 +-
 media-sound/ardour/{ardour-5.5.ebuild => ardour-5.8-r1.ebuild}      | 4 ++--
 media-sound/ardour/ardour-9999.ebuild                               | 4 ++--
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/media-sound/ardour/ardour-2.8.16.ebuild b/media-sound/ardour/ardour-2.8.16-r1.ebuild
similarity index 95%
rename from media-sound/ardour/ardour-2.8.16.ebuild
rename to media-sound/ardour/ardour-2.8.16-r1.ebuild
index 4b29ccb5c96..20db704fb18 100644
--- a/media-sound/ardour/ardour-2.8.16.ebuild
+++ b/media-sound/ardour/ardour-2.8.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -28,7 +28,7 @@ RDEPEND="media-libs/aubio
 	media-libs/flac
 	media-libs/raptor:2
 	>=media-libs/liblrdf-0.4.0-r20
-	>=media-sound/jack-audio-connection-kit-0.120
+	virtual/jack
 	>=gnome-base/libgnomecanvas-2
 	media-libs/vamp-plugin-sdk
 	dev-libs/libxslt

diff --git a/media-sound/ardour/ardour-4.7.ebuild b/media-sound/ardour/ardour-4.7-r1.ebuild
similarity index 95%
rename from media-sound/ardour/ardour-4.7.ebuild
rename to media-sound/ardour/ardour-4.7-r1.ebuild
index 1a610cf8aad..166114e42cd 100644
--- a/media-sound/ardour/ardour-4.7.ebuild
+++ b/media-sound/ardour/ardour-4.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -52,7 +52,7 @@ RDEPEND="
 	x11-libs/cairo
 	>=x11-libs/gtk+-2.8.1:2
 	x11-libs/pango
-	jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
+	jack? ( virtual/jack )
 	lv2? (
 		>=media-libs/slv2-0.6.1
 		media-libs/lilv
@@ -64,7 +64,7 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
+	jack? ( virtual/jack )
 	sys-devel/gettext
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen[dot] )"

diff --git a/media-sound/ardour/ardour-5.3.ebuild b/media-sound/ardour/ardour-5.3-r1.ebuild
similarity index 97%
rename from media-sound/ardour/ardour-5.3.ebuild
rename to media-sound/ardour/ardour-5.3-r1.ebuild
index b95baf71f16..d6f899d2432 100644
--- a/media-sound/ardour/ardour-5.3.ebuild
+++ b/media-sound/ardour/ardour-5.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -66,7 +66,7 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
+	jack? ( virtual/jack )
 	sys-devel/gettext
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen[dot] )"

diff --git a/media-sound/ardour/ardour-5.6.ebuild b/media-sound/ardour/ardour-5.5-r1.ebuild
similarity index 98%
rename from media-sound/ardour/ardour-5.6.ebuild
rename to media-sound/ardour/ardour-5.5-r1.ebuild
index 1468f6b498a..8998723b507 100644
--- a/media-sound/ardour/ardour-5.6.ebuild
+++ b/media-sound/ardour/ardour-5.5-r1.ebuild
@@ -64,7 +64,7 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
+	jack? ( virtual/jack )
 	sys-devel/gettext
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen[dot] )"

diff --git a/media-sound/ardour/ardour-5.8.ebuild b/media-sound/ardour/ardour-5.6-r1.ebuild
similarity index 98%
rename from media-sound/ardour/ardour-5.8.ebuild
rename to media-sound/ardour/ardour-5.6-r1.ebuild
index 1468f6b498a..8998723b507 100644
--- a/media-sound/ardour/ardour-5.8.ebuild
+++ b/media-sound/ardour/ardour-5.6-r1.ebuild
@@ -64,7 +64,7 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
+	jack? ( virtual/jack )
 	sys-devel/gettext
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen[dot] )"

diff --git a/media-sound/ardour/ardour-5.5.ebuild b/media-sound/ardour/ardour-5.8-r1.ebuild
similarity index 97%
rename from media-sound/ardour/ardour-5.5.ebuild
rename to media-sound/ardour/ardour-5.8-r1.ebuild
index eb060b1ad49..8998723b507 100644
--- a/media-sound/ardour/ardour-5.5.ebuild
+++ b/media-sound/ardour/ardour-5.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -64,7 +64,7 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
+	jack? ( virtual/jack )
 	sys-devel/gettext
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen[dot] )"

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 0be72b3540b..67a60199f1b 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -64,7 +64,7 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
+	jack? ( virtual/jack )
 	sys-devel/gettext
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen[dot] )"


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2017-03-08 12:31 Andreas Schuerch
  0 siblings, 0 replies; 118+ messages in thread
From: Andreas Schuerch @ 2017-03-08 12:31 UTC (permalink / raw
  To: gentoo-commits

commit:     2b5752724a3a1c1afe2f9dd6aa95a70df86bbfb0
Author:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  8 12:29:14 2017 +0000
Commit:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
CommitDate: Wed Mar  8 12:29:14 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b575272

media-sound/ardour: bump to 5.8

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-sound/ardour/Manifest          |   1 +
 media-sound/ardour/ardour-5.8.ebuild | 141 +++++++++++++++++++++++++++++++++++
 2 files changed, 142 insertions(+)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 1e480cd0cc2..968dc1e722f 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -3,3 +3,4 @@ DIST ardour-4.7.tar.gz 9863149 SHA256 dfa3d102b3f7bb0702969153d22d9311ac98c587f6
 DIST ardour-5.3.tar.bz2 8244811 SHA256 1289002cb81e372b663f9d66e2923c066b64c48f9bec3a9884f7a59cb007945a SHA512 464c311cd3f3f4a580ad451be7a8143a3f2f7454364426c952e757999aba92af6611d0bc31f4d5e0ca301a3c79e4cd1ec19b01ec9941f34e6fa4cf338149291f WHIRLPOOL b7d999805f2b5dda2dc1fd92cbec76d499b15c0f7517c208e7c6b46b624dcd759b0c25a4ee9ec23d974500873c93a8b76e1f45395a25936d5641e47e3027f038
 DIST ardour-5.5.tar.bz2 9237459 SHA256 867605614f6840341d37c388f6c5acf803579172b7d7edbebb4c8e36c8bfde1f SHA512 63132681dda7890b8f455a8142935f0bdce28e718b98d1d79a9207ad86b25d31698285d28871bb5043b3b859efd8b1fb8b7b7324fa3abd952a7a9c8e1691e09c WHIRLPOOL 16a7cdc5b5893bbd4e6e86bf3f6d06dc236ad3c7062ba51f313fc472fd46e63f9508f761e9d20ff929e915591fc1d3153098b115909671e4c357003b6c21f733
 DIST ardour-5.6.tar.bz2 8590451 SHA256 d8a55121540e1de8c1a040162316434a2c82d75b8c9e9673ab2143662c848372 SHA512 6d7c72f4bb91e0d9d63dfb2273108e3f61bddac9c21f1f58fe6cb73d5f0a028e735d226c3aa2d1404916b566a103d556a2934b083a4c5d629ec7e28c0abd34f9 WHIRLPOOL a55ac78ad64b56678ca0a6f278a6a4e118d5a0aa8e2d5fa7309583c20f87d5df58408b3deee6cbb0b7a1390fa73ec3a766445d08d94709be02869cbc1aa059da
+DIST ardour-5.8.tar.bz2 8669692 SHA256 0138a7cdc30353a3ceb520fab4d636a9ffca2d4d031839d5aa4cd36dcccba886 SHA512 96b3a81f8c48f66839fb8cddeec5ed0c4a95a6092eab15eacb69007cf093cc6572c308e37c8acbc0194eeecf809980c22c04449fe65d683c298d8d0611e7950e WHIRLPOOL 9e2cdda574d39f8abbc9ef2a127124b132011de84eb9808c4d1ae44a746aa96b550ba49365d545d5614559df1fe0d9f844befec59c82bf9c5da956971a77d5e7

diff --git a/media-sound/ardour/ardour-5.8.ebuild b/media-sound/ardour/ardour-5.8.ebuild
new file mode 100644
index 00000000000..1468f6b498a
--- /dev/null
+++ b/media-sound/ardour/ardour-5.8.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="http://ardour.org/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://gentoo/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
+	S="${WORKDIR}/Ardour-${PV}.0"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="altivec doc jack 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:0
+	x11-libs/cairo
+	>=x11-libs/gtk+-2.8.1:2
+	x11-libs/pango
+	jack? ( virtual/jack )
+	>=media-libs/slv2-0.6.1
+	media-libs/lilv
+	media-libs/sratom
+	dev-libs/sord
+	>=media-libs/suil-0.6.10
+	>=media-libs/lv2-1.4.0"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
+	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
+	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=""
+	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
+}
+
+src_configure() {
+	tc-export CC CXX
+	mkdir -p "${D}"
+	waf-utils_src_configure \
+		--destdir="${D}" \
+		--prefix=/usr \
+		--configdir=/etc \
+		--nls \
+		--optimize \
+		--lv2 \
+		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
+		$(usex doc "--docs" '') \
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+}
+
+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 ardour5 ardour5 ardour5 AudioVideo
+}
+
+pkg_postinst() {
+	elog "If you are using Ardour and want to keep its development alive"
+	elog "then please consider to make a donation upstream at ${HOMEPAGE}."
+	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."
+}


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2017-02-25 15:03 Patrice Clement
  0 siblings, 0 replies; 118+ messages in thread
From: Patrice Clement @ 2017-02-25 15:03 UTC (permalink / raw
  To: gentoo-commits

commit:     90851f5f9ae5bf0ccc7f08f64948c42d3aa4e6e5
Author:     David Hicks <david <AT> hicks <DOT> id <DOT> au>
AuthorDate: Thu Feb 16 13:34:42 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Feb 25 15:03:35 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90851f5f

media-sound/ardour-9999: use anonymous git repository.

The old address http://git.ardour.org/ardour/ardour.git now redirects to
a https server which demands a user login to access.
Closes: https://github.com/gentoo/gentoo/pull/3986

 media-sound/ardour/ardour-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 677b158649..c97052ee92 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Digital Audio Workstation"
 HOMEPAGE="http://ardour.org/"
 
 if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
+	EGIT_REPO_URI="git://git.ardour.org/ardour/ardour.git"
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~x86"


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2017-02-13 12:36 Andreas Schuerch
  0 siblings, 0 replies; 118+ messages in thread
From: Andreas Schuerch @ 2017-02-13 12:36 UTC (permalink / raw
  To: gentoo-commits

commit:     c7c8c0cbae5043fce21a78ae7b973272f31b9750
Author:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 12 18:51:03 2017 +0000
Commit:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
CommitDate: Mon Feb 13 12:33:17 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7c8c0cb

media-sound/ardour: bump to 5.6

Package-Manager: portage-2.3.3

 media-sound/ardour/Manifest          |   1 +
 media-sound/ardour/ardour-5.6.ebuild | 142 +++++++++++++++++++++++++++++++++++
 2 files changed, 143 insertions(+)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 34a718724b..1e480cd0cc 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -2,3 +2,4 @@ DIST ardour-2.8.16.tar.bz2 2169916 SHA256 37ee32119ba105fa0883faa7e18c58ecd52768
 DIST ardour-4.7.tar.gz 9863149 SHA256 dfa3d102b3f7bb0702969153d22d9311ac98c587f691760ab0f1d3f4f455a86d SHA512 5daff563ec0b2dc38ec6ca55bb12526ef54da9d8d5a29a9fd6d869f54b83e6fe5ff3c28ef654e6700455110b4a46ce42a33902eb66d96330c6c0948eb3cd3096 WHIRLPOOL eb94b56a919d0088a312414f45475f53ee8c7f618d85f9ffcf5f27719422c2035ff4608108ecbe0f521d54ed1ad40c06ada0a1cb8f7d70531320f40aa107e4b4
 DIST ardour-5.3.tar.bz2 8244811 SHA256 1289002cb81e372b663f9d66e2923c066b64c48f9bec3a9884f7a59cb007945a SHA512 464c311cd3f3f4a580ad451be7a8143a3f2f7454364426c952e757999aba92af6611d0bc31f4d5e0ca301a3c79e4cd1ec19b01ec9941f34e6fa4cf338149291f WHIRLPOOL b7d999805f2b5dda2dc1fd92cbec76d499b15c0f7517c208e7c6b46b624dcd759b0c25a4ee9ec23d974500873c93a8b76e1f45395a25936d5641e47e3027f038
 DIST ardour-5.5.tar.bz2 9237459 SHA256 867605614f6840341d37c388f6c5acf803579172b7d7edbebb4c8e36c8bfde1f SHA512 63132681dda7890b8f455a8142935f0bdce28e718b98d1d79a9207ad86b25d31698285d28871bb5043b3b859efd8b1fb8b7b7324fa3abd952a7a9c8e1691e09c WHIRLPOOL 16a7cdc5b5893bbd4e6e86bf3f6d06dc236ad3c7062ba51f313fc472fd46e63f9508f761e9d20ff929e915591fc1d3153098b115909671e4c357003b6c21f733
+DIST ardour-5.6.tar.bz2 8590451 SHA256 d8a55121540e1de8c1a040162316434a2c82d75b8c9e9673ab2143662c848372 SHA512 6d7c72f4bb91e0d9d63dfb2273108e3f61bddac9c21f1f58fe6cb73d5f0a028e735d226c3aa2d1404916b566a103d556a2934b083a4c5d629ec7e28c0abd34f9 WHIRLPOOL a55ac78ad64b56678ca0a6f278a6a4e118d5a0aa8e2d5fa7309583c20f87d5df58408b3deee6cbb0b7a1390fa73ec3a766445d08d94709be02869cbc1aa059da

diff --git a/media-sound/ardour/ardour-5.6.ebuild b/media-sound/ardour/ardour-5.6.ebuild
new file mode 100644
index 0000000000..233cae78c6
--- /dev/null
+++ b/media-sound/ardour/ardour-5.6.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="http://ardour.org/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://gentoo/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
+	S="${WORKDIR}/Ardour-${PV}.0"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="altivec doc jack 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:0
+	x11-libs/cairo
+	>=x11-libs/gtk+-2.8.1:2
+	x11-libs/pango
+	jack? ( virtual/jack )
+	>=media-libs/slv2-0.6.1
+	media-libs/lilv
+	media-libs/sratom
+	dev-libs/sord
+	>=media-libs/suil-0.6.10
+	>=media-libs/lv2-1.4.0"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
+	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
+	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=""
+	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
+}
+
+src_configure() {
+	tc-export CC CXX
+	mkdir -p "${D}"
+	waf-utils_src_configure \
+		--destdir="${D}" \
+		--prefix=/usr \
+		--configdir=/etc \
+		--nls \
+		--optimize \
+		--lv2 \
+		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
+		$(usex doc "--docs" '') \
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+}
+
+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 ardour5 ardour5 ardour5 AudioVideo
+}
+
+pkg_postinst() {
+	elog "If you are using Ardour and want to keep its development alive"
+	elog "then please consider to make a donation upstream at ${HOMEPAGE}."
+	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."
+}


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2016-12-06  9:48 Lars Wendler
  0 siblings, 0 replies; 118+ messages in thread
From: Lars Wendler @ 2016-12-06  9:48 UTC (permalink / raw
  To: gentoo-commits

commit:     6f0b32f684f34384647f243c093007498edca507
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  6 09:48:11 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Dec  6 09:48:26 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f0b32f6

media-sound/ardour: Fixed SRC_URI and replaced epatch with eapply.

Package-Manager: portage-2.3.3

 media-sound/ardour/ardour-5.5.ebuild  | 4 ++--
 media-sound/ardour/ardour-9999.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-sound/ardour/ardour-5.5.ebuild b/media-sound/ardour/ardour-5.5.ebuild
index 66fea7c..677b158 100644
--- a/media-sound/ardour/ardour-5.5.ebuild
+++ b/media-sound/ardour/ardour-5.5.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror:gentoo/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
+	SRC_URI="mirror://gentoo/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi
 
@@ -80,7 +80,7 @@ pkg_setup() {
 src_prepare(){
 	eapply_user
 	if ! [[ ${PV} == *9999* ]]; then
-		epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
+		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

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 66fea7c..677b158 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror:gentoo/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
+	SRC_URI="mirror://gentoo/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi
 
@@ -80,7 +80,7 @@ pkg_setup() {
 src_prepare(){
 	eapply_user
 	if ! [[ ${PV} == *9999* ]]; then
-		epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
+		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


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2016-12-05 10:05 Andreas Schuerch
  0 siblings, 0 replies; 118+ messages in thread
From: Andreas Schuerch @ 2016-12-05 10:05 UTC (permalink / raw
  To: gentoo-commits

commit:     51b9275bd7d5affbd79848efe2a3dafb6707cae3
Author:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  5 10:03:34 2016 +0000
Commit:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
CommitDate: Mon Dec  5 10:04:53 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51b9275b

media-sound/ardour: bump to 5.5, eapi upgrade, lvm2 now mandatory

Package-Manager: portage-2.3.0

 media-sound/ardour/Manifest                        |  1 +
 .../{ardour-9999.ebuild => ardour-5.5.ebuild}      | 24 ++++++++++------------
 media-sound/ardour/ardour-9999.ebuild              | 24 ++++++++++------------
 3 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index b633aa9..bc5cfa2 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -8,3 +8,4 @@ DIST ardour-4.6.tar.gz 10033725 SHA256 79a3b063f2413d79c4bb2930505e0f66288482580
 DIST ardour-4.7.tar.gz 9863149 SHA256 dfa3d102b3f7bb0702969153d22d9311ac98c587f691760ab0f1d3f4f455a86d SHA512 5daff563ec0b2dc38ec6ca55bb12526ef54da9d8d5a29a9fd6d869f54b83e6fe5ff3c28ef654e6700455110b4a46ce42a33902eb66d96330c6c0948eb3cd3096 WHIRLPOOL eb94b56a919d0088a312414f45475f53ee8c7f618d85f9ffcf5f27719422c2035ff4608108ecbe0f521d54ed1ad40c06ada0a1cb8f7d70531320f40aa107e4b4
 DIST ardour-5.0.tar.bz2 8825191 SHA256 7278193d7583c6c4c08a0f64b3a61d9d276933483573f96fdb857750ceef4f48 SHA512 3913e14e16906136422d573fc3d11d6159248e3dede8614acf6bb2e33950e3e5ff2e6597b394e3ce270b79e0bf926ae4b72d5daa2f01cd04da8e42d13bef7ba8 WHIRLPOOL a354e8095a78bfccb3d7b9d55b5915165f8b21b7102bf0f129f43a9ba301be9b1a40598eff7421f0422892be2d24e479cf6eb555dfb563f8a860bf61f0afa533
 DIST ardour-5.3.tar.bz2 8244811 SHA256 1289002cb81e372b663f9d66e2923c066b64c48f9bec3a9884f7a59cb007945a SHA512 464c311cd3f3f4a580ad451be7a8143a3f2f7454364426c952e757999aba92af6611d0bc31f4d5e0ca301a3c79e4cd1ec19b01ec9941f34e6fa4cf338149291f WHIRLPOOL b7d999805f2b5dda2dc1fd92cbec76d499b15c0f7517c208e7c6b46b624dcd759b0c25a4ee9ec23d974500873c93a8b76e1f45395a25936d5641e47e3027f038
+DIST ardour-5.5.tar.bz2 9237459 SHA256 867605614f6840341d37c388f6c5acf803579172b7d7edbebb4c8e36c8bfde1f SHA512 63132681dda7890b8f455a8142935f0bdce28e718b98d1d79a9207ad86b25d31698285d28871bb5043b3b859efd8b1fb8b7b7324fa3abd952a7a9c8e1691e09c WHIRLPOOL 16a7cdc5b5893bbd4e6e86bf3f6d06dc236ad3c7062ba51f313fc472fd46e63f9508f761e9d20ff929e915591fc1d3153098b115909671e4c357003b6c21f733

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-5.5.ebuild
similarity index 90%
copy from media-sound/ardour/ardour-9999.ebuild
copy to media-sound/ardour/ardour-5.5.ebuild
index 233e102..66fea7c 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-5.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE='threads(+)'
 #EPYTHON='python2.7'
@@ -16,13 +16,13 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="http://fossies.org/linux/misc/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
+	SRC_URI="mirror:gentoo/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi
 
 LICENSE="GPL-2"
 SLOT="5"
-IUSE="altivec doc jack lv2 cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+IUSE="altivec doc jack cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
 
 RDEPEND="
 	>=dev-cpp/glibmm-2.32.0
@@ -56,14 +56,12 @@ RDEPEND="
 	>=x11-libs/gtk+-2.8.1:2
 	x11-libs/pango
 	jack? ( virtual/jack )
-	lv2? (
-		>=media-libs/slv2-0.6.1
-		media-libs/lilv
-		media-libs/sratom
-		dev-libs/sord
-		>=media-libs/suil-0.6.10
-		>=media-libs/lv2-1.4.0
-	)"
+	>=media-libs/slv2-0.6.1
+	media-libs/lilv
+	media-libs/sratom
+	dev-libs/sord
+	>=media-libs/suil-0.6.10
+	>=media-libs/lv2-1.4.0"
 
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
@@ -80,11 +78,11 @@ pkg_setup() {
 }
 
 src_prepare(){
+	eapply_user
 	if ! [[ ${PV} == *9999* ]]; then
 		epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
 		touch "${S}/libs/ardour/revision.cc"
 	fi
-	use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
 	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
 	MARCH=$(get-flag march)
 	OPTFLAGS=""
@@ -121,8 +119,8 @@ src_configure() {
 		--configdir=/etc \
 		--nls \
 		--optimize \
+		--lv2 \
 		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
-		$(usex lv2 "--lv2" "--no-lv2") \
 		$(usex doc "--docs" '') \
 		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
 }

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 233e102..66fea7c 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE='threads(+)'
 #EPYTHON='python2.7'
@@ -16,13 +16,13 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="http://fossies.org/linux/misc/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
+	SRC_URI="mirror:gentoo/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi
 
 LICENSE="GPL-2"
 SLOT="5"
-IUSE="altivec doc jack lv2 cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+IUSE="altivec doc jack cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
 
 RDEPEND="
 	>=dev-cpp/glibmm-2.32.0
@@ -56,14 +56,12 @@ RDEPEND="
 	>=x11-libs/gtk+-2.8.1:2
 	x11-libs/pango
 	jack? ( virtual/jack )
-	lv2? (
-		>=media-libs/slv2-0.6.1
-		media-libs/lilv
-		media-libs/sratom
-		dev-libs/sord
-		>=media-libs/suil-0.6.10
-		>=media-libs/lv2-1.4.0
-	)"
+	>=media-libs/slv2-0.6.1
+	media-libs/lilv
+	media-libs/sratom
+	dev-libs/sord
+	>=media-libs/suil-0.6.10
+	>=media-libs/lv2-1.4.0"
 
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
@@ -80,11 +78,11 @@ pkg_setup() {
 }
 
 src_prepare(){
+	eapply_user
 	if ! [[ ${PV} == *9999* ]]; then
 		epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
 		touch "${S}/libs/ardour/revision.cc"
 	fi
-	use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
 	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
 	MARCH=$(get-flag march)
 	OPTFLAGS=""
@@ -121,8 +119,8 @@ src_configure() {
 		--configdir=/etc \
 		--nls \
 		--optimize \
+		--lv2 \
 		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
-		$(usex lv2 "--lv2" "--no-lv2") \
 		$(usex doc "--docs" '') \
 		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
 }


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2016-09-19 13:17 Lars Wendler
  0 siblings, 0 replies; 118+ messages in thread
From: Lars Wendler @ 2016-09-19 13:17 UTC (permalink / raw
  To: gentoo-commits

commit:     56859e1cf840fe26676df1a733a116d685d759b0
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 19 13:11:53 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Sep 19 13:11:53 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56859e1c

media-sound/ardour: Added sys-libs/readline to RDEPEND.

Package-Manager: portage-2.3.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-sound/ardour/ardour-5.3.ebuild  | 1 +
 media-sound/ardour/ardour-9999.ebuild | 1 +
 2 files changed, 2 insertions(+)

diff --git a/media-sound/ardour/ardour-5.3.ebuild b/media-sound/ardour/ardour-5.3.ebuild
index e5a98c6..233e102 100644
--- a/media-sound/ardour/ardour-5.3.ebuild
+++ b/media-sound/ardour/ardour-5.3.ebuild
@@ -49,6 +49,7 @@ RDEPEND="
 	>=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:0
 	x11-libs/cairo

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index e5a98c6..233e102 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -49,6 +49,7 @@ RDEPEND="
 	>=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:0
 	x11-libs/cairo


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2016-09-16 12:06 Andreas Schuerch
  0 siblings, 0 replies; 118+ messages in thread
From: Andreas Schuerch @ 2016-09-16 12:06 UTC (permalink / raw
  To: gentoo-commits

commit:     2b2b55a36dd0975cd878fda5b0ae47209e929da2
Author:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 12:04:41 2016 +0000
Commit:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 12:04:41 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b2b55a3

media-sound/ardour: version bump, see bug 593908

Package-Manager: portage-2.2.28

 media-sound/ardour/Manifest          |   1 +
 media-sound/ardour/ardour-5.3.ebuild | 143 +++++++++++++++++++++++++++++++++++
 2 files changed, 144 insertions(+)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 637ed08..b633aa9 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -7,3 +7,4 @@ DIST ardour-4.4.tar.gz 9511090 SHA256 d567e99c4476c0122006c85d09a8e4eab93db28be7
 DIST ardour-4.6.tar.gz 10033725 SHA256 79a3b063f2413d79c4bb2930505e0f6628848258051869095588a50940f49f6b SHA512 8fdda5f6efde18a66d89605f0a4d14756ce573ffc5de54e7229c7aa76ab11cbba33bdb775fb5c5dde86f4d308c2a96b904a0298d7b9c598300ab35e835f2ea0a WHIRLPOOL 0f4e054cdb2a1022f860354d70e4517bebee66e0711f16b4e3b19ebc8f354e364fd1a91e64aa3f7c692f3251ee261cdc2fda29215cef58c9a8cebcc20708af72
 DIST ardour-4.7.tar.gz 9863149 SHA256 dfa3d102b3f7bb0702969153d22d9311ac98c587f691760ab0f1d3f4f455a86d SHA512 5daff563ec0b2dc38ec6ca55bb12526ef54da9d8d5a29a9fd6d869f54b83e6fe5ff3c28ef654e6700455110b4a46ce42a33902eb66d96330c6c0948eb3cd3096 WHIRLPOOL eb94b56a919d0088a312414f45475f53ee8c7f618d85f9ffcf5f27719422c2035ff4608108ecbe0f521d54ed1ad40c06ada0a1cb8f7d70531320f40aa107e4b4
 DIST ardour-5.0.tar.bz2 8825191 SHA256 7278193d7583c6c4c08a0f64b3a61d9d276933483573f96fdb857750ceef4f48 SHA512 3913e14e16906136422d573fc3d11d6159248e3dede8614acf6bb2e33950e3e5ff2e6597b394e3ce270b79e0bf926ae4b72d5daa2f01cd04da8e42d13bef7ba8 WHIRLPOOL a354e8095a78bfccb3d7b9d55b5915165f8b21b7102bf0f129f43a9ba301be9b1a40598eff7421f0422892be2d24e479cf6eb555dfb563f8a860bf61f0afa533
+DIST ardour-5.3.tar.bz2 8244811 SHA256 1289002cb81e372b663f9d66e2923c066b64c48f9bec3a9884f7a59cb007945a SHA512 464c311cd3f3f4a580ad451be7a8143a3f2f7454364426c952e757999aba92af6611d0bc31f4d5e0ca301a3c79e4cd1ec19b01ec9941f34e6fa4cf338149291f WHIRLPOOL b7d999805f2b5dda2dc1fd92cbec76d499b15c0f7517c208e7c6b46b624dcd759b0c25a4ee9ec23d974500873c93a8b76e1f45395a25936d5641e47e3027f038

diff --git a/media-sound/ardour/ardour-5.3.ebuild b/media-sound/ardour/ardour-5.3.ebuild
new file mode 100644
index 00000000..e5a98c6
--- /dev/null
+++ b/media-sound/ardour/ardour-5.3.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+#EPYTHON='python2.7'
+inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="http://ardour.org/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="http://fossies.org/linux/misc/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
+	S="${WORKDIR}/Ardour-${PV}.0"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="altivec doc jack lv2 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
+	sci-libs/fftw:3.0[threads]
+	virtual/libusb:0
+	x11-libs/cairo
+	>=x11-libs/gtk+-2.8.1:2
+	x11-libs/pango
+	jack? ( virtual/jack )
+	lv2? (
+		>=media-libs/slv2-0.6.1
+		media-libs/lilv
+		media-libs/sratom
+		dev-libs/sord
+		>=media-libs/suil-0.6.10
+		>=media-libs/lv2-1.4.0
+	)"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
+	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(){
+	if ! [[ ${PV} == *9999* ]]; then
+		epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
+		touch "${S}/libs/ardour/revision.cc"
+	fi
+	use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
+	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
+}
+
+src_configure() {
+	tc-export CC CXX
+	mkdir -p "${D}"
+	waf-utils_src_configure \
+		--destdir="${D}" \
+		--prefix=/usr \
+		--configdir=/etc \
+		--nls \
+		--optimize \
+		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
+		$(usex lv2 "--lv2" "--no-lv2") \
+		$(usex doc "--docs" '') \
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+}
+
+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 ardour5 ardour5 ardour5 AudioVideo
+}
+
+pkg_postinst() {
+	elog "If you are using Ardour and want to keep its development alive"
+	elog "then please consider to make a donation upstream at ${HOMEPAGE}."
+	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."
+}


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2016-08-24  7:40 Andreas Schuerch
  0 siblings, 0 replies; 118+ messages in thread
From: Andreas Schuerch @ 2016-08-24  7:40 UTC (permalink / raw
  To: gentoo-commits

commit:     31d8a5bf4332b8c0861efa3b74287fa902a8a950
Author:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 24 07:40:13 2016 +0000
Commit:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
CommitDate: Wed Aug 24 07:40:13 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31d8a5bf

media-sound/ardour: new sources location and elog comment

Package-Manager: portage-2.2.28

 media-sound/ardour/ardour-5.0.ebuild  | 7 +++++--
 media-sound/ardour/ardour-9999.ebuild | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/media-sound/ardour/ardour-5.0.ebuild b/media-sound/ardour/ardour-5.0.ebuild
index a2320cb..e5a98c6 100644
--- a/media-sound/ardour/ardour-5.0.ebuild
+++ b/media-sound/ardour/ardour-5.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="http://community.ardour.org/srctar -> ${P}.tar.bz2"
+	SRC_URI="http://fossies.org/linux/misc/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi
 
@@ -136,5 +136,8 @@ src_install() {
 
 pkg_postinst() {
 	elog "If you are using Ardour and want to keep its development alive"
-	elog "then please consider to make a donation upstream at ${HOMEPAGE}"
+	elog "then please consider to make a donation upstream at ${HOMEPAGE}."
+	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 a2320cb..e5a98c6 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="http://community.ardour.org/srctar -> ${P}.tar.bz2"
+	SRC_URI="http://fossies.org/linux/misc/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi
 
@@ -136,5 +136,8 @@ src_install() {
 
 pkg_postinst() {
 	elog "If you are using Ardour and want to keep its development alive"
-	elog "then please consider to make a donation upstream at ${HOMEPAGE}"
+	elog "then please consider to make a donation upstream at ${HOMEPAGE}."
+	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."
 }


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2016-08-16 16:00 Andreas Schuerch
  0 siblings, 0 replies; 118+ messages in thread
From: Andreas Schuerch @ 2016-08-16 16:00 UTC (permalink / raw
  To: gentoo-commits

commit:     a1cc6a6f340a8a1ad10e80ca3b853d0c680d36b2
Author:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 16 15:51:13 2016 +0000
Commit:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
CommitDate: Tue Aug 16 15:51:13 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1cc6a6f

media-sound/ardour: Version bump, old cleanup, deps see bugs 591230 591370 575532

Package-Manager: portage-2.2.28

 media-sound/ardour/Manifest                        |   5 +-
 media-sound/ardour/ardour-3.5.308-r1.ebuild        | 121 ------------------
 media-sound/ardour/ardour-3.5.357.ebuild           | 121 ------------------
 media-sound/ardour/ardour-3.5.380.ebuild           | 123 ------------------
 media-sound/ardour/ardour-3.5.403.ebuild           | 137 ---------------------
 .../{ardour-9999.ebuild => ardour-5.0.ebuild}      |  11 +-
 media-sound/ardour/ardour-9999.ebuild              |  11 +-
 7 files changed, 13 insertions(+), 516 deletions(-)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index a31aa3d..637ed08 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,12 +1,9 @@
 DIST ardour-2.8.14.tar.bz2 2169985 SHA256 e07e483a12354c00d821dafbec5f5d2690062b758205daceab723bf1e9a633fe SHA512 0d861cfe99645ff5f7847b5e3296a1dfb6d8f15e8686ac79819b114843988b669b117bcfce89a77435d7af252b50bbfa790eb206f69dfff39f7c97126cf26540 WHIRLPOOL 75382e17152d7eea18820f7e72fff2f29553edfd4e15609f73842411edf5605d1ca2a2a8497e08747f5c210393822dc32a1b90e72cdff9774ab4c2a060de6073
 DIST ardour-2.8.16.tar.bz2 2169916 SHA256 37ee32119ba105fa0883faa7e18c58ecd5276894568da224a554d9ef49075e40 SHA512 02e74883cf466fcd5588ec8f2fd9d032b4611071d630b412c853a7ae7cb46045c0cde4308abbc78da3f54aae0ab1c32a980b8d1e1a965c8633ef43d8e08e0d0d WHIRLPOOL 357b45e506da05b1ce17f006c3e2b22b17150b5556e06785b961b308d958fb66fa82b3e01d1d5e596e43caf6b9d1c83287696a6c694e54114fed5825e2fc5a51
-DIST ardour-3.5.308.tar.gz 8578598 SHA256 8fe7d396d182c1cecc377d70e788f4bcaeca6276dc7474a6589e6469acd77d8b SHA512 64b1719c8262840bf8f02d5843640efecd1a7cb1e0a706b778db9d8f849d7cb611bc34bec3fee8291f3b01491b913e5d5239c772ba40ce883ee00d6bfeb48b41 WHIRLPOOL a5422a5f8e6addcd0bd03a11d18a057e06d82c8b7039128f25de7f6d9c906c2fd05a7c46e54403e1f18c0b7b06c1722638c66a7a0f1d55f7e04d6b0dabfd2baf
-DIST ardour-3.5.357.tar.gz 8579943 SHA256 1c13a3200bfa0fb8c0adddd3439102e0caa7f219a0f2518a4ba0d233924ef0b7 SHA512 8ee6d3b3f8e05547b3e9487e56344c2795fbc4781f6ac03a0c1684c534940570e3138023df4e57ce904c99e152ff212ddf67d83c1c95ac8542cc55a6e379c90d WHIRLPOOL a32508b6b54909111bf9a074df72d312f164a18840c28e96d1c38e368a13f8ea8f9dc6d9fb4fc600af97e06ce79fdd21a58f1701125a02c5a26ea919d823d2ae
-DIST ardour-3.5.380.tar.gz 8580892 SHA256 476829114565b56f6dd9f05d1e93752d36db6db453f0f69c09ed43f6b3ed88e1 SHA512 286290186e400cdc9fe350dce3e785de8193adac7a7de951b78ee91d0ab8a29ee4dfb113f2e996a821e6e26079749a7a2f09583451b364f5497027c0b52d7f0d WHIRLPOOL 2a59c5618690d8570a782ea7b2ad2882de7affc7b98a1d0d834bdb2b2a36031570b7e9e68e83f2b8fd19e224fef2393601b47a633659f8fca5fbb11102b957f9
-DIST ardour-3.5.403.tar.gz 8583763 SHA256 46490623479d9a25e2ab98b817c1f5c42b1d042f62afba1d1828d869a0c2d395 SHA512 e00053faf6c4f62dc80c85d82bbdb4b65de2111c9c9efc9d9e03b73be353a7cd652c02a2989566fd30491b1a07d02a7ff15e4523966163cf2e5e4c708a12aac0 WHIRLPOOL 726b66d236a9488a58fe333cbe720bdbd6beaf993d0e738ff8757cf7f657be164d5d0e390da09c773ab3b590c3bcf73be03a358164d54bd19fa7b025ff13118b
 DIST ardour-4.0.tar.gz 9189038 SHA256 ea1131a24774d5f8dcab4ac7ea3b36bd427b1e4d0bef6f3db0681bc4ca131cf1 SHA512 2317c5818fe89386319f12062f0af0d08b07f569d6f775b7ecfa4f3a4bb1f565e05f3ff32f05f591c5628bdd402eda5bce4be4f8fa89da6c2092d5edb2c9ae7a WHIRLPOOL 854145ed135f6b23222ab2d6022e31b09221cac0d326fa17c5ee88e4e8ebd033e69c447fcbac35a925ff23974cc8b2b13c076014118977bbc88836124a912ad4
 DIST ardour-4.1.tar.gz 9247567 SHA256 1d5eac009f3c84aee11c4e7d1c548747cb5a43eddac92b4e640342b79cc808b9 SHA512 5e13301ca5d8140498256d43729d770c6222b220d2c817651304746a7cc20fe8450b094d978bc9559b9ec7b5a7a95ca1c5131be5b51c78835e75b3b7bbb1be82 WHIRLPOOL 3699ea7f29c9df30ddfa3ad9a1e05f6a3cbccddaf5ae1804679b6c1a50e8b800e14f06760e8d9d44a4ac2631f32db595048640c01b9c967f060bfaee11f28a73
 DIST ardour-4.2.tar.gz 9484009 SHA256 c8af454e974be3222bceb374d5b3d126af6c9766326f7e276acb8ef2fa21cfa4 SHA512 cb1d8144216ff959dac1b371c5ec2b99e0fc2137c105fda5c38460c7f148d7f575761453b24ea5ab7c58139a6839b92ee863c6a5485ab4a009da7c362471a2b3 WHIRLPOOL f9d7df4687c4d1a402c43ba43acee9f3b1423f8dcc691ef69590554f49530be5df0ef57f0f20b67ba0efb50690cdc744015f1917bb2051857d496c5cf000f948
 DIST ardour-4.4.tar.gz 9511090 SHA256 d567e99c4476c0122006c85d09a8e4eab93db28be7be99d338ea66be8581bfcf SHA512 8df3e4552b0ccdd76c5ccf06224594325bb8c02f897bb79bd983531a2f4f56c60185b6080e2f8eddb6a274b9d48dc93a47ddc5471e05b253d492c09be816dde0 WHIRLPOOL 86e298b7defa5249c0632368bae64ddde2175e5f5ece66b4932485a4216ae0613b81e2f736f54e7f00a600be5e238fe41559fe2290f3aebbb36b208184aefc25
 DIST ardour-4.6.tar.gz 10033725 SHA256 79a3b063f2413d79c4bb2930505e0f6628848258051869095588a50940f49f6b SHA512 8fdda5f6efde18a66d89605f0a4d14756ce573ffc5de54e7229c7aa76ab11cbba33bdb775fb5c5dde86f4d308c2a96b904a0298d7b9c598300ab35e835f2ea0a WHIRLPOOL 0f4e054cdb2a1022f860354d70e4517bebee66e0711f16b4e3b19ebc8f354e364fd1a91e64aa3f7c692f3251ee261cdc2fda29215cef58c9a8cebcc20708af72
 DIST ardour-4.7.tar.gz 9863149 SHA256 dfa3d102b3f7bb0702969153d22d9311ac98c587f691760ab0f1d3f4f455a86d SHA512 5daff563ec0b2dc38ec6ca55bb12526ef54da9d8d5a29a9fd6d869f54b83e6fe5ff3c28ef654e6700455110b4a46ce42a33902eb66d96330c6c0948eb3cd3096 WHIRLPOOL eb94b56a919d0088a312414f45475f53ee8c7f618d85f9ffcf5f27719422c2035ff4608108ecbe0f521d54ed1ad40c06ada0a1cb8f7d70531320f40aa107e4b4
+DIST ardour-5.0.tar.bz2 8825191 SHA256 7278193d7583c6c4c08a0f64b3a61d9d276933483573f96fdb857750ceef4f48 SHA512 3913e14e16906136422d573fc3d11d6159248e3dede8614acf6bb2e33950e3e5ff2e6597b394e3ce270b79e0bf926ae4b72d5daa2f01cd04da8e42d13bef7ba8 WHIRLPOOL a354e8095a78bfccb3d7b9d55b5915165f8b21b7102bf0f129f43a9ba301be9b1a40598eff7421f0422892be2d24e479cf6eb555dfb563f8a860bf61f0afa533

diff --git a/media-sound/ardour/ardour-3.5.308-r1.ebuild b/media-sound/ardour/ardour-3.5.308-r1.ebuild
deleted file mode 100644
index 9114305..0000000
--- a/media-sound/ardour/ardour-3.5.308-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-
-inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-
-if [ ${PV} = 9999 ]; then
-	KEYWORDS=""
-	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
-	inherit git-2
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-2"
-SLOT="3"
-IUSE="altivec debug doc nls lv2 cpu_flags_x86_sse"
-
-RDEPEND="media-libs/aubio
-	media-libs/liblo
-	sci-libs/fftw:3.0
-	media-libs/freetype:2
-	>=dev-libs/glib-2.10.1:2
-	dev-cpp/glibmm:2
-	>=x11-libs/gtk+-2.8.1:2
-	>=dev-libs/libxml2-2.6:2
-	>=media-libs/libsndfile-1.0.18
-	>=media-libs/libsamplerate-0.1
-	>=media-libs/rubberband-1.6.0
-	>=media-libs/libsoundtouch-1.6.0
-	media-libs/flac
-	media-libs/raptor:2
-	>=media-libs/liblrdf-0.4.0-r20
-	>=media-sound/jack-audio-connection-kit-0.120
-	>=gnome-base/libgnomecanvas-2
-	media-libs/vamp-plugin-sdk
-	dev-libs/libxslt
-	dev-libs/libsigc++:2
-	>=dev-cpp/gtkmm-2.16:2.4
-	>=dev-cpp/libgnomecanvasmm-2.26:2.6
-	media-libs/alsa-lib
-	x11-libs/pango
-	x11-libs/cairo
-	media-libs/libart_lgpl
-	virtual/libusb:0
-	dev-libs/boost
-	>=media-libs/taglib-1.7
-	net-misc/curl
-	lv2? (
-		>=media-libs/slv2-0.6.1
-		media-libs/lilv
-		media-libs/sratom
-		dev-libs/sord
-		>=media-libs/suil-0.6.10
-		>=media-libs/lv2-1.4.0
-	)"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen[dot] )"
-	if ! [ ${PV} = 9999 ]; then
-		DEPEND="${DEPEND}"
-	fi
-
-src_unpack() {
-	if [ ${PV} = 9999 ]; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare(){
-	if ! [ ${PV} = 9999 ]; then
-		PVTEMP=`echo "${PV}" | sed "s/\./-/2"`
-		sed -e '/cmd = "git describe HEAD/,/utf-8/{s:cmd = \"git describe HEAD\":rev = \"'${PVTEMP}-gentoo'\":p;d}' -i "${S}"/wscript
-		sed -e 's/'os.getcwd\(\),\ \'.git'/'os.getcwd\(\),\ \'libs/'' -i "${S}"/wscript
-		sed -e 's/'os.path.exists\(\'.git'/'os.path.exists\(\'wscript/'' -i "${S}"/wscript
-
-	fi
-	epatch "${FILESDIR}"/${PN}-3.5.7-syslibs.patch
-	sed 's/'FLAGS\'\,\ optimization_flags'/'FLAGS\'\,\ \'\''/g' -i "${S}"/wscript
-}
-
-src_configure() {
-	tc-export CC CXX
-	mkdir -p "${D}"
-	waf-utils_src_configure \
-		--destdir="${D}" \
-		--prefix=/usr \
-		--configdir=/etc \
-		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
-		$(use nls && echo "--nls" || echo "--no-nls") \
-		$(use debug && echo "--stl-debug" || echo "--optimize") \
-		$((use altivec || use cpu_flags_x86_sse) && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
-		$(use doc && echo "--docs")
-}
-
-src_install() {
-	waf-utils_src_install
-	mv ${PN}.1 ${PN}${SLOT}.1
-	doman ${PN}${SLOT}.1
-	newicon icons/icon/ardour_icon_mac.png ${PN}${SLOT}.png
-	make_desktop_entry ardour3 ardour3 ardour3 AudioVideo
-}
-
-pkg_postinst() {
-	elog "If you are using Ardour and want to keep its development alive"
-	elog "then please consider to do a donation upstream at ardour.org. Thanks!"
-}

diff --git a/media-sound/ardour/ardour-3.5.357.ebuild b/media-sound/ardour/ardour-3.5.357.ebuild
deleted file mode 100644
index 9114305..0000000
--- a/media-sound/ardour/ardour-3.5.357.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-
-inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-
-if [ ${PV} = 9999 ]; then
-	KEYWORDS=""
-	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
-	inherit git-2
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-2"
-SLOT="3"
-IUSE="altivec debug doc nls lv2 cpu_flags_x86_sse"
-
-RDEPEND="media-libs/aubio
-	media-libs/liblo
-	sci-libs/fftw:3.0
-	media-libs/freetype:2
-	>=dev-libs/glib-2.10.1:2
-	dev-cpp/glibmm:2
-	>=x11-libs/gtk+-2.8.1:2
-	>=dev-libs/libxml2-2.6:2
-	>=media-libs/libsndfile-1.0.18
-	>=media-libs/libsamplerate-0.1
-	>=media-libs/rubberband-1.6.0
-	>=media-libs/libsoundtouch-1.6.0
-	media-libs/flac
-	media-libs/raptor:2
-	>=media-libs/liblrdf-0.4.0-r20
-	>=media-sound/jack-audio-connection-kit-0.120
-	>=gnome-base/libgnomecanvas-2
-	media-libs/vamp-plugin-sdk
-	dev-libs/libxslt
-	dev-libs/libsigc++:2
-	>=dev-cpp/gtkmm-2.16:2.4
-	>=dev-cpp/libgnomecanvasmm-2.26:2.6
-	media-libs/alsa-lib
-	x11-libs/pango
-	x11-libs/cairo
-	media-libs/libart_lgpl
-	virtual/libusb:0
-	dev-libs/boost
-	>=media-libs/taglib-1.7
-	net-misc/curl
-	lv2? (
-		>=media-libs/slv2-0.6.1
-		media-libs/lilv
-		media-libs/sratom
-		dev-libs/sord
-		>=media-libs/suil-0.6.10
-		>=media-libs/lv2-1.4.0
-	)"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen[dot] )"
-	if ! [ ${PV} = 9999 ]; then
-		DEPEND="${DEPEND}"
-	fi
-
-src_unpack() {
-	if [ ${PV} = 9999 ]; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare(){
-	if ! [ ${PV} = 9999 ]; then
-		PVTEMP=`echo "${PV}" | sed "s/\./-/2"`
-		sed -e '/cmd = "git describe HEAD/,/utf-8/{s:cmd = \"git describe HEAD\":rev = \"'${PVTEMP}-gentoo'\":p;d}' -i "${S}"/wscript
-		sed -e 's/'os.getcwd\(\),\ \'.git'/'os.getcwd\(\),\ \'libs/'' -i "${S}"/wscript
-		sed -e 's/'os.path.exists\(\'.git'/'os.path.exists\(\'wscript/'' -i "${S}"/wscript
-
-	fi
-	epatch "${FILESDIR}"/${PN}-3.5.7-syslibs.patch
-	sed 's/'FLAGS\'\,\ optimization_flags'/'FLAGS\'\,\ \'\''/g' -i "${S}"/wscript
-}
-
-src_configure() {
-	tc-export CC CXX
-	mkdir -p "${D}"
-	waf-utils_src_configure \
-		--destdir="${D}" \
-		--prefix=/usr \
-		--configdir=/etc \
-		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
-		$(use nls && echo "--nls" || echo "--no-nls") \
-		$(use debug && echo "--stl-debug" || echo "--optimize") \
-		$((use altivec || use cpu_flags_x86_sse) && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
-		$(use doc && echo "--docs")
-}
-
-src_install() {
-	waf-utils_src_install
-	mv ${PN}.1 ${PN}${SLOT}.1
-	doman ${PN}${SLOT}.1
-	newicon icons/icon/ardour_icon_mac.png ${PN}${SLOT}.png
-	make_desktop_entry ardour3 ardour3 ardour3 AudioVideo
-}
-
-pkg_postinst() {
-	elog "If you are using Ardour and want to keep its development alive"
-	elog "then please consider to do a donation upstream at ardour.org. Thanks!"
-}

diff --git a/media-sound/ardour/ardour-3.5.380.ebuild b/media-sound/ardour/ardour-3.5.380.ebuild
deleted file mode 100644
index ae3d03f..0000000
--- a/media-sound/ardour/ardour-3.5.380.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-
-inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-
-if [ ${PV} = 9999 ]; then
-	KEYWORDS=""
-	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
-	inherit git-2
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-2"
-SLOT="3"
-IUSE="altivec debug doc nls lv2 cpu_flags_x86_sse"
-
-RDEPEND="media-libs/aubio
-	media-libs/liblo
-	sci-libs/fftw:3.0
-	media-libs/freetype:2
-	>=dev-libs/glib-2.10.1:2
-	>=dev-cpp/glibmm-2.32.0
-	>=x11-libs/gtk+-2.8.1:2
-	>=dev-libs/libxml2-2.6:2
-	>=media-libs/libsndfile-1.0.18
-	>=media-libs/libsamplerate-0.1
-	>=media-libs/rubberband-1.6.0
-	>=media-libs/libsoundtouch-1.6.0
-	media-libs/flac
-	media-libs/raptor:2
-	>=media-libs/liblrdf-0.4.0-r20
-	>=media-sound/jack-audio-connection-kit-0.120
-	>=gnome-base/libgnomecanvas-2
-	media-libs/vamp-plugin-sdk
-	dev-libs/libxslt
-	dev-libs/libsigc++:2
-	>=dev-cpp/gtkmm-2.16:2.4
-	>=dev-cpp/libgnomecanvasmm-2.26:2.6
-	media-libs/alsa-lib
-	x11-libs/pango
-	x11-libs/cairo
-	media-libs/libart_lgpl
-	virtual/libusb:0
-	dev-libs/boost
-	>=media-libs/taglib-1.7
-	net-misc/curl
-	lv2? (
-		>=media-libs/slv2-0.6.1
-		media-libs/lilv
-		media-libs/sratom
-		dev-libs/sord
-		>=media-libs/suil-0.6.10
-		>=media-libs/lv2-1.4.0
-	)"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen[dot] )"
-	if ! [ ${PV} = 9999 ]; then
-		DEPEND="${DEPEND}"
-	fi
-
-src_unpack() {
-	if [ ${PV} = 9999 ]; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare(){
-	if ! [ ${PV} = 9999 ]; then
-		PVTEMP=`echo "${PV}" | sed "s/\./-/2"`
-		sed -e '/cmd = "git describe HEAD/,/utf-8/{s:cmd = \"git describe HEAD\":rev = \"'${PVTEMP}-gentoo'\":p;d}' -i "${S}"/wscript
-		sed -e 's/'os.getcwd\(\),\ \'.git'/'os.getcwd\(\),\ \'libs/'' -i "${S}"/wscript
-		sed -e 's/'os.path.exists\(\'.git'/'os.path.exists\(\'wscript/'' -i "${S}"/wscript
-
-	fi
-	epatch "${FILESDIR}"/${PN}-3.5.7-syslibs.patch
-#	sed 's/'FLAGS\'\,\ optimization_flags'/'FLAGS\'\,\ \'\''/g' -i "${S}"/wscript
-	sed 's/'FLAGS\'\,\ compiler_flags'/'FLAGS\'\,\ \'\''/g' -i "${S}"/wscript
-	append-flags "-lboost_system"
-}
-
-src_configure() {
-	tc-export CC CXX
-	mkdir -p "${D}"
-	waf-utils_src_configure \
-		--destdir="${D}" \
-		--prefix=/usr \
-		--configdir=/etc \
-		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
-		$(use nls && echo "--nls" || echo "--no-nls") \
-		$(use debug && echo "--stl-debug" || echo "--optimize") \
-		$((use altivec || use cpu_flags_x86_sse) && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
-		$(use doc && echo "--docs")
-}
-
-src_install() {
-	waf-utils_src_install
-	mv ${PN}.1 ${PN}${SLOT}.1
-	doman ${PN}${SLOT}.1
-	newicon icons/icon/ardour_icon_mac.png ${PN}${SLOT}.png
-	make_desktop_entry ardour3 ardour3 ardour3 AudioVideo
-}
-
-pkg_postinst() {
-	elog "If you are using Ardour and want to keep its development alive"
-	elog "then please consider to do a donation upstream at ardour.org. Thanks!"
-}

diff --git a/media-sound/ardour/ardour-3.5.403.ebuild b/media-sound/ardour/ardour-3.5.403.ebuild
deleted file mode 100644
index 0f9d529..0000000
--- a/media-sound/ardour/ardour-3.5.403.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-
-inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-
-if [ ${PV} = 9999 ]; then
-	KEYWORDS=""
-	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
-	inherit git-2
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-2"
-SLOT="3"
-IUSE="altivec doc nls lv2 cpu_flags_x86_sse"
-
-RDEPEND="media-libs/aubio
-	media-libs/liblo
-	sci-libs/fftw:3.0
-	media-libs/freetype:2
-	>=dev-libs/glib-2.10.1:2
-	>=dev-cpp/glibmm-2.32.0
-	>=x11-libs/gtk+-2.8.1:2
-	>=dev-libs/libxml2-2.6:2
-	>=media-libs/libsndfile-1.0.18
-	>=media-libs/libsamplerate-0.1
-	>=media-libs/rubberband-1.6.0
-	>=media-libs/libsoundtouch-1.6.0
-	media-libs/flac
-	media-libs/raptor:2
-	>=media-libs/liblrdf-0.4.0-r20
-	>=media-sound/jack-audio-connection-kit-0.120
-	>=gnome-base/libgnomecanvas-2
-	media-libs/vamp-plugin-sdk
-	dev-libs/libxslt
-	dev-libs/libsigc++:2
-	>=dev-cpp/gtkmm-2.16:2.4
-	>=dev-cpp/libgnomecanvasmm-2.26:2.6
-	media-libs/alsa-lib
-	x11-libs/pango
-	x11-libs/cairo
-	media-libs/libart_lgpl
-	virtual/libusb:0
-	dev-libs/boost
-	>=media-libs/taglib-1.7
-	net-misc/curl
-	lv2? (
-		>=media-libs/slv2-0.6.1
-		media-libs/lilv
-		media-libs/sratom
-		dev-libs/sord
-		>=media-libs/suil-0.6.10
-		>=media-libs/lv2-1.4.0
-	)"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen[dot] )"
-	if ! [ ${PV} = 9999 ]; then
-		DEPEND="${DEPEND}"
-	fi
-
-src_unpack() {
-	if [ ${PV} = 9999 ]; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare(){
-	if ! [ ${PV} = 9999 ]; then
-		PVTEMP=$(echo "${PV}" | sed "s/\./-/2")
-		sed -e '/cmd = "git describe HEAD/,/utf-8/{s:cmd = \"git describe HEAD\":rev = \"'${PVTEMP}-gentoo'\":p;d}' -i "${S}"/wscript
-		sed -e 's/'os.getcwd\(\),\ \'.git'/'os.getcwd\(\),\ \'libs/'' -i "${S}"/wscript
-		sed -e 's/'os.path.exists\(\'.git'/'os.path.exists\(\'wscript/'' -i "${S}"/wscript
-	fi
-	epatch "${FILESDIR}"/${PN}-3.5.7-syslibs.patch
-	epatch "${FILESDIR}"/${PN}-3.5.403-sse.patch
-	sed 's/'FLAGS\'\,\ compiler_flags'/'FLAGS\'\,\ \'\''/g' -i "${S}"/wscript
-	append-flags "-lboost_system"
-}
-
-src_configure() {
-	if use cpu_flags_x86_sse; then
-		MARCH=$(get-flag march)
-		for ARCHWOSSE in i686 i486; do
-			if [[ ${MARCH} = ${ARCHWOSSE} ]]; then
-				for SSEOPT in -msse -msse2 -msse3 -mssse3 -msse4 -msse4.1 -msse4.2; do
-					is-flag ${SSEOPT} && SSEON="yes"
-				done
-				if [ -z ${SSEON} ]; then
-					append-flags -msse
-					elog "You enabled sse but use an march that does not support sse!"
-					elog "We add -msse to the cflags now, but please consider switching your march in make.conf!"
-				fi
-			fi
-		done
-	fi
-	tc-export CC CXX
-	mkdir -p "${D}"
-	waf-utils_src_configure \
-		--destdir="${D}" \
-		--prefix=/usr \
-		--configdir=/etc \
-		--optimize \
-		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
-		$(use nls && echo "--nls" || echo "--no-nls") \
-		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
-		$(use doc && echo "--docs")
-}
-
-src_install() {
-	waf-utils_src_install
-	mv ${PN}.1 ${PN}${SLOT}.1
-	doman ${PN}${SLOT}.1
-	newicon icons/icon/ardour_icon_mac.png ${PN}${SLOT}.png
-	make_desktop_entry ardour3 ardour3 ardour3 AudioVideo
-}
-
-pkg_postinst() {
-	elog "If you are using Ardour and want to keep its development alive"
-	elog "then please consider to do a donation upstream at ardour.org. Thanks!"
-}

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-5.0.ebuild
similarity index 94%
copy from media-sound/ardour/ardour-9999.ebuild
copy to media-sound/ardour/ardour-5.0.ebuild
index b17c400..a2320cb 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-5.0.ebuild
@@ -16,11 +16,12 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="http://community.ardour.org/srctar -> ${P}.tar.bz2"
+	S="${WORKDIR}/Ardour-${PV}.0"
 fi
 
 LICENSE="GPL-2"
-SLOT="4"
+SLOT="5"
 IUSE="altivec doc jack lv2 cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
 
 RDEPEND="
@@ -48,12 +49,12 @@ RDEPEND="
 	>=media-libs/taglib-1.7
 	media-libs/vamp-plugin-sdk
 	net-misc/curl
-	sci-libs/fftw:3.0
+	sci-libs/fftw:3.0[threads]
 	virtual/libusb:0
 	x11-libs/cairo
 	>=x11-libs/gtk+-2.8.1:2
 	x11-libs/pango
-	jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
+	jack? ( virtual/jack )
 	lv2? (
 		>=media-libs/slv2-0.6.1
 		media-libs/lilv
@@ -130,7 +131,7 @@ 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 ardour4 ardour4 ardour4 AudioVideo
+	make_desktop_entry ardour5 ardour5 ardour5 AudioVideo
 }
 
 pkg_postinst() {

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index b17c400..a2320cb 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -16,11 +16,12 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="http://community.ardour.org/srctar -> ${P}.tar.bz2"
+	S="${WORKDIR}/Ardour-${PV}.0"
 fi
 
 LICENSE="GPL-2"
-SLOT="4"
+SLOT="5"
 IUSE="altivec doc jack lv2 cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
 
 RDEPEND="
@@ -48,12 +49,12 @@ RDEPEND="
 	>=media-libs/taglib-1.7
 	media-libs/vamp-plugin-sdk
 	net-misc/curl
-	sci-libs/fftw:3.0
+	sci-libs/fftw:3.0[threads]
 	virtual/libusb:0
 	x11-libs/cairo
 	>=x11-libs/gtk+-2.8.1:2
 	x11-libs/pango
-	jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
+	jack? ( virtual/jack )
 	lv2? (
 		>=media-libs/slv2-0.6.1
 		media-libs/lilv
@@ -130,7 +131,7 @@ 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 ardour4 ardour4 ardour4 AudioVideo
+	make_desktop_entry ardour5 ardour5 ardour5 AudioVideo
 }
 
 pkg_postinst() {


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2016-06-10 15:01 Andreas Schuerch
  0 siblings, 0 replies; 118+ messages in thread
From: Andreas Schuerch @ 2016-06-10 15:01 UTC (permalink / raw
  To: gentoo-commits

commit:     dcd0b78f35dd984768deb06e9b23d156c5cb3404
Author:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 10 14:59:00 2016 +0000
Commit:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
CommitDate: Fri Jun 10 14:59:00 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcd0b78f

media-sound/ardour: ne iconpath in git. See Bug 585076

Package-Manager: portage-2.2.26

 media-sound/ardour/ardour-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 6ef94c0..b17c400 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -129,7 +129,7 @@ src_install() {
 	waf-utils_src_install
 	mv ${PN}.1 ${PN}${SLOT}.1
 	doman ${PN}${SLOT}.1
-	newicon icons/icon/ardour_icon_tango_48px_red.png ${PN}${SLOT}.png
+	newicon "${S}/gtk2_ardour/resources/Ardour-icon_48px.png" ${PN}${SLOT}.png
 	make_desktop_entry ardour4 ardour4 ardour4 AudioVideo
 }
 


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2016-01-14  6:16 Andreas Schuerch
  0 siblings, 0 replies; 118+ messages in thread
From: Andreas Schuerch @ 2016-01-14  6:16 UTC (permalink / raw
  To: gentoo-commits

commit:     ab325967433f0844029ab467c1e4d931c6e57c17
Author:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 14 06:11:32 2016 +0000
Commit:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
CommitDate: Thu Jan 14 06:11:32 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab325967

media-sound/ardour: fixed various little things. See bug 571734

Package-Manager: portage-2.2.26

 media-sound/ardour/ardour-4.6.ebuild  | 17 +++++++++++------
 media-sound/ardour/ardour-9999.ebuild | 17 +++++++++++------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/media-sound/ardour/ardour-4.6.ebuild b/media-sound/ardour/ardour-4.6.ebuild
index 450dc30..6ef94c0 100644
--- a/media-sound/ardour/ardour-4.6.ebuild
+++ b/media-sound/ardour/ardour-4.6.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE='threads(+)'
+#EPYTHON='python2.7'
 inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
 
 DESCRIPTION="Digital Audio Workstation"
@@ -64,7 +65,7 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	>=media-sound/jack-audio-connection-kit-0.120
+	jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
 	sys-devel/gettext
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen[dot] )"
@@ -73,6 +74,7 @@ pkg_setup() {
 	if has_version \>=dev-libs/libsigc++-2.6 ; then
 		append-cxxflags -std=c++11
 	fi
+	python-any-r1_pkg_setup
 }
 
 src_prepare(){
@@ -81,12 +83,13 @@ src_prepare(){
 		touch "${S}/libs/ardour/revision.cc"
 	fi
 	use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
-	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript
+	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 cflags now, but please consider switching your march in make.conf!"
+			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
 		fi
 		OPTFLAGS="sse"
 	fi
@@ -99,10 +102,12 @@ src_prepare(){
 	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
-	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript
+	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
 }
 
 src_configure() {

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 450dc30..6ef94c0 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -5,6 +5,7 @@
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE='threads(+)'
+#EPYTHON='python2.7'
 inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
 
 DESCRIPTION="Digital Audio Workstation"
@@ -64,7 +65,7 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	>=media-sound/jack-audio-connection-kit-0.120
+	jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
 	sys-devel/gettext
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen[dot] )"
@@ -73,6 +74,7 @@ pkg_setup() {
 	if has_version \>=dev-libs/libsigc++-2.6 ; then
 		append-cxxflags -std=c++11
 	fi
+	python-any-r1_pkg_setup
 }
 
 src_prepare(){
@@ -81,12 +83,13 @@ src_prepare(){
 		touch "${S}/libs/ardour/revision.cc"
 	fi
 	use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
-	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript
+	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 cflags now, but please consider switching your march in make.conf!"
+			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
 		fi
 		OPTFLAGS="sse"
 	fi
@@ -99,10 +102,12 @@ src_prepare(){
 	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
-	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript
+	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
 }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2016-01-12 13:53 Andreas Schuerch
  0 siblings, 0 replies; 118+ messages in thread
From: Andreas Schuerch @ 2016-01-12 13:53 UTC (permalink / raw
  To: gentoo-commits

commit:     9e4d26a65eec2980c7e2bc2714f2f6ba55e16775
Author:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 12 13:52:39 2016 +0000
Commit:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
CommitDate: Tue Jan 12 13:52:39 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e4d26a6

media-sound/ardour: bump to 4.6

Package-Manager: portage-2.2.24

 media-sound/ardour/Manifest                                  | 1 +
 media-sound/ardour/{ardour-9999.ebuild => ardour-4.6.ebuild} | 4 ++--
 media-sound/ardour/ardour-9999.ebuild                        | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 6470b94..ceb6b7e 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -8,3 +8,4 @@ DIST ardour-4.0.tar.gz 9189038 SHA256 ea1131a24774d5f8dcab4ac7ea3b36bd427b1e4d0b
 DIST ardour-4.1.tar.gz 9247567 SHA256 1d5eac009f3c84aee11c4e7d1c548747cb5a43eddac92b4e640342b79cc808b9 SHA512 5e13301ca5d8140498256d43729d770c6222b220d2c817651304746a7cc20fe8450b094d978bc9559b9ec7b5a7a95ca1c5131be5b51c78835e75b3b7bbb1be82 WHIRLPOOL 3699ea7f29c9df30ddfa3ad9a1e05f6a3cbccddaf5ae1804679b6c1a50e8b800e14f06760e8d9d44a4ac2631f32db595048640c01b9c967f060bfaee11f28a73
 DIST ardour-4.2.tar.gz 9484009 SHA256 c8af454e974be3222bceb374d5b3d126af6c9766326f7e276acb8ef2fa21cfa4 SHA512 cb1d8144216ff959dac1b371c5ec2b99e0fc2137c105fda5c38460c7f148d7f575761453b24ea5ab7c58139a6839b92ee863c6a5485ab4a009da7c362471a2b3 WHIRLPOOL f9d7df4687c4d1a402c43ba43acee9f3b1423f8dcc691ef69590554f49530be5df0ef57f0f20b67ba0efb50690cdc744015f1917bb2051857d496c5cf000f948
 DIST ardour-4.4.tar.gz 9511090 SHA256 d567e99c4476c0122006c85d09a8e4eab93db28be7be99d338ea66be8581bfcf SHA512 8df3e4552b0ccdd76c5ccf06224594325bb8c02f897bb79bd983531a2f4f56c60185b6080e2f8eddb6a274b9d48dc93a47ddc5471e05b253d492c09be816dde0 WHIRLPOOL 86e298b7defa5249c0632368bae64ddde2175e5f5ece66b4932485a4216ae0613b81e2f736f54e7f00a600be5e238fe41559fe2290f3aebbb36b208184aefc25
+DIST ardour-4.6.tar.gz 10033725 SHA256 79a3b063f2413d79c4bb2930505e0f6628848258051869095588a50940f49f6b SHA512 8fdda5f6efde18a66d89605f0a4d14756ce573ffc5de54e7229c7aa76ab11cbba33bdb775fb5c5dde86f4d308c2a96b904a0298d7b9c598300ab35e835f2ea0a WHIRLPOOL 0f4e054cdb2a1022f860354d70e4517bebee66e0711f16b4e3b19ebc8f354e364fd1a91e64aa3f7c692f3251ee261cdc2fda29215cef58c9a8cebcc20708af72

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-4.6.ebuild
similarity index 97%
copy from media-sound/ardour/ardour-9999.ebuild
copy to media-sound/ardour/ardour-4.6.ebuild
index 81a76d3..450dc30 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -124,7 +124,7 @@ src_install() {
 	waf-utils_src_install
 	mv ${PN}.1 ${PN}${SLOT}.1
 	doman ${PN}${SLOT}.1
-	newicon icons/icon/ardour_icon_mac.png ${PN}${SLOT}.png
+	newicon icons/icon/ardour_icon_tango_48px_red.png ${PN}${SLOT}.png
 	make_desktop_entry ardour4 ardour4 ardour4 AudioVideo
 }
 

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 81a76d3..450dc30 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -124,7 +124,7 @@ src_install() {
 	waf-utils_src_install
 	mv ${PN}.1 ${PN}${SLOT}.1
 	doman ${PN}${SLOT}.1
-	newicon icons/icon/ardour_icon_mac.png ${PN}${SLOT}.png
+	newicon icons/icon/ardour_icon_tango_48px_red.png ${PN}${SLOT}.png
 	make_desktop_entry ardour4 ardour4 ardour4 AudioVideo
 }
 


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2015-11-01 12:06 Andreas Schuerch
  0 siblings, 0 replies; 118+ messages in thread
From: Andreas Schuerch @ 2015-11-01 12:06 UTC (permalink / raw
  To: gentoo-commits

commit:     e313495f2efbab89570f64a4462ce42dcae08998
Author:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  1 12:05:10 2015 +0000
Commit:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
CommitDate: Sun Nov  1 12:05:10 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e313495f

media-sound/ardour: libsigc++-2.6.0 preparation. See bug 564414

Package-Manager: portage-2.2.20.1

 media-sound/ardour/ardour-4.4.ebuild  | 6 ++++++
 media-sound/ardour/ardour-9999.ebuild | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/media-sound/ardour/ardour-4.4.ebuild b/media-sound/ardour/ardour-4.4.ebuild
index edeb9ed..e679540 100644
--- a/media-sound/ardour/ardour-4.4.ebuild
+++ b/media-sound/ardour/ardour-4.4.ebuild
@@ -69,6 +69,12 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen[dot] )"
 
+pkg_setup() {
+	if has_version \>=dev-libs/libsigc++-2.6 ; then
+		append-cxxflags -std=c++11
+	fi
+}
+
 src_prepare(){
 	if ! [[ ${PV} == *9999* ]]; then
 		epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index da43984..81a76d3 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -69,6 +69,12 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen[dot] )"
 
+pkg_setup() {
+	if has_version \>=dev-libs/libsigc++-2.6 ; then
+		append-cxxflags -std=c++11
+	fi
+}
+
 src_prepare(){
 	if ! [[ ${PV} == *9999* ]]; then
 		epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2015-10-29  8:14 Andreas Schuerch
  0 siblings, 0 replies; 118+ messages in thread
From: Andreas Schuerch @ 2015-10-29  8:14 UTC (permalink / raw
  To: gentoo-commits

commit:     ec446f4f5f86d175bbae92c95c16678f57e1b5c2
Author:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 29 08:13:18 2015 +0000
Commit:     Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
CommitDate: Thu Oct 29 08:13:18 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec446f4f

media-sound/ardour: Bump to 4.4 and changes how cflags get set

Package-Manager: portage-2.2.20.1

 media-sound/ardour/Manifest                        |   1 +
 .../{ardour-9999.ebuild => ardour-4.4.ebuild}      | 125 ++++++++++-----------
 media-sound/ardour/ardour-9999.ebuild              | 125 ++++++++++-----------
 3 files changed, 115 insertions(+), 136 deletions(-)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index d7c5459..6470b94 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -7,3 +7,4 @@ DIST ardour-3.5.403.tar.gz 8583763 SHA256 46490623479d9a25e2ab98b817c1f5c42b1d04
 DIST ardour-4.0.tar.gz 9189038 SHA256 ea1131a24774d5f8dcab4ac7ea3b36bd427b1e4d0bef6f3db0681bc4ca131cf1 SHA512 2317c5818fe89386319f12062f0af0d08b07f569d6f775b7ecfa4f3a4bb1f565e05f3ff32f05f591c5628bdd402eda5bce4be4f8fa89da6c2092d5edb2c9ae7a WHIRLPOOL 854145ed135f6b23222ab2d6022e31b09221cac0d326fa17c5ee88e4e8ebd033e69c447fcbac35a925ff23974cc8b2b13c076014118977bbc88836124a912ad4
 DIST ardour-4.1.tar.gz 9247567 SHA256 1d5eac009f3c84aee11c4e7d1c548747cb5a43eddac92b4e640342b79cc808b9 SHA512 5e13301ca5d8140498256d43729d770c6222b220d2c817651304746a7cc20fe8450b094d978bc9559b9ec7b5a7a95ca1c5131be5b51c78835e75b3b7bbb1be82 WHIRLPOOL 3699ea7f29c9df30ddfa3ad9a1e05f6a3cbccddaf5ae1804679b6c1a50e8b800e14f06760e8d9d44a4ac2631f32db595048640c01b9c967f060bfaee11f28a73
 DIST ardour-4.2.tar.gz 9484009 SHA256 c8af454e974be3222bceb374d5b3d126af6c9766326f7e276acb8ef2fa21cfa4 SHA512 cb1d8144216ff959dac1b371c5ec2b99e0fc2137c105fda5c38460c7f148d7f575761453b24ea5ab7c58139a6839b92ee863c6a5485ab4a009da7c362471a2b3 WHIRLPOOL f9d7df4687c4d1a402c43ba43acee9f3b1423f8dcc691ef69590554f49530be5df0ef57f0f20b67ba0efb50690cdc744015f1917bb2051857d496c5cf000f948
+DIST ardour-4.4.tar.gz 9511090 SHA256 d567e99c4476c0122006c85d09a8e4eab93db28be7be99d338ea66be8581bfcf SHA512 8df3e4552b0ccdd76c5ccf06224594325bb8c02f897bb79bd983531a2f4f56c60185b6080e2f8eddb6a274b9d48dc93a47ddc5471e05b253d492c09be816dde0 WHIRLPOOL 86e298b7defa5249c0632368bae64ddde2175e5f5ece66b4932485a4216ae0613b81e2f736f54e7f00a600be5e238fe41559fe2290f3aebbb36b208184aefc25

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-4.4.ebuild
similarity index 59%
copy from media-sound/ardour/ardour-9999.ebuild
copy to media-sound/ardour/ardour-4.4.ebuild
index e91dce0..edeb9ed 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-4.4.ebuild
@@ -3,19 +3,16 @@
 # $Id$
 
 EAPI=5
-
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE='threads(+)'
-
 inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
 
 DESCRIPTION="Digital Audio Workstation"
 HOMEPAGE="http://ardour.org/"
 
-if [ ${PV} = 9999 ]; then
-	KEYWORDS=""
+if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
-	inherit git-2
+	inherit git-r3
 else
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -23,37 +20,38 @@ fi
 
 LICENSE="GPL-2"
 SLOT="4"
-IUSE="altivec doc jack lv2 cpu_flags_x86_sse"
+IUSE="altivec doc jack lv2 cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
 
-RDEPEND="media-libs/aubio
-	media-libs/liblo
-	sci-libs/fftw:3.0
-	media-libs/freetype:2
-	>=dev-libs/glib-2.10.1:2
+RDEPEND="
 	>=dev-cpp/glibmm-2.32.0
-	>=x11-libs/gtk+-2.8.1:2
-	>=dev-libs/libxml2-2.6:2
-	>=media-libs/libsndfile-1.0.18
-	>=media-libs/libsamplerate-0.1
-	>=media-libs/rubberband-1.6.0
-	>=media-libs/libsoundtouch-1.6.0
-	media-libs/flac
-	media-libs/raptor:2
-	>=media-libs/liblrdf-0.4.0-r20
-	>=gnome-base/libgnomecanvas-2
-	media-libs/vamp-plugin-sdk
-	dev-libs/libxslt
-	dev-libs/libsigc++:2
 	>=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
-	x11-libs/pango
-	x11-libs/cairo
+	media-libs/aubio
+	media-libs/flac
+	media-libs/freetype:2
 	media-libs/libart_lgpl
-	virtual/libusb:0
-	dev-libs/boost
+	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
+	sci-libs/fftw:3.0
+	virtual/libusb:0
+	x11-libs/cairo
+	>=x11-libs/gtk+-2.8.1:2
+	x11-libs/pango
 	jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
 	lv2? (
 		>=media-libs/slv2-0.6.1
@@ -66,63 +64,54 @@ RDEPEND="media-libs/aubio
 
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	virtual/pkgconfig
 	>=media-sound/jack-audio-connection-kit-0.120
 	sys-devel/gettext
+	virtual/pkgconfig
 	doc? ( app-doc/doxygen[dot] )"
-	if ! [ ${PV} = 9999 ]; then
-		DEPEND="${DEPEND}"
-	fi
-
-src_unpack() {
-	if [ ${PV} = 9999 ]; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-}
 
 src_prepare(){
-	if ! [ ${PV} = 9999 ]; then
-		epatch "${FILESDIR}"/${PN}-4.0-revision-naming.patch
+	if ! [[ ${PV} == *9999* ]]; then
+		epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
 		touch "${S}/libs/ardour/revision.cc"
 	fi
-	$(use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch)
-	epatch "${FILESDIR}"/${PN}-3.5.403-sse.patch
-	sed -e 's/'FLAGS\'\,\ compiler_flags'/'FLAGS\'\,\ program_flags'/g' -i "${S}"/wscript
-	sed -e 's/'compiler_flags.append\ \(\'-DPROGRAM_'/'program_flags.append\ \(\'-DPROGRAM_'/g' -i "${S}"/wscript
-	sed -e '/compiler_flags\ \=\ \[\]/a \ \ \ \ program_flags\ \=\ \[\]' -i "${S}"/wscript
+	use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
+	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript
+	MARCH=$(get-flag march)
+	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 sse 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
+	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript
 	append-flags "-lboost_system"
 }
 
 src_configure() {
-	if use cpu_flags_x86_sse; then
-		MARCH=$(get-flag march)
-		for ARCHWOSSE in i686 i486; do
-			if [[ ${MARCH} = ${ARCHWOSSE} ]]; then
-				for SSEOPT in -msse -msse2 -msse3 -mssse3 -msse4 -msse4.1 -msse4.2; do
-					is-flag ${SSEOPT} && SSEON="yes"
-				done
-				if [ -z ${SSEON} ]; then
-					append-flags -msse
-					elog "You enabled sse but use an march that does not support sse!"
-					elog "We add -msse to the cflags now, but please consider switching your march in make.conf!"
-				fi
-			fi
-		done
-	fi
 	tc-export CC CXX
 	mkdir -p "${D}"
 	waf-utils_src_configure \
 		--destdir="${D}" \
 		--prefix=/usr \
 		--configdir=/etc \
-		--optimize \
 		--nls \
-		$(use jack && echo "--with-backends=alsa,jack" || echo "--with-backends=alsa  --libjack=weak") \
-		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
-		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
-		$(use doc && echo "--docs")
+		--optimize \
+		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
+		$(usex lv2 "--lv2" "--no-lv2") \
+		$(usex doc "--docs" '') \
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
 }
 
 src_install() {
@@ -135,5 +124,5 @@ src_install() {
 
 pkg_postinst() {
 	elog "If you are using Ardour and want to keep its development alive"
-	elog "then please consider to do a donation upstream at ardour.org. Thanks!"
+	elog "then please consider to make a donation upstream at ${HOMEPAGE}"
 }

diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index e91dce0..da43984 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -3,19 +3,16 @@
 # $Id$
 
 EAPI=5
-
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE='threads(+)'
-
 inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
 
 DESCRIPTION="Digital Audio Workstation"
 HOMEPAGE="http://ardour.org/"
 
-if [ ${PV} = 9999 ]; then
-	KEYWORDS=""
+if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
-	inherit git-2
+	inherit git-r3
 else
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -23,37 +20,38 @@ fi
 
 LICENSE="GPL-2"
 SLOT="4"
-IUSE="altivec doc jack lv2 cpu_flags_x86_sse"
+IUSE="altivec doc jack lv2 cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
 
-RDEPEND="media-libs/aubio
-	media-libs/liblo
-	sci-libs/fftw:3.0
-	media-libs/freetype:2
-	>=dev-libs/glib-2.10.1:2
+RDEPEND="
 	>=dev-cpp/glibmm-2.32.0
-	>=x11-libs/gtk+-2.8.1:2
-	>=dev-libs/libxml2-2.6:2
-	>=media-libs/libsndfile-1.0.18
-	>=media-libs/libsamplerate-0.1
-	>=media-libs/rubberband-1.6.0
-	>=media-libs/libsoundtouch-1.6.0
-	media-libs/flac
-	media-libs/raptor:2
-	>=media-libs/liblrdf-0.4.0-r20
-	>=gnome-base/libgnomecanvas-2
-	media-libs/vamp-plugin-sdk
-	dev-libs/libxslt
-	dev-libs/libsigc++:2
 	>=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
-	x11-libs/pango
-	x11-libs/cairo
+	media-libs/aubio
+	media-libs/flac
+	media-libs/freetype:2
 	media-libs/libart_lgpl
-	virtual/libusb:0
-	dev-libs/boost
+	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
+	sci-libs/fftw:3.0
+	virtual/libusb:0
+	x11-libs/cairo
+	>=x11-libs/gtk+-2.8.1:2
+	x11-libs/pango
 	jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
 	lv2? (
 		>=media-libs/slv2-0.6.1
@@ -66,63 +64,54 @@ RDEPEND="media-libs/aubio
 
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	virtual/pkgconfig
 	>=media-sound/jack-audio-connection-kit-0.120
 	sys-devel/gettext
+	virtual/pkgconfig
 	doc? ( app-doc/doxygen[dot] )"
-	if ! [ ${PV} = 9999 ]; then
-		DEPEND="${DEPEND}"
-	fi
-
-src_unpack() {
-	if [ ${PV} = 9999 ]; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-}
 
 src_prepare(){
-	if ! [ ${PV} = 9999 ]; then
-		epatch "${FILESDIR}"/${PN}-4.0-revision-naming.patch
+	if ! [[ ${PV} == *9999* ]]; then
+		epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
 		touch "${S}/libs/ardour/revision.cc"
 	fi
-	$(use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch)
-	epatch "${FILESDIR}"/${PN}-3.5.403-sse.patch
-	sed -e 's/'FLAGS\'\,\ compiler_flags'/'FLAGS\'\,\ program_flags'/g' -i "${S}"/wscript
-	sed -e 's/'compiler_flags.append\ \(\'-DPROGRAM_'/'program_flags.append\ \(\'-DPROGRAM_'/g' -i "${S}"/wscript
-	sed -e '/compiler_flags\ \=\ \[\]/a \ \ \ \ program_flags\ \=\ \[\]' -i "${S}"/wscript
+	use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
+	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript
+	MARCH=$(get-flag march)
+	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 cflags 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
+	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript
 	append-flags "-lboost_system"
 }
 
 src_configure() {
-	if use cpu_flags_x86_sse; then
-		MARCH=$(get-flag march)
-		for ARCHWOSSE in i686 i486; do
-			if [[ ${MARCH} = ${ARCHWOSSE} ]]; then
-				for SSEOPT in -msse -msse2 -msse3 -mssse3 -msse4 -msse4.1 -msse4.2; do
-					is-flag ${SSEOPT} && SSEON="yes"
-				done
-				if [ -z ${SSEON} ]; then
-					append-flags -msse
-					elog "You enabled sse but use an march that does not support sse!"
-					elog "We add -msse to the cflags now, but please consider switching your march in make.conf!"
-				fi
-			fi
-		done
-	fi
 	tc-export CC CXX
 	mkdir -p "${D}"
 	waf-utils_src_configure \
 		--destdir="${D}" \
 		--prefix=/usr \
 		--configdir=/etc \
-		--optimize \
 		--nls \
-		$(use jack && echo "--with-backends=alsa,jack" || echo "--with-backends=alsa  --libjack=weak") \
-		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
-		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
-		$(use doc && echo "--docs")
+		--optimize \
+		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
+		$(usex lv2 "--lv2" "--no-lv2") \
+		$(usex doc "--docs" '') \
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
 }
 
 src_install() {
@@ -135,5 +124,5 @@ src_install() {
 
 pkg_postinst() {
 	elog "If you are using Ardour and want to keep its development alive"
-	elog "then please consider to do a donation upstream at ardour.org. Thanks!"
+	elog "then please consider to make a donation upstream at ${HOMEPAGE}"
 }


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2015-08-19 11:40 Lars Wendler
  0 siblings, 0 replies; 118+ messages in thread
From: Lars Wendler @ 2015-08-19 11:40 UTC (permalink / raw
  To: gentoo-commits

commit:     6d594e44153a9c3fd841a3390f29285d1561b52f
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 19 11:39:49 2015 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Aug 19 11:39:49 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d594e44

media-sound/ardour: Removed wrong command substitution.

Package-Manager: portage-2.2.20.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-sound/ardour/ardour-4.0-r2.ebuild | 2 +-
 media-sound/ardour/ardour-4.1.ebuild    | 2 +-
 media-sound/ardour/ardour-4.2-r1.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-sound/ardour/ardour-4.0-r2.ebuild b/media-sound/ardour/ardour-4.0-r2.ebuild
index 225267b..3c42277 100644
--- a/media-sound/ardour/ardour-4.0-r2.ebuild
+++ b/media-sound/ardour/ardour-4.0-r2.ebuild
@@ -87,7 +87,7 @@ src_prepare(){
 		epatch "${FILESDIR}"/${PN}-4.0-revision-naming.patch
 		touch "${S}/libs/ardour/revision.cc"
 	fi
-	$(use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch)
+	use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
 	epatch "${FILESDIR}"/${PN}-3.5.403-sse.patch
 	sed -e 's/'FLAGS\'\,\ compiler_flags'/'FLAGS\'\,\ program_flags'/g' -i "${S}"/wscript
 	sed -e 's/'compiler_flags.append\ \(\'-DPROGRAM_'/'program_flags.append\ \(\'-DPROGRAM_'/g' -i "${S}"/wscript

diff --git a/media-sound/ardour/ardour-4.1.ebuild b/media-sound/ardour/ardour-4.1.ebuild
index 29167b3..8506b89 100644
--- a/media-sound/ardour/ardour-4.1.ebuild
+++ b/media-sound/ardour/ardour-4.1.ebuild
@@ -87,7 +87,7 @@ src_prepare(){
 		epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
 		touch "${S}/libs/ardour/revision.cc"
 	fi
-	$(use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch)
+	use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
 	epatch "${FILESDIR}"/${PN}-3.5.403-sse.patch
 	sed -e 's/'FLAGS\'\,\ compiler_flags'/'FLAGS\'\,\ program_flags'/g' -i "${S}"/wscript
 	sed -e 's/'compiler_flags.append\ \(\'-DPROGRAM_'/'program_flags.append\ \(\'-DPROGRAM_'/g' -i "${S}"/wscript

diff --git a/media-sound/ardour/ardour-4.2-r1.ebuild b/media-sound/ardour/ardour-4.2-r1.ebuild
index 8774ca0..63d0028 100644
--- a/media-sound/ardour/ardour-4.2-r1.ebuild
+++ b/media-sound/ardour/ardour-4.2-r1.ebuild
@@ -73,7 +73,7 @@ src_prepare(){
 		epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
 		touch "${S}/libs/ardour/revision.cc"
 	fi
-	$(use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch)
+	use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
 	epatch "${FILESDIR}"/${PN}-3.5.403-sse.patch
 	sed -e 's/'FLAGS\'\,\ compiler_flags'/'FLAGS\'\,\ program_flags'/g' \
 		-i "${S}"/wscript


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2015-08-17 15:39 Ben de Groot
  0 siblings, 0 replies; 118+ messages in thread
From: Ben de Groot @ 2015-08-17 15:39 UTC (permalink / raw
  To: gentoo-commits

commit:     2c20284c752bfa2384c4dcd1e262adb51e7f3d98
Author:     Ben de Groot <yngwin <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 17 15:02:33 2015 +0000
Commit:     Ben de Groot <yngwin <AT> gentoo <DOT> org>
CommitDate: Mon Aug 17 15:02:33 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c20284c

media-sound/ardour: ebuild improvements

- Use git-r3.eclass instead of older git-2.
- Use more robust double bracket style for tests.
- Put dependencies in alphabetic order
- Remove unneeded src_unpack
- Break up long sed lines
- Use usex where applicable
- Language usage correction in elog message

Package-Manager: portage-2.2.20.1

 media-sound/ardour/ardour-4.2-r1.ebuild | 89 +++++++++++++++------------------
 1 file changed, 39 insertions(+), 50 deletions(-)

diff --git a/media-sound/ardour/ardour-4.2-r1.ebuild b/media-sound/ardour/ardour-4.2-r1.ebuild
index c4f8bc4..c8aad5c 100644
--- a/media-sound/ardour/ardour-4.2-r1.ebuild
+++ b/media-sound/ardour/ardour-4.2-r1.ebuild
@@ -3,19 +3,16 @@
 # $Id$
 
 EAPI=5
-
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE='threads(+)'
-
 inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
 
 DESCRIPTION="Digital Audio Workstation"
 HOMEPAGE="http://ardour.org/"
 
-if [ ${PV} = 9999 ]; then
-	KEYWORDS=""
+if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
-	inherit git-2
+	inherit git-r3
 else
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -25,35 +22,36 @@ LICENSE="GPL-2"
 SLOT="4"
 IUSE="altivec doc jack lv2 cpu_flags_x86_sse"
 
-RDEPEND="media-libs/aubio
-	media-libs/liblo
-	sci-libs/fftw:3.0
-	media-libs/freetype:2
-	>=dev-libs/glib-2.10.1:2
+RDEPEND="
 	>=dev-cpp/glibmm-2.32.0
-	>=x11-libs/gtk+-2.8.1:2
-	>=dev-libs/libxml2-2.6:2
-	>=media-libs/libsndfile-1.0.18
-	>=media-libs/libsamplerate-0.1
-	>=media-libs/rubberband-1.6.0
-	>=media-libs/libsoundtouch-1.6.0
-	media-libs/flac
-	media-libs/raptor:2
-	>=media-libs/liblrdf-0.4.0-r20
-	>=gnome-base/libgnomecanvas-2
-	media-libs/vamp-plugin-sdk
-	dev-libs/libxslt
-	dev-libs/libsigc++:2
 	>=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
-	x11-libs/pango
-	x11-libs/cairo
+	media-libs/aubio
+	media-libs/flac
+	media-libs/freetype:2
 	media-libs/libart_lgpl
-	virtual/libusb:0
-	dev-libs/boost:=
+	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
+	sci-libs/fftw:3.0
+	virtual/libusb:0
+	x11-libs/cairo
+	>=x11-libs/gtk+-2.8.1:2
+	x11-libs/pango
 	jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
 	lv2? (
 		>=media-libs/slv2-0.6.1
@@ -63,35 +61,26 @@ RDEPEND="media-libs/aubio
 		>=media-libs/suil-0.6.10
 		>=media-libs/lv2-1.4.0
 	)"
-
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	virtual/pkgconfig
 	>=media-sound/jack-audio-connection-kit-0.120
 	sys-devel/gettext
+	virtual/pkgconfig
 	doc? ( app-doc/doxygen[dot] )"
-	if ! [ ${PV} = 9999 ]; then
-		DEPEND="${DEPEND}"
-	fi
-
-src_unpack() {
-	if [ ${PV} = 9999 ]; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-}
 
 src_prepare(){
-	if ! [ ${PV} = 9999 ]; then
+	if ! [[ ${PV} == *9999* ]]; then
 		epatch "${FILESDIR}"/${PN}-4.2-revision-naming.patch
 		touch "${S}/libs/ardour/revision.cc"
 	fi
 	$(use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch)
 	epatch "${FILESDIR}"/${PN}-3.5.403-sse.patch
-	sed -e 's/'FLAGS\'\,\ compiler_flags'/'FLAGS\'\,\ program_flags'/g' -i "${S}"/wscript
-	sed -e 's/'compiler_flags.append\ \(\'-DPROGRAM_'/'program_flags.append\ \(\'-DPROGRAM_'/g' -i "${S}"/wscript
-	sed -e '/compiler_flags\ \=\ \[\]/a \ \ \ \ program_flags\ \=\ \[\]' -i "${S}"/wscript
+	sed -e 's/'FLAGS\'\,\ compiler_flags'/'FLAGS\'\,\ program_flags'/g' \
+		-i "${S}"/wscript
+	sed -e 's/'compiler_flags.append\ \(\'-DPROGRAM_'/'program_flags.append\ \(\'-DPROGRAM_'/g' \
+		-i "${S}"/wscript
+	sed -e '/compiler_flags\ \=\ \[\]/a \ \ \ \ program_flags\ \=\ \[\]' \
+		-i "${S}"/wscript
 	append-flags "-lboost_system"
 }
 
@@ -99,11 +88,11 @@ src_configure() {
 	if use cpu_flags_x86_sse; then
 		MARCH=$(get-flag march)
 		for ARCHWOSSE in i686 i486; do
-			if [[ ${MARCH} = ${ARCHWOSSE} ]]; then
+			if [[ ${MARCH} == ${ARCHWOSSE} ]]; then
 				for SSEOPT in -msse -msse2 -msse3 -mssse3 -msse4 -msse4.1 -msse4.2; do
 					is-flag ${SSEOPT} && SSEON="yes"
 				done
-				if [ -z ${SSEON} ]; then
+				if [[ -z ${SSEON} ]]; then
 					append-flags -msse
 					elog "You enabled sse but use an march that does not support sse!"
 					elog "We add -msse to the cflags now, but please consider switching your march in make.conf!"
@@ -119,10 +108,10 @@ src_configure() {
 		--configdir=/etc \
 		--optimize \
 		--nls \
-		$(use jack && echo "--with-backends=alsa,jack" || echo "--with-backends=alsa  --libjack=weak") \
-		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
+		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
+		$(usex lv2 "--lv2" "--no-lv2") \
 		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
-		$(use doc && echo "--docs")
+		$(usex doc "--docs" '')
 }
 
 src_install() {
@@ -135,5 +124,5 @@ src_install() {
 
 pkg_postinst() {
 	elog "If you are using Ardour and want to keep its development alive"
-	elog "then please consider to do a donation upstream at ardour.org. Thanks!"
+	elog "then please consider to make a donation upstream at ${HOMEPAGE}"
 }


^ permalink raw reply related	[flat|nested] 118+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/
@ 2015-08-15  5:30 Ben de Groot
  0 siblings, 0 replies; 118+ messages in thread
From: Ben de Groot @ 2015-08-15  5:30 UTC (permalink / raw
  To: gentoo-commits

commit:     54f4d7866bbd6c8e54cd4f538984bf64b0396e4e
Author:     Ben de Groot <yngwin <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 15 05:30:05 2015 +0000
Commit:     Ben de Groot <yngwin <AT> gentoo <DOT> org>
CommitDate: Sat Aug 15 05:30:05 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54f4d786

media-sound/ardour: version bump to 4.2

Package-Manager: portage-2.2.20.1

 media-sound/ardour/Manifest          |   1 +
 media-sound/ardour/ardour-4.2.ebuild | 139 +++++++++++++++++++++++++++++++++++
 2 files changed, 140 insertions(+)

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 83d4442..d7c5459 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -6,3 +6,4 @@ DIST ardour-3.5.380.tar.gz 8580892 SHA256 476829114565b56f6dd9f05d1e93752d36db6d
 DIST ardour-3.5.403.tar.gz 8583763 SHA256 46490623479d9a25e2ab98b817c1f5c42b1d042f62afba1d1828d869a0c2d395 SHA512 e00053faf6c4f62dc80c85d82bbdb4b65de2111c9c9efc9d9e03b73be353a7cd652c02a2989566fd30491b1a07d02a7ff15e4523966163cf2e5e4c708a12aac0 WHIRLPOOL 726b66d236a9488a58fe333cbe720bdbd6beaf993d0e738ff8757cf7f657be164d5d0e390da09c773ab3b590c3bcf73be03a358164d54bd19fa7b025ff13118b
 DIST ardour-4.0.tar.gz 9189038 SHA256 ea1131a24774d5f8dcab4ac7ea3b36bd427b1e4d0bef6f3db0681bc4ca131cf1 SHA512 2317c5818fe89386319f12062f0af0d08b07f569d6f775b7ecfa4f3a4bb1f565e05f3ff32f05f591c5628bdd402eda5bce4be4f8fa89da6c2092d5edb2c9ae7a WHIRLPOOL 854145ed135f6b23222ab2d6022e31b09221cac0d326fa17c5ee88e4e8ebd033e69c447fcbac35a925ff23974cc8b2b13c076014118977bbc88836124a912ad4
 DIST ardour-4.1.tar.gz 9247567 SHA256 1d5eac009f3c84aee11c4e7d1c548747cb5a43eddac92b4e640342b79cc808b9 SHA512 5e13301ca5d8140498256d43729d770c6222b220d2c817651304746a7cc20fe8450b094d978bc9559b9ec7b5a7a95ca1c5131be5b51c78835e75b3b7bbb1be82 WHIRLPOOL 3699ea7f29c9df30ddfa3ad9a1e05f6a3cbccddaf5ae1804679b6c1a50e8b800e14f06760e8d9d44a4ac2631f32db595048640c01b9c967f060bfaee11f28a73
+DIST ardour-4.2.tar.gz 9484009 SHA256 c8af454e974be3222bceb374d5b3d126af6c9766326f7e276acb8ef2fa21cfa4 SHA512 cb1d8144216ff959dac1b371c5ec2b99e0fc2137c105fda5c38460c7f148d7f575761453b24ea5ab7c58139a6839b92ee863c6a5485ab4a009da7c362471a2b3 WHIRLPOOL f9d7df4687c4d1a402c43ba43acee9f3b1423f8dcc691ef69590554f49530be5df0ef57f0f20b67ba0efb50690cdc744015f1917bb2051857d496c5cf000f948

diff --git a/media-sound/ardour/ardour-4.2.ebuild b/media-sound/ardour/ardour-4.2.ebuild
new file mode 100644
index 0000000..4830a49
--- /dev/null
+++ b/media-sound/ardour/ardour-4.2.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+
+inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="http://ardour.org/"
+
+if [ ${PV} = 9999 ]; then
+	KEYWORDS=""
+	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
+	inherit git-2
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-2"
+SLOT="4"
+IUSE="altivec doc jack lv2 cpu_flags_x86_sse"
+
+RDEPEND="media-libs/aubio
+	media-libs/liblo
+	sci-libs/fftw:3.0
+	media-libs/freetype:2
+	>=dev-libs/glib-2.10.1:2
+	>=dev-cpp/glibmm-2.32.0
+	>=x11-libs/gtk+-2.8.1:2
+	>=dev-libs/libxml2-2.6:2
+	>=media-libs/libsndfile-1.0.18
+	>=media-libs/libsamplerate-0.1
+	>=media-libs/rubberband-1.6.0
+	>=media-libs/libsoundtouch-1.6.0
+	media-libs/flac
+	media-libs/raptor:2
+	>=media-libs/liblrdf-0.4.0-r20
+	>=gnome-base/libgnomecanvas-2
+	media-libs/vamp-plugin-sdk
+	dev-libs/libxslt
+	dev-libs/libsigc++:2
+	>=dev-cpp/gtkmm-2.16:2.4
+	>=dev-cpp/libgnomecanvasmm-2.26:2.6
+	media-libs/alsa-lib
+	x11-libs/pango
+	x11-libs/cairo
+	media-libs/libart_lgpl
+	virtual/libusb:0
+	dev-libs/boost:=
+	>=media-libs/taglib-1.7
+	net-misc/curl
+	jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
+	lv2? (
+		>=media-libs/slv2-0.6.1
+		media-libs/lilv
+		media-libs/sratom
+		dev-libs/sord
+		>=media-libs/suil-0.6.10
+		>=media-libs/lv2-1.4.0
+	)"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	>=media-sound/jack-audio-connection-kit-0.120
+	sys-devel/gettext
+	doc? ( app-doc/doxygen[dot] )"
+	if ! [ ${PV} = 9999 ]; then
+		DEPEND="${DEPEND}"
+	fi
+
+src_unpack() {
+	if [ ${PV} = 9999 ]; then
+		git-2_src_unpack
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare(){
+	if ! [ ${PV} = 9999 ]; then
+		epatch "${FILESDIR}"/${PN}-4.0-revision-naming.patch
+		touch "${S}/libs/ardour/revision.cc"
+	fi
+	$(use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch)
+	epatch "${FILESDIR}"/${PN}-3.5.403-sse.patch
+	sed -e 's/'FLAGS\'\,\ compiler_flags'/'FLAGS\'\,\ program_flags'/g' -i "${S}"/wscript
+	sed -e 's/'compiler_flags.append\ \(\'-DPROGRAM_'/'program_flags.append\ \(\'-DPROGRAM_'/g' -i "${S}"/wscript
+	sed -e '/compiler_flags\ \=\ \[\]/a \ \ \ \ program_flags\ \=\ \[\]' -i "${S}"/wscript
+	append-flags "-lboost_system"
+}
+
+src_configure() {
+	if use cpu_flags_x86_sse; then
+		MARCH=$(get-flag march)
+		for ARCHWOSSE in i686 i486; do
+			if [[ ${MARCH} = ${ARCHWOSSE} ]]; then
+				for SSEOPT in -msse -msse2 -msse3 -mssse3 -msse4 -msse4.1 -msse4.2; do
+					is-flag ${SSEOPT} && SSEON="yes"
+				done
+				if [ -z ${SSEON} ]; then
+					append-flags -msse
+					elog "You enabled sse but use an march that does not support sse!"
+					elog "We add -msse to the cflags now, but please consider switching your march in make.conf!"
+				fi
+			fi
+		done
+	fi
+	tc-export CC CXX
+	mkdir -p "${D}"
+	waf-utils_src_configure \
+		--destdir="${D}" \
+		--prefix=/usr \
+		--configdir=/etc \
+		--optimize \
+		--nls \
+		$(use jack && echo "--with-backends=alsa,jack" || echo "--with-backends=alsa  --libjack=weak") \
+		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
+		$(use doc && echo "--docs")
+}
+
+src_install() {
+	waf-utils_src_install
+	mv ${PN}.1 ${PN}${SLOT}.1
+	doman ${PN}${SLOT}.1
+	newicon icons/icon/ardour_icon_mac.png ${PN}${SLOT}.png
+	make_desktop_entry ardour4 ardour4 ardour4 AudioVideo
+}
+
+pkg_postinst() {
+	elog "If you are using Ardour and want to keep its development alive"
+	elog "then please consider to do a donation upstream at ardour.org. Thanks!"
+}


^ permalink raw reply related	[flat|nested] 118+ messages in thread

end of thread, other threads:[~2024-09-15 10:27 UTC | newest]

Thread overview: 118+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-22 16:38 [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/ Andreas Schuerch
  -- strict thread matches above, loose matches on Subject: below --
2024-09-15 10:27 Miroslav Šulc
2024-09-13  7:17 Miroslav Šulc
2024-08-20 10:37 Miroslav Šulc
2024-08-19 10:51 Arthur Zamarin
2024-07-20  9:55 Miroslav Šulc
2024-05-18  9:54 Miroslav Šulc
2024-05-17 13:05 Sam James
2024-04-15  7:37 Miroslav Šulc
2024-04-12  9:13 Miroslav Šulc
2024-03-27  8:34 Miroslav Šulc
2024-03-25 10:13 Sam James
2024-02-29  0:51 Sam James
2024-02-21  9:53 Miroslav Šulc
2024-01-13 13:01 Miroslav Šulc
2024-01-13 12:49 Arthur Zamarin
2023-12-13 22:46 Miroslav Šulc
2023-11-22 11:16 Arthur Zamarin
2023-10-21  8:12 Miroslav Šulc
2023-10-15 21:09 Miroslav Šulc
2023-10-09 11:33 Miroslav Šulc
2023-10-08  8:58 Miroslav Šulc
2023-10-03 22:02 Miroslav Šulc
2023-10-03 21:51 Miroslav Šulc
2023-10-03 21:51 Miroslav Šulc
2023-10-03 21:34 Miroslav Šulc
2023-10-03 21:18 Miroslav Šulc
2023-10-03 21:17 Miroslav Šulc
2023-10-03 19:05 Miroslav Šulc
2023-09-24  7:48 Miroslav Šulc
2023-09-06 18:43 WANG Xuerui
2023-09-06 18:43 WANG Xuerui
2023-07-26 23:11 Sam James
2023-06-25  7:21 Miroslav Šulc
2023-05-30  5:50 Miroslav Šulc
2023-05-29 17:57 Arthur Zamarin
2023-05-29 17:57 Arthur Zamarin
2023-05-29 13:11 Andreas Sturmlechner
2023-05-29 13:11 Andreas Sturmlechner
2023-05-21  7:46 Miroslav Šulc
2023-04-28  6:45 Miroslav Šulc
2023-02-27  6:30 Miroslav Šulc
2023-02-16  9:48 Miroslav Šulc
2022-12-14  8:09 Miroslav Šulc
2022-11-04  7:40 Miroslav Šulc
2022-10-16  4:53 Miroslav Šulc
2022-10-16  4:53 Miroslav Šulc
2022-09-18 13:34 Miroslav Šulc
2022-09-10  8:41 Sam James
2022-07-15  7:58 David Seifert
2022-03-20 21:55 Sam James
2021-11-18  8:35 Miroslav Šulc
2021-09-24  7:23 Miroslav Šulc
2021-09-24  7:00 Agostino Sarubbo
2021-09-23 13:58 Agostino Sarubbo
2021-08-14 19:53 Miroslav Šulc
2021-08-14  7:11 Miroslav Šulc
2021-08-11  6:47 Miroslav Šulc
2021-08-11  6:43 Agostino Sarubbo
2021-08-07  5:10 Agostino Sarubbo
2021-07-02 19:32 Miroslav Šulc
2021-06-30  6:45 Miroslav Šulc
2021-06-29 21:24 Sam James
2021-06-24 21:47 Sam James
2021-05-22  8:37 Miroslav Šulc
2021-04-18 17:53 Miroslav Šulc
2021-04-18 17:52 Miroslav Šulc
2021-03-29  6:51 Miroslav Šulc
2021-03-28 18:18 Sam James
2021-03-26 21:36 Sam James
2021-02-24 10:53 Miroslav Šulc
2021-02-16  2:12 Matt Turner
2021-01-15  8:49 Miroslav Šulc
2021-01-14 23:59 Sam James
2021-01-13  9:18 Sam James
2021-01-06  8:55 Miroslav Šulc
2021-01-05 20:51 Sam James
2020-12-28 12:10 Miroslav Šulc
2020-12-28 12:10 Miroslav Šulc
2020-12-28 12:10 Miroslav Šulc
2020-12-26  1:14 Sam James
2020-11-25  9:14 Miroslav Šulc
2020-11-12 12:28 Sam James
2020-10-18 18:06 Thomas Deutschmann
2020-10-12  7:31 Miroslav Šulc
2020-09-20 12:51 Sam James
2020-09-16 17:10 Miroslav Šulc
2020-09-12 10:20 Miroslav Šulc
2020-09-07 18:55 Miroslav Šulc
2020-08-13  8:37 Lars Wendler
2020-08-13  8:37 Lars Wendler
2020-05-28 14:15 Andreas Schuerch
2020-04-04  6:12 Jason A. Donenfeld
2019-10-01 13:47 Andreas Schuerch
2019-09-20 11:16 Andreas Schuerch
2018-07-04 14:45 Andreas Schuerch
2017-11-29 15:27 Andreas Schuerch
2017-11-29 15:18 Andreas Schuerch
2017-07-29 21:47 Michael Weber
2017-05-17 16:32 Andreas Schuerch
2017-05-10  9:04 Alexis Ballier
2017-03-08 12:31 Andreas Schuerch
2017-02-25 15:03 Patrice Clement
2017-02-13 12:36 Andreas Schuerch
2016-12-06  9:48 Lars Wendler
2016-12-05 10:05 Andreas Schuerch
2016-09-19 13:17 Lars Wendler
2016-09-16 12:06 Andreas Schuerch
2016-08-24  7:40 Andreas Schuerch
2016-08-16 16:00 Andreas Schuerch
2016-06-10 15:01 Andreas Schuerch
2016-01-14  6:16 Andreas Schuerch
2016-01-12 13:53 Andreas Schuerch
2015-11-01 12:06 Andreas Schuerch
2015-10-29  8:14 Andreas Schuerch
2015-08-19 11:40 Lars Wendler
2015-08-17 15:39 Ben de Groot
2015-08-15  5:30 Ben de Groot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox