Version bump (bug #505554). Removed old

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

4 files changed, 27 insertions, 82 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/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>