Version bump. Removed old

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

4 files changed, 8 insertions, 122 deletions

diff --git a/media-sound/lmms/ChangeLog b/media-sound/lmms/ChangeLog
index 79fd5bf5e41a..179bdabb65e2 100644
--- a/media-sound/lmms/ChangeLog
+++ b/media-sound/lmms/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/lmms
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lmms/ChangeLog,v 1.35 2014/05/09 06:51:32 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lmms/ChangeLog,v 1.36 2014/07/29 16:06:31 polynomial-c Exp $
+
+*lmms-1.0.3 (29 Jul 2014)
+
+  29 Jul 2014; Lars Wendler <polynomial-c@gentoo.org> -lmms-0.4.15.ebuild,
+  -lmms-1.0.1.ebuild, +lmms-1.0.3.ebuild, -files/lmms-0.4.14-unembedfltk.patch:
+  Version bump. Removed old.
 
 *lmms-1.0.2 (09 May 2014)
 
diff --git a/media-sound/lmms/files/lmms-0.4.14-unembedfltk.patch b/media-sound/lmms/files/lmms-0.4.14-unembedfltk.patch
deleted file mode 100644
index ba46562109f5..000000000000
--- a/media-sound/lmms/files/lmms-0.4.14-unembedfltk.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Index: lmms-0.4.14/plugins/zynaddsubfx/CMakeLists.txt
-===================================================================
---- lmms-0.4.14.orig/plugins/zynaddsubfx/CMakeLists.txt
-+++ lmms-0.4.14/plugins/zynaddsubfx/CMakeLists.txt
-@@ -45,7 +45,11 @@ IF(LMMS_BUILD_WIN32)
- 	ADD_DEFINITIONS(-DPTW32_STATIC_LIB)
- ENDIF(LMMS_BUILD_WIN32)
- 
--INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/fltk/ ${CMAKE_CURRENT_SOURCE_DIR} ${FFTW3F_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} )
-+set(FLTK_SKIP_OPENGL true)
-+set(FLTK_SKIP_FORMS true)
-+set(FLTK_SKIP_IMAGES true)
-+FIND_PACKAGE(FLTK)
-+INCLUDE_DIRECTORIES(${FLTK_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${FFTW3F_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} )
- 
- set(ZASF_CORE_LIBS
-     zynaddsubfx_input
-@@ -98,7 +102,7 @@ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL
- SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
- ADD_EXECUTABLE(RemoteZynAddSubFx RemoteZynAddSubFx.cpp ${ZYN_SRC_GUI} ${WINRC})
- INSTALL(TARGETS RemoteZynAddSubFx RUNTIME DESTINATION ${PLUGIN_DIR})
--TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -lpthread -L${CMAKE_CURRENT_BINARY_DIR} -lZynAddSubFxCore ${CMAKE_CURRENT_BINARY_DIR}/fltk/lib/libfltk.a)
-+TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -lpthread -L${CMAKE_CURRENT_BINARY_DIR} -lZynAddSubFxCore ${FLTK_LIBRARIES})
- ADD_DEPENDENCIES(RemoteZynAddSubFx ZynAddSubFxCore)
- 
- # link system libraries when on win32
-@@ -106,25 +110,7 @@ IF(LMMS_BUILD_WIN32)
- 	TARGET_LINK_LIBRARIES(RemoteZynAddSubFx ${QT_LIBRARIES} -lole32 -luuid -lcomctl32 -lgdi32 -lws2_32)
- ENDIF(LMMS_BUILD_WIN32)
- 
--# FLTK needs X
--IF(LMMS_BUILD_LINUX)
--	FIND_PACKAGE(X11)
--	FIND_PACKAGE(Freetype)
--	TARGET_LINK_LIBRARIES(RemoteZynAddSubFx -ldl ${X11_LIBRARIES} ${X11_Xft_LIB} ${X11_Xinerama_LIB} ${FREETYPE_LIBRARY} -lfontconfig)
--ENDIF(LMMS_BUILD_LINUX)
--
--
- IF(LMMS_BUILD_WIN32)
- 	ADD_CUSTOM_COMMAND(TARGET ZynAddSubFxCore POST_BUILD COMMAND ${STRIP} ${CMAKE_CURRENT_BINARY_DIR}/libZynAddSubFxCore.dll)
- 	ADD_CUSTOM_COMMAND(TARGET RemoteZynAddSubFx POST_BUILD COMMAND ${STRIP} ${CMAKE_CURRENT_BINARY_DIR}/RemoteZynAddSubFx.exe)
- ENDIF(LMMS_BUILD_WIN32)
--
--# build FLTK
--IF(LMMS_BUILD_WIN64)
--	SET(FLTK_EXTRA_FLAGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/cmake/modules/Win64Toolchain.cmake")
--ELSEIF(LMMS_BUILD_WIN32)
--	SET(FLTK_EXTRA_FLAGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_SOURCE_DIR}/cmake/modules/Win32Toolchain.cmake")
--ENDIF(LMMS_BUILD_WIN64)
--ADD_CUSTOM_TARGET(libfltk COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/fltk && cd ${CMAKE_CURRENT_BINARY_DIR}/fltk && ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR}/fltk ${FLTK_EXTRA_FLAGS} -DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/cmake/modules/ -DFLTK_USE_SYSTEM_ZLIB:BOOL=ON -DFLTK_USE_SYSTEM_JPEG:BOOL=ON -DFLTK_USE_SYSTEM_PNG:BOOL=ON -DOPTION_BUILD_EXAMPLES:BOOL=OFF -DCMAKE_BUILD_TYPE=release && ${CMAKE_BUILD_TOOL})
--
--ADD_DEPENDENCIES(RemoteZynAddSubFx libfltk)
diff --git a/media-sound/lmms/lmms-0.4.15.ebuild b/media-sound/lmms/lmms-0.4.15.ebuild
deleted file mode 100644
index 87faacc169d8..000000000000
--- a/media-sound/lmms/lmms-0.4.15.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.15.ebuild,v 1.1 2013/06/27 13:23:23 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 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 )
-	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.14-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 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-1.0.1.ebuild b/media-sound/lmms/lmms-1.0.3.ebuild
index d97c5dd2b8c7..28d556273995 100644
--- a/media-sound/lmms/lmms-1.0.1.ebuild
+++ b/media-sound/lmms/lmms-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # 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-1.0.1.ebuild,v 1.1 2014/05/05 07:47:38 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lmms/lmms-1.0.3.ebuild,v 1.1 2014/07/29 16:06:31 polynomial-c Exp $
 
 EAPI=5