Version bump (bug #505554). Removed old

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

5 files changed, 45 insertions, 92 deletions

diff --git a/media-sound/lmms/ChangeLog b/media-sound/lmms/ChangeLog
index 83abbcdaa3da..9455245d3df6 100644
--- a/media-sound/lmms/ChangeLog
+++ b/media-sound/lmms/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/lmms
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lmms/ChangeLog,v 1.30 2013/06/27 13:23:23 aballier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lmms/ChangeLog,v 1.31 2014/04/27 09:26:37 polynomial-c Exp $
+
+*lmms-1.0.0 (27 Apr 2014)
+
+  27 Apr 2014; Lars Wendler <polynomial-c@gentoo.org> -lmms-0.4.13-r1.ebuild,
+  -lmms-0.4.14.ebuild, +lmms-1.0.0.ebuild, metadata.xml:
+  Version bump (bug #505554). Refactored dependencies a bit and added new
+  co-maintainer and myself as maintainer. Removed old.
 
 *lmms-0.4.15 (27 Jun 2013)
 
diff --git a/media-sound/lmms/Manifest b/media-sound/lmms/Manifest
index a65bde615e9b..365abb945f9e 100644
--- a/media-sound/lmms/Manifest
+++ b/media-sound/lmms/Manifest
@@ -3,18 +3,26 @@ Hash: SHA256
 
 AUX lmms-0.4.10-unembedfltk.patch 2816 SHA256 f2b07178f0979618b8e180e64b0a43bf1ee774b38b418a2e22464c305b38e8a4 SHA512 6a25fdbb1f4212c62d01d849c23ffdf465ac602219e5e184a9a5db3985700a3a2ae998d3b293cf4417aa5d3e09648c78195d2016eec7973e64d819d7874f0f05 WHIRLPOOL b10b201b724bfd6415b23d0ee01efb7e24596a52a7cb6c1240a014b8140cbec086663e633f870174c8e3e4ce985160062d1d8c6b788a9e1ba7500ee7fc646168
 AUX lmms-0.4.14-unembedfltk.patch 2871 SHA256 233ba5746056fd25d9a4b4b2af97a68e14a280b355a5ba290fecfb230176882b SHA512 048ea92481cc1ad9b42bf193af0643159af07df4ace74bd2eb2119e8b5a1b6f9b8af3f9880cc53f211f353f177378694c2525152028f4603e8bbf84cf9e35a77 WHIRLPOOL 222b5fcfa77f753fbd8464a8ec37fed560992c17a5aa96fe2ace802486cd17a99920de0d22c114fd9afd7a2b9b560d1b8f1ad7e74c8e6c7427f7e35f9154d715
-DIST lmms-0.4.13.tar.bz2 14183574 SHA256 fca4d62f09dc31230870776dce048da51c5ffd4949934cf4bbcdfad65d952082 SHA512 07bb6cf23d96d95eb3482e2d802758b486ad5fa412a0d1093f4398b7034f4d95c6567eacff1d9b38bfb1b2dce310441abe50d00fac405531ff717e246fcadee7 WHIRLPOOL 14f7d84c109312e551132f4c7b4a8076046bfa8d8a5242e0790efb3f07fa61643070b6c37af2408f2ec027026c2a5c1c8e242ad42045fff21c792b7009f90b24
-DIST lmms-0.4.14.tar.bz2 14213318 SHA256 2cdf65009682112107270be09e030fc9db4a467838b2ec39669cc39ade66ec69 SHA512 4b8724d3262d82f8fa02586a6c908bafa1b2631e0e91a9cbb6e6bf344d4c1e448ef9830048b8c55062fe7e88d326b65991712f36af79f92e73d37a33be24118f WHIRLPOOL f5bc3de1bca545a066cd9ccea2ff1ce68a6257daae9cafb9230d99717b87a4179d7a59fe4e8375f9e67cfadeb4520460af068db6dbf5e653f234a487284a1ad9
 DIST lmms-0.4.15.tar.bz2 14211150 SHA256 0104caaea8adf7b51b0fc4ff2ab26364d1da5751a8fcbf6772704c8ef57a020b SHA512 cb9ae23d25d301f3fcc3c075a2426569a234c32353bc256db8360fe52b8d422b519452c3bb3a97d6a7a90a8cbc7e6ad66141bcda59e683aab2f731d2a4ee4358 WHIRLPOOL 11cdde5c2f01eb6a65c74ebb3550ed5d9ce4451a2e777e62ae4340fdb6a8d00b6b4f0daa07655440163397e485e188582f05f1b6fcecb058bca2fd05a39b3163
-EBUILD lmms-0.4.13-r1.ebuild 2037 SHA256 faee1bf2f20f5c1a4842b8f29d58ed71026ba68a213486c5f8846d371774cbad SHA512 626a5cd9df248df2ff75710726f80cde232a419406866de98cc85c3371e9cc8f32061a4f99be7b1b86783c2a1ad0413df1fdba82c4188ca0d548e15302bd8a0a WHIRLPOOL 5ba3f9696238e5657ceab2b4679c56042ea3330c41b02a860cc71d1c8da1d9bca7cd263e355b1560e865e019864df2b3454561629e9d1270b44c85e7b6889fc9
-EBUILD lmms-0.4.14.ebuild 1982 SHA256 408a10a1fd03563d7553abd80c4ac0d5aecb9ca00f9404f25c172599e3bc0793 SHA512 57c524866681a9fd64f95e80e7b3171d394e9e76cfb237794cb87c02b85e1d6c701f32bc890c95cf35786b253add2b019204e9535b4cbe8b0438d09dc9b6cdbe WHIRLPOOL ae3db97e27d286ac393cafff4d8d3e59c0bf2fea374353a92acebdabac20bef4cf432b48e72c52f47e00b53667d3349c64ee8175ee765a5b667313ab4b70ee0d
+DIST lmms-1.0.0-src.tar.bz2 11734507 SHA256 4949cac86ef311165bf75bc66ce3862e26c72d313809d924c932741d2421e7b5 SHA512 28a87a178dcddf16655b667763e579009ffb5291e49ecfe88e25d8d9a4b469018abd30ccc4278f7857c05eed2fb17c14834af29b6130cc846da1ae7647c560db WHIRLPOOL 84e247a15ade7f3b24126711f1c5979020966983fc2c148837941994bf36d581b4c7d24f6df4f54a31670a56f932871f4f07b0aa8a245233a194afd04c0ada70
 EBUILD lmms-0.4.15.ebuild 1982 SHA256 6f333f93af3439d45ca653c611879fffd9823dab4fc237950c686aac5b91a6c9 SHA512 f0265de24461ec27ac3efef3b7ac8cecdc57a03a3c1801dc5e153a92e8b9712795ccf1085d8da157ba6b1da2ad8814c9898607bb743d0eca6097606ca7ba34c7 WHIRLPOOL 0afd7548228e9957d8c25478de995bf2703507dae429688b822f56587a707979864a951f119a588c44d7b04883af31a017fe00513009033c430d8ebf413cef44
-MISC ChangeLog 4895 SHA256 3ff5b59a8e807c806e17cc364ff00876e5ac73af55588713ef164c834ad0e835 SHA512 5467e1b2260da084e2b14d86243570565fd85fb1884e84889ad2f470e3914fd71bfb5c8dbbfd8358b13d99aae59d374d8b1f1edcef6e5c3b1a9e1be692c4f544 WHIRLPOOL 0e3d1ae57b58c1a099b39660cba7975e83088f36932b7b9a22144606a92e8b3bae31be24f6d6000e56cd6adee38c78dfabb32d76744a358f880658c8ecbc93d8
-MISC metadata.xml 629 SHA256 443b6bcca07513f3b649c9a610e372a38d6af6b6677c3a0557d327c55b5abcb5 SHA512 8d0c62b4924cf7510420b109727bb9036720be234e343162a6cbbe16605eba76e4516d5cfae06ea823c71545738e54c06422289c2dd840399d29729d7019cb73 WHIRLPOOL 980d7123935a507aec64259e214a0039c192be243840a1c4d69e2f4819c981f231ff5e3fc9141109fa3b8866c0a9cdf9b2808b3d5c4607d270f875c18292efa3
+EBUILD lmms-1.0.0.ebuild 1920 SHA256 e809056816353a2c749636febdadc7b5087584976839a84acb9dba467b51f4d5 SHA512 91576354b5a7e46cd176d862a75c989a401a815c31259f12b8f71703e690cf34cb108aa3e12c40f8b8fd0f1d0c7719ed2f9baa45cf6962c49f1dbcfdb6c9b94e WHIRLPOOL 6623e881c91ef80f4961d7db0fae4a9bff4af09a98dbf90f9bc8b1bf4a18555883e5b089f07d4f7526eedb159b5c1b0883c44a60833821afb7de78545aff49a1
+MISC ChangeLog 5191 SHA256 ce6b0787396582f51606676dbc888437c60b1125c7814ad503e6c30d85bb450f SHA512 f3236f7deb8ddf8f638c98c6a02882090ae7a3e3d00a78cf1e66bf01f9c287464aaac8aa9b491ab4e88711f6769ba165327ca41cda4da0b0d91b9389825e7d51 WHIRLPOOL af7dea96f7030c6fac9e8055a4c9ff3dd434263103a9507b29ad6c959b7d03d2bc68963f655234ee867a377ebca32e6a0b13042a902d1909a85caaa54bf2bd1c
+MISC metadata.xml 826 SHA256 aa4ea3926126cea98273164597775f74fcff32b2d9f608c7a603a856d287eaf5 SHA512 f70a12a0a05a519c52f9ecea7288366d3e727e5d55d1229ef0fa932a7525102dcbf4cadc9eb0f8b5d6cddd374bd8a2a2a40d773d6bbaae70b308acac846db874 WHIRLPOOL 2bee4793736585b405d21aa0df8aa25fc14730ee8504ea120103c2f7f381c92734b05a2c9adcd17b1b9700c7170b86c23e7a76c24ad09498e0d372ff8046c077
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlHMPMwACgkQvFcC4BYPU0regACfdsltnasxbPo74CQ2UiMF0m7y
-i6AAnjX03JML1btXsAjid43/xjYs43Wj
-=2Elo
+iQIcBAEBCAAGBQJTXM1OAAoJEPiazRVxLXTFy50P/1hvbgNTpf/Ghp1OqfwgzSah
+MnZHFX0ChDNNMCp4FZKYAKHQ4LpVxaPMCBSZo3lX5Tog48AYYtm2avjEFe+ei70e
+/wC9iVhvo625D5jsfULTR47k/peaqTP+DdmgktauvefDzHdcqSEht5Aixcl3s72n
+80ufCS15fpqhSGHIDT3szw7Bb4MCGrb9yO/ygo6UDt3eAo3KBcmDLO1laC+30HL+
+Db+AEhqlmmFUMxs6HgN7l4t6BRQogAUv0BTggwXS5Ay0fMupzx4otPZKTm+T2+XD
+ZO3c8Bg9vZUx4EAaCbFvHGcdMtHw7Igf/Am0kcNFfP9sf4NY3Y1BtJOsGk86L58G
+7RKUr314aBmPNFePlbKEXgdq5qQPb5QK1rkrlTf9+W1EgTf2xeEN7dJMVPJ0EV05
+eppJra4V8NJ+JhXJTP4TLql/EzNC5LGdwsl5CfeCKGJAehC08M2vhAcREv1rphjr
+4waXiUW2stxNvte7QDCvEQDLjRj8THRLXOzWu2x8VjhZVI80+q7RIxBAv0VVukMr
+GOQARWhq2/X4BV6B3C8T7bZjs6uBnpePADtHi++ae+LL6/u67isGvmSqyJEIWvYh
+s1o/6eYaOpG3IwPdcGflIBDd/Fl3aaXvlhnc/9nG5PQRdrK4r3qhw6qIZCs1mksS
+9jhj4nizo3HJ3oxx4tIR
+=uq3S
 -----END PGP SIGNATURE-----
diff --git a/media-sound/lmms/lmms-0.4.13-r1.ebuild b/media-sound/lmms/lmms-0.4.13-r1.ebuild
deleted file mode 100644
index 2be1ca3bc110..000000000000
--- a/media-sound/lmms/lmms-0.4.13-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2013 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-r1.ebuild,v 1.2 2013/03/02 21:57:09 hwoarang 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="dev-qt/qtcore:4
-	dev-qt/qtgui: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
-		-DCMAKE_INSTALL_LIBDIR=$(get_libdir)
-		$(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.14.ebuild b/media-sound/lmms/lmms-1.0.0.ebuild
index da64677ac0d2..692217c6bf72 100644
--- a/media-sound/lmms/lmms-0.4.14.ebuild
+++ b/media-sound/lmms/lmms-1.0.0.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lmms/lmms-0.4.14.ebuild,v 1.1 2013/05/08 13:09:35 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lmms/lmms-1.0.0.ebuild,v 1.1 2014/04/27 09:26:37 polynomial-c Exp $
 
-EAPI="2"
+EAPI=5
 
 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"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
@@ -18,20 +18,20 @@ IUSE="alsa debug fluidsynth jack ogg portaudio pulseaudio sdl stk vst"
 
 RDEPEND="dev-qt/qtcore:4
 	dev-qt/qtgui:4[accessibility]
+	>=media-libs/libsamplerate-0.1.8
 	>=media-libs/libsndfile-1.0.11
-	>=media-libs/libsamplerate-0.1.7
-	x11-libs/libXinerama
-	alsa? ( media-libs/alsa-lib )
 	sci-libs/fftw:3.0
+	sys-libs/zlib
 	>=x11-libs/fltk-1.3.0_rc3:1
+	alsa? ( media-libs/alsa-lib )
+	fluidsynth? ( media-sound/fluidsynth )
 	jack? ( >=media-sound/jack-audio-connection-kit-0.99.0 )
 	ogg? ( media-libs/libvorbis
-			media-libs/libogg )
-	fluidsynth? ( media-sound/fluidsynth )
+		media-libs/libogg )
 	portaudio? ( >=media-libs/portaudio-19_pre )
 	pulseaudio? ( media-sound/pulseaudio )
 	sdl? ( media-libs/libsdl
-			>=media-libs/sdl-sound-1.0.1 )
+		>=media-libs/sdl-sound-1.0.1 )
 	stk? ( media-libs/stk )
 	vst? ( app-emulation/wine )"
 DEPEND="${RDEPEND}
@@ -44,8 +44,6 @@ RDEPEND="${RDEPEND}
 
 DOCS="README AUTHORS TODO"
 
-PATCHES=( "${FILESDIR}/${PN}-0.4.14-unembedfltk.patch" )
-
 src_configure() {
 	mycmakeargs="${mycmakeargs}
 		-DWANT_SYSTEM_SR=TRUE
diff --git a/media-sound/lmms/metadata.xml b/media-sound/lmms/metadata.xml
index f54dc6327bca..24b30281e47e 100644
--- a/media-sound/lmms/metadata.xml
+++ b/media-sound/lmms/metadata.xml
@@ -8,9 +8,17 @@
   <name>Alexis Ballier</name>
 </maintainer>
 <maintainer>
+  <email>polynomial-c@gentoo.org</email>
+  <name>Lars Wendler</name>
+</maintainer>
+<maintainer>
   <email>gimpel@sonnenkinder.org</email>
   <name>Thomas Kuther</name>
 </maintainer>
+<maintainer>
+  <email>jaquilina@eagleeyet.net</email>
+  <name>Jonathan Aquilina</name>
+</maintainer>
   <use>
     <flag name="fluidsynth">Enables Fluidsynth MIDI software synthesis plugin.</flag>
     <flag name="stk">Enables STK Mallet plugin.</flag>