Revision bump to fix security bug #341567 and remove old.

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

4 files changed, 37 insertions, 75 deletions

diff --git a/media-sound/ardour/ChangeLog b/media-sound/ardour/ChangeLog
index 88b54da15a85..f9735a7c5864 100644
--- a/media-sound/ardour/ChangeLog
+++ b/media-sound/ardour/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/ardour
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.92 2011/04/30 10:06:58 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.93 2011/04/30 19:53:52 radhermit Exp $
+
+*ardour-2.8.11-r1 (30 Apr 2011)
+
+  30 Apr 2011; Tim Harder <radhermit@gentoo.org> -ardour-2.8.7.ebuild,
+  -ardour-2.8.11.ebuild, +ardour-2.8.11-r1.ebuild,
+  +files/ardour-2.8.11-ldpath.patch:
+  Revision bump to fix security bug #341567 and remove old.
 
 *ardour-2.8.11 (30 Apr 2011)
 
diff --git a/media-sound/ardour/ardour-2.8.11.ebuild b/media-sound/ardour/ardour-2.8.11-r1.ebuild
index 81d8cb9575bf..e1e1d2671cc6 100644
--- a/media-sound/ardour/ardour-2.8.11.ebuild
+++ b/media-sound/ardour/ardour-2.8.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-2.8.11.ebuild,v 1.1 2011/04/30 10:06:58 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-2.8.11-r1.ebuild,v 1.1 2011/04/30 19:53:52 radhermit Exp $
 
 EAPI=4
 
@@ -53,6 +53,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-flags.patch \
 		"${FILESDIR}"/${P}-syslibs.patch \
 		"${FILESDIR}"/${P}-type.patch \
+		"${FILESDIR}"/${P}-ldpath.patch \
 		"${FILESDIR}"/${P}-gcc46.patch
 }
 
diff --git a/media-sound/ardour/ardour-2.8.7.ebuild b/media-sound/ardour/ardour-2.8.7.ebuild
deleted file mode 100644
index 2afaef80b1f6..000000000000
--- a/media-sound/ardour/ardour-2.8.7.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-2.8.7.ebuild,v 1.4 2011/03/28 18:34:32 angelos Exp $
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="altivec curl debug nls lv2 sse"
-
-# FIXME: Bundled libraries in libs/
-RDEPEND="media-libs/aubio
-	media-libs/liblo
-	lv2? ( >=media-libs/slv2-0.6.1 )
-	sci-libs/fftw:3.0
-	media-libs/freetype:2
-	>=dev-libs/glib-2.10.1: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/libsoundtouch
-	media-libs/flac
-	>=media-libs/raptor-1.4.2:0
-	>=media-libs/liblrdf-0.4
-	>=media-sound/jack-audio-connection-kit-0.109
-	>=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
-	curl? ( net-misc/curl )"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	dev-util/pkgconfig
-	>=dev-util/scons-1
-	nls? ( sys-devel/gettext )"
-
-ardour_use_enable() {
-	use ${2} && echo "${1}=1" || echo "${1}=0"
-}
-
-src_compile() {
-	local FPU_OPTIMIZATION=$((use altivec || use sse) && echo 1 || echo 0)
-	tc-export CC CXX
-	mkdir -p "${D}"
-
-	scons \
-		CFLAGS="${CFLAGS}" \
-		$(ardour_use_enable DEBUG debug) \
-		DESTDIR="${D}" \
-		$(ardour_use_enable FREESOUND curl) \
-		FPU_OPTIMIZATION="${FPU_OPTIMIZATION}" \
-		$(ardour_use_enable NLS nls) \
-		PREFIX=/usr \
-		SYSLIBS=1 \
-		$(ardour_use_enable LV2 lv2) \
-		|| die
-}
-
-src_install() {
-	scons install || die
-	newicon icons/icon/ardour_icon_mac.png ${PN}.png
-	make_desktop_entry ardour2 Ardour
-}
diff --git a/media-sound/ardour/files/ardour-2.8.11-ldpath.patch b/media-sound/ardour/files/ardour-2.8.11-ldpath.patch
new file mode 100644
index 000000000000..16e1cd3d9859
--- /dev/null
+++ b/media-sound/ardour/files/ardour-2.8.11-ldpath.patch
@@ -0,0 +1,27 @@
+--- ardour-2.8.11.orig/gtk2_ardour/ardev_common.sh.in
++++ ardour-2.8.11/gtk2_ardour/ardev_common.sh.in
+@@ -11,9 +11,9 @@
+     echo USING OLD CLEARLOOKS
+     export GTK_PATH=~/.ardour2:libs/clearlooks-older
+ fi
+-export VAMP_PATH=libs/vamp-plugins:$VAMP_PATH
++export VAMP_PATH=libs/vamp-plugins${VAMP_PATH:+:$VAMP_PATH}
+ 
+-export LD_LIBRARY_PATH=libs/vamp-sdk:libs/surfaces/control_protocol:libs/ardour:libs/midi++2:libs/pbd:libs/rubberband:libs/soundtouch:libs/gtkmm2ext:libs/sigc++2:libs/glibmm2:libs/gtkmm2/atk:libs/gtkmm2/pango:libs/gtkmm2/gdk:libs/gtkmm2/gtk:libs/libgnomecanvasmm:libs/libsndfile:libs/appleutility:$LD_LIBRARY_PATH
++export LD_LIBRARY_PATH=libs/surfaces/control_protocol:libs/ardour:libs/midi++2:libs/pbd:libs/gtkmm2ext${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ 
+ # DYLD_LIBRARY_PATH is for darwin.
+ export DYLD_FALLBACK_LIBRARY_PATH=$LD_LIBRARY_PATH
+--- ardour-2.8.11.orig/gtk2_ardour/ardour.sh.in
++++ ardour-2.8.11/gtk2_ardour/ardour.sh.in
+@@ -1,8 +1,8 @@
+ #!/bin/sh
+ 
+-export GTK_PATH=%INSTALL_PREFIX%/%LIBDIR%/ardour2:$GTK_PATH
++export GTK_PATH=%INSTALL_PREFIX%/%LIBDIR%/ardour2${GTK_PATH:+:$GTK_PATH}
+ 
+-export LD_LIBRARY_PATH=%INSTALL_PREFIX%/%LIBDIR%/ardour2:$LD_LIBRARY_PATH 
++export LD_LIBRARY_PATH=%INSTALL_PREFIX%/%LIBDIR%/ardour2${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ # DYLD_LIBRARY_PATH is for Darwin
+ export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH
+