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

[Miroslav Šulc]

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 \