Fixed plugins search path "/usr/usr" (bug #417615). Removed old version

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

3 files changed, 10 insertions, 69 deletions

diff --git a/media-sound/lmms/ChangeLog b/media-sound/lmms/ChangeLog
index 5aa2ff31e6b1..384d70c02a41 100644
--- a/media-sound/lmms/ChangeLog
+++ b/media-sound/lmms/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/lmms
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lmms/ChangeLog,v 1.24 2012/02/14 12:28:11 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lmms/ChangeLog,v 1.25 2012/07/30 12:24:25 polynomial-c Exp $
+
+*lmms-0.4.13-r1 (30 Jul 2012)
+
+  30 Jul 2012; Lars Wendler <polynomial-c@gentoo.org> -lmms-0.4.12.ebuild,
+  -lmms-0.4.13.ebuild, +lmms-0.4.13-r1.ebuild:
+  non-maintainer commit: Fixed plugins search path "/usr/usr" (bug #417615).
+  Removed old version.
 
 *lmms-0.4.13 (14 Feb 2012)
 
diff --git a/media-sound/lmms/lmms-0.4.12.ebuild b/media-sound/lmms/lmms-0.4.12.ebuild
deleted file mode 100644
index 999c37d98a01..000000000000
--- a/media-sound/lmms/lmms-0.4.12.ebuild
+++ /dev/null
@@ -1,67 +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/lmms/lmms-0.4.12.ebuild,v 1.1 2011/08/07 11:55:31 aballier Exp $
-
-EAPI="2"
-
-inherit eutils cmake-utils
-
-DESCRIPTION="Free alternative to popular programs such as Fruityloops, Cubase and Logic"
-HOMEPAGE="http://lmms.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="alsa debug fftw fluidsynth jack ogg portaudio pulseaudio sdl stk vst"
-
-RDEPEND="x11-libs/qt-core:4
-	x11-libs/qt-gui:4[accessibility]
-	>=media-libs/libsndfile-1.0.11
-	>=media-libs/libsamplerate-0.1.7
-	x11-libs/libXinerama
-	alsa? ( media-libs/alsa-lib )
-	fftw? ( sci-libs/fftw:3.0 >=x11-libs/fltk-1.3.0_rc3:1 )
-	jack? ( >=media-sound/jack-audio-connection-kit-0.99.0 )
-	ogg? ( media-libs/libvorbis
-			media-libs/libogg )
-	fluidsynth? ( media-sound/fluidsynth )
-	portaudio? ( >=media-libs/portaudio-19_pre )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl
-			>=media-libs/sdl-sound-1.0.1 )
-	stk? ( media-libs/stk )
-	vst? ( app-emulation/wine )"
-DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.4.5"
-RDEPEND="${RDEPEND}
-	media-plugins/swh-plugins
-	media-plugins/caps-plugins
-	media-plugins/tap-plugins
-	media-libs/ladspa-cmt"
-
-DOCS="README AUTHORS TODO"
-
-PATCHES=( "${FILESDIR}/${PN}-0.4.10-unembedfltk.patch" )
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		-DWANT_SYSTEM_SR=TRUE
-		-DWANT_CAPS=FALSE
-		-DWANT_TAP=FALSE
-		-DWANT_SWH=FALSE
-		-DWANT_CMT=FALSE
-		-DWANT_CALF=TRUE
-		$(cmake-utils_use_want alsa ALSA)
-		$(cmake-utils_use_want fftw FFTW3F)
-		$(cmake-utils_use_want jack JACK)
-		$(cmake-utils_use_want ogg OGGVORBIS)
-		$(cmake-utils_use_want portaudio PORTAUDIO)
-		$(cmake-utils_use_want pulseaudio PULSEAUDIO)
-		$(cmake-utils_use_want sdl SDL)
-		$(cmake-utils_use_want stk STK)
-		$(cmake-utils_use_want vst VST)
-		$(cmake-utils_use_want fluidsynth SF2)"
-	cmake-utils_src_configure
-}
diff --git a/media-sound/lmms/lmms-0.4.13.ebuild b/media-sound/lmms/lmms-0.4.13-r1.ebuild
index b7588495a50a..681d999f1434 100644
--- a/media-sound/lmms/lmms-0.4.13.ebuild
+++ b/media-sound/lmms/lmms-0.4.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lmms/lmms-0.4.13.ebuild,v 1.1 2012/02/14 12:28:11 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lmms/lmms-0.4.13-r1.ebuild,v 1.1 2012/07/30 12:24:25 polynomial-c Exp $
 
 EAPI="2"
 
@@ -53,6 +53,7 @@ src_configure() {
 		-DWANT_SWH=FALSE
 		-DWANT_CMT=FALSE
 		-DWANT_CALF=TRUE
+		-DCMAKE_INSTALL_LIBDIR=$(get_libdir)
 		$(cmake-utils_use_want alsa ALSA)
 		$(cmake-utils_use_want fftw FFTW3F)
 		$(cmake-utils_use_want jack JACK)