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

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 30 insertions, 81 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/Manifest b/media-sound/lmms/Manifest
index 9ade85e64e5e..c8a3967e2569 100644
--- a/media-sound/lmms/Manifest
+++ b/media-sound/lmms/Manifest
@@ -1,17 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX lmms-0.4.10-unembedfltk.patch 2816 RMD160 36beadffff1c867d682907640cc94715a51491ee SHA1 bdd933b04b556e334dfb66d3f7f9f99b937766a0 SHA256 f2b07178f0979618b8e180e64b0a43bf1ee774b38b418a2e22464c305b38e8a4
-DIST lmms-0.4.12.tar.bz2 14112707 RMD160 534784eca23d653f3cd1ad780c7a4d2c14d223a8 SHA1 680495a87517f90a63b58ea052c369c8ab31bb9a SHA256 14966b8bda69002d07b4e1543cd162196fb50ec4fe1092de520638d6155c56f5
-DIST lmms-0.4.13.tar.bz2 14183574 RMD160 e2ddb1d68c45f72f933c76b2161d9f9aab638a0a SHA1 fbb2232d0cca2751f4395243a474287eb2b5bd2d SHA256 fca4d62f09dc31230870776dce048da51c5ffd4949934cf4bbcdfad65d952082
-EBUILD lmms-0.4.12.ebuild 2001 RMD160 73c997b463bad768058f3abfbef0fa9d5db3326a SHA1 f0921d494b8e61bcca7472cdb42f1f5b91721010 SHA256 00ff88020a83755d8067c2ddc490ba798adc78c05b84d476e88fc748db01edf3
-EBUILD lmms-0.4.13.ebuild 2001 RMD160 f84eab03520ce12a287ee15f89377c7ee041214d SHA1 9c76cbd818b4e3367515834644135a7da384728f SHA256 e992ef6ba8df8ac445983b0ea0b6f6d52827dfdf1d5c671e1d45bd86eeba4334
-MISC ChangeLog 3934 RMD160 62c80830188b0ec4c66218b9a6804c68660b565b SHA1 92c93b4686fd0ff5229312ea268701d9bb8c7ceb SHA256 a84106bf4f23bf41b45188e526a4a08bc157b9824bfb9b0e1e849e209d4885d6
-MISC metadata.xml 598 RMD160 a020f694ec8d17b69a0ba01958e474b3264f1981 SHA1 d4a666e0a5ebb2fec3e4fbf053a8cf30422fec72 SHA256 ce319b79bf0fba551bbffe0a1f96e5862a3bbed27e3bce0e38cdc6fe87b8ca78
+AUX lmms-0.4.10-unembedfltk.patch 2816 SHA256 f2b07178f0979618b8e180e64b0a43bf1ee774b38b418a2e22464c305b38e8a4 SHA512 6a25fdbb1f4212c62d01d849c23ffdf465ac602219e5e184a9a5db3985700a3a2ae998d3b293cf4417aa5d3e09648c78195d2016eec7973e64d819d7874f0f05 WHIRLPOOL b10b201b724bfd6415b23d0ee01efb7e24596a52a7cb6c1240a014b8140cbec086663e633f870174c8e3e4ce985160062d1d8c6b788a9e1ba7500ee7fc646168
+DIST lmms-0.4.13.tar.bz2 14183574 SHA256 fca4d62f09dc31230870776dce048da51c5ffd4949934cf4bbcdfad65d952082
+EBUILD lmms-0.4.13-r1.ebuild 2047 SHA256 a32d4cb4a6d42bf7a001af58cf6c4d2b8c2ea8b83b583a78c9b5065983642f27 SHA512 55ab346b6b4144cb29b97b13f22141830149c0e2f5069f38c23533a9e3b7ca597cf115439c3092cfbfc43333031921ba3253929618bad1846a9bda72eaddc6d8 WHIRLPOOL 96103a42c6a94a6f5d625b4256fa090d92b4ea896678922d6d7bb9dbb01f9cb6b45bc6315cecd9c793075507342de09c2472603b4e7843f5fab89e06111fb2f3
+MISC ChangeLog 4192 SHA256 eed395c9d6166ed3a17d03a5905df904e43afcfedcba263edd38067983bf3009 SHA512 8eefb02d377dad3e6ee6b919b727beb8ae839fb8b11f7f552d9ea44fa7590d2e1d1fcd701d12a484185db6489f26da95df6320f6e0ff3d186d5fa782f4863293 WHIRLPOOL bba1f5f2f804107768a3fef94908b9b0f813f8dbe4da54700c67508e71aadd7b585918307fa22fee9a92b6a1e2e6cff0c52bcdbab3cd80c337bb0e63acf8b2f3
+MISC metadata.xml 598 SHA256 ce319b79bf0fba551bbffe0a1f96e5862a3bbed27e3bce0e38cdc6fe87b8ca78 SHA512 479bdaafc299f5a75a7e6163f7a96c51058a2ef2dd5beb679d2f90d4b6ac10b19356a29b8102e80b404f9c832ea811840752cb7e35e90383c7b1e430b7411bae WHIRLPOOL e4744428df76901b73d18aab8140b89a51974d25261a4823b938a88a00fc043ead39733246d2e54f8d388c7852340da104c8c13059bf89a765cd3dbca0192785
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk86U2EACgkQvFcC4BYPU0opMwCgyvJDSE1qUV38942L0PllHlbb
-xtQAoKyts96XYSoGwTq88UXe8BWTb5lq
-=+4mr
+iQIcBAEBCAAGBQJQFnz+AAoJEPiazRVxLXTFhmgP/0T3RqTL/rnPCoo4GEf3jeZK
+wZDN34oGyG51pk2l3uXC7DYzMwiQhJDlhFValb5dHP4XO7eti6lXd+7NSvoOnasM
+s5i2UBAi36mHxsZuXev5Iu4qxU0gdJN50+uctfroK6q41TRMJsy0jf3uWI91fvoE
+Bt/s4+Escgb3YNGqydOJu5NYL28oF2T7ZLKhS3YgDXItTN1M8TNz7+8sT9w1VfUD
+qIuLEX/fbv+jx+IFtSDd7qVPlyz6Cbpe41lnK9OGenww8PcA2hqFRT7AyhaUnO6g
+fIqGf1dWAt/Yi1lbdiRLGIbBealkQ3s9hi5eiY3pVXA+yklzOO/cT9xb91s0k8JX
+0Xn6ZnJDGZqsasIfHcGSeEs2yUdgWEf7g+IX9AbC6FUZT5hC9KXMtYmD6TW/aW2L
+D4xcoWGCAihlg7G/ewPSxmK8see3infI/6185SmoJ7IbtLEhvnv+9nNs9vDVmGc7
+atkvGvIrww5f77SmG4sTrbCB3ZmRgKEWA/R9J4IZfNcwDPu4Y+lAbOAAQoWt27Lh
+KWQZGTHfMeDfj6o5Pzp6WU/E23CmvLL1HC34mfpSTT6BxGxuQbGDirs07J8IuXNa
+/CzAp4P1u3CUFgpeZIvy7Xaja1+Mx1rb+6PZpssDyMnfPlOanM38NxqvHMvZ8APK
+ZiXBFBFrak7u81cGPCBI
+=ev64
 -----END PGP SIGNATURE-----
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)