Version bump.

(Portage version: 2.1.4.4)

4 files changed, 365 insertions, 1 deletions

diff --git a/media-sound/kwave/ChangeLog b/media-sound/kwave/ChangeLog
index 6b96ca3b85c2..3332dce22835 100644
--- a/media-sound/kwave/ChangeLog
+++ b/media-sound/kwave/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/kwave
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kwave/ChangeLog,v 1.6 2008/02/19 01:52:12 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kwave/ChangeLog,v 1.7 2008/07/25 13:26:00 carlo Exp $
+
+*kwave-0.7.11 (25 Jul 2008)
+
+  25 Jul 2008; Carsten Lohrke <carlo@gentoo.org>
+  +files/kwave-0.7.11-build-script-fix.diff,
+  +files/kwave-0.7.11-desktop-entry-fix.diff, +kwave-0.7.11.ebuild:
+  Version bump.
 
   19 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> kwave-0.7.9.ebuild:
   Update kde-base/* dependencies so that KDE 4 doesn't satisfy it. bug 206528.
diff --git a/media-sound/kwave/files/kwave-0.7.11-build-script-fix.diff b/media-sound/kwave/files/kwave-0.7.11-build-script-fix.diff
new file mode 100644
index 000000000000..335f678a8d57
--- /dev/null
+++ b/media-sound/kwave/files/kwave-0.7.11-build-script-fix.diff
@@ -0,0 +1,268 @@
+--- cmake/KwaveKDESupport.cmake.orig	2008-07-24 22:22:11.000000000 +0200
++++ cmake/KwaveKDESupport.cmake	2008-07-24 22:23:06.000000000 +0200
+@@ -35,112 +35,59 @@
+ #############################################################################
+ EXECUTE_PROCESS(
+     COMMAND
+-        ${KDECONFIG_EXECUTABLE} --expandvars --install html
+-    OUTPUT_VARIABLE
+-        KDE3_HTMLDIR
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-)
+-
+-#############################################################################
+-EXECUTE_PROCESS(
+-    COMMAND
+-        ${KDECONFIG_EXECUTABLE} --expandvars --install apps
+-    OUTPUT_VARIABLE
+-        KDE3_APPSDIR
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-)
+-
+-#############################################################################
+-EXECUTE_PROCESS(
+-    COMMAND
+-        ${KDECONFIG_EXECUTABLE} --expandvars --install exe
+-    OUTPUT_VARIABLE
+-        KDE3_EXEDIR
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-)
+-
+-#############################################################################
+-EXECUTE_PROCESS(
+-    COMMAND
+-        ${KDECONFIG_EXECUTABLE} --expandvars --install lib
+-    OUTPUT_VARIABLE
+-        KDE3_LIBDIR
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-)
+-
+-#############################################################################
+-EXECUTE_PROCESS(
+-    COMMAND
+-        ${KDECONFIG_EXECUTABLE} --expandvars --install icon
+-    OUTPUT_VARIABLE
+-        KDE3_ICONDIR
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-)
+-
+-#############################################################################
+-EXECUTE_PROCESS(
+-    COMMAND
+-        ${KDECONFIG_EXECUTABLE} --expandvars --install data
++        ${KDECONFIG_EXECUTABLE} --expandvars --prefix
+     OUTPUT_VARIABLE
+-        KDE3_DATADIR
++        KDE3_PREFIX
+     OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+ 
+-#############################################################################
+-EXECUTE_PROCESS(
+-    COMMAND
+-        ${KDECONFIG_EXECUTABLE} --expandvars --install locale
+-    OUTPUT_VARIABLE
+-        KDE3_LOCALEDIR
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-)
++IF ( ${CMAKE_INSTALL_PREFIX} STREQUAL "" )
++    SET ( datadir ${KDE3_PREFIX}/share )
++    SET ( exec_prefix ${KDE3_PREFIX} )
++ELSE ( ${CMAKE_INSTALL_PREFIX} STREQUAL "" )
++    SET ( datadir ${CMAKE_INSTALL_PREFIX}/share )
++    SET ( exec_prefix ${CMAKE_INSTALL_PREFIX} )
++ENDIF ( ${CMAKE_INSTALL_PREFIX} STREQUAL "" )
++
++FOREACH (DIR apps config data html icon locale mime xdgdata-apps )
++   EXECUTE_PROCESS(
++       COMMAND
++           ${KDECONFIG_EXECUTABLE} --install "${DIR}"
++       OUTPUT_VARIABLE
++           TEMP
++       OUTPUT_STRIP_TRAILING_WHITESPACE
++   )
++   STRING(TOUPPER "${DIR}" DIR)
++   STRING(REGEX REPLACE "\\$\\{.*\\}" "${datadir}" "KDE3_${DIR}DIR" "${TEMP}")
++ENDFOREACH (DIR)
++
++STRING(REGEX REPLACE "HTML$" "" KDE3_DOCDIR ${KDE3_HTMLDIR})
+ 
+ #############################################################################
+-EXECUTE_PROCESS(
+-    COMMAND
+-        ${KDECONFIG_EXECUTABLE} --expandvars --install mime
+-    OUTPUT_VARIABLE
+-        KDE3_MIMEDIR
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-)
+ 
+-#############################################################################
+-EXECUTE_PROCESS(
+-    COMMAND
+-        ${KDECONFIG_EXECUTABLE} --expandvars --install module
+-    OUTPUT_VARIABLE
+-        KDE3_MODULEDIR
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-)
++FOREACH (DIR exe lib)
++    EXECUTE_PROCESS(
++        COMMAND
++            ${KDECONFIG_EXECUTABLE} --install "${DIR}"
++        OUTPUT_VARIABLE
++            TEMP
++        OUTPUT_STRIP_TRAILING_WHITESPACE
++    )
++    STRING(TOUPPER "${DIR}" DIR)
++    STRING(REGEX REPLACE "\\$\\{.*\\}" "${exec_prefix}" "KDE3_${DIR}DIR" "${TEMP}")
++ENDFOREACH (DIR)
+ 
+-#############################################################################
+-EXECUTE_PROCESS(
+-    COMMAND
+-        ${KDECONFIG_EXECUTABLE} --expandvars --install config
+-    OUTPUT_VARIABLE
+-        KDE3_CONFDIR
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-)
++SET ( KDE3_MODULEDIR "${KDE3_LIBDIR}/kde3" )
+ 
+-
+-#############################################################################
+ EXECUTE_PROCESS(
+     COMMAND
+         ${KDECONFIG_EXECUTABLE} --expandvars --install html
+     OUTPUT_VARIABLE
+-        KDE3_DOCDIR
++        KDE3_HTML_INSTALLDIR
+     OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+-STRING(REGEX REPLACE "HTML$" "" KDE3_DOCDIR ${KDE3_DOCDIR})
+ 
+-#############################################################################
+-EXECUTE_PROCESS(
+-    COMMAND
+-        ${KDECONFIG_EXECUTABLE} --expandvars --prefix
+-    OUTPUT_VARIABLE
+-        KDE3_PREFIX
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-)
++FILE(RELATIVE_PATH KDE3_COMMONSYMLINK ${KDE3_HTMLDIR}/lang/app ${KDE3_HTML_INSTALLDIR}/en/common)
+ 
+ #############################################################################
+ #############################################################################
+--- kwave/CMakeLists.txt.orig	2008-07-24 22:20:26.000000000 +0200
++++ kwave/CMakeLists.txt	2008-07-24 22:29:40.000000000 +0200
+@@ -137,16 +137,25 @@
+ 
+ #############################################################################
+ 
+-TARGET_LINK_LIBRARIES(kwave_core
++SET(kwave_LIBRARIES
++    kwave_core
+     kwave
+     kwavegui
+     ${QT_AND_KDECORE_LIBS}
+     kdeui
+     kio
+-    artsc
+-    artsflow
+ )
+ 
++IF (WITH_ARTS) 
++    SET(kwave_LIBRARIES
++        ${kwave_LIBRARIES}
++        artsc
++        artsflow
++    )
++ENDIF (WITH_ARTS)
++
++TARGET_LINK_LIBRARIES(${kwave_LIBRARIES})
++
+ ADD_DEPENDENCIES(kwave_core libkwavegui libkwave)
+ 
+ SET_TARGET_PROPERTIES(kwave_core PROPERTIES OUTPUT_NAME "kwave")
+@@ -157,8 +166,16 @@
+ # the main program
+ INSTALL(TARGETS kwave_core     DESTINATION ${DESTDIR}${KDE3_EXEDIR})
+ 
++IF ( "${SHARE_INSTALL_PREFIX}" STREQUAL "" )
++    if ( "${CMAKE_INSTALL_PREFIX}" STREQUAL "" )
++        SET ( SHARE_INSTALL_PREFIX /usr/share )
++    ELSE ( "${CMAKE_INSTALL_PREFIX}" STREQUAL "" )
++        SET ( SHARE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/share" )
++    ENDIF ( "${CMAKE_INSTALL_PREFIX}" STREQUAL "" )
++ENDIF ( "${SHARE_INSTALL_PREFIX}" STREQUAL "" )
++
+ # other files
+-INSTALL(FILES kwave.desktop    DESTINATION ${KDE3_APPSDIR}/Multimedia)
++INSTALL(FILES kwave.desktop    DESTINATION ${KDE3_XDGDATA-APPSDIR})
+ INSTALL(FILES menus.config     DESTINATION ${KDE3_DATADIR}/kwave)
+ INSTALL(FILES ${kwave_PIXMAPS} DESTINATION ${KDE3_DATADIR}/kwave/pics)
+ INSTALL(FILES x-aifc.desktop x-ircam.desktop DESTINATION ${KDE3_MIMEDIR}/audio)
+--- libkwave/CMakeLists.txt.orig	2008-07-24 22:20:47.000000000 +0200
++++ libkwave/CMakeLists.txt	2008-07-24 22:24:37.000000000 +0200
+@@ -91,10 +91,8 @@
+ 
+ ADD_DEPENDENCIES(libkwave libkwavemt)
+ 
+-IF (NOT USE_SYSTEM_LIB_AUDIOFILE)
+ TARGET_LINK_LIBRARIES(libkwave audiofile)
+ ADD_DEPENDENCIES(libkwave audiofile)
+-ENDIF (NOT USE_SYSTEM_LIB_AUDIOFILE)
+ 
+ #############################################################################
+ 
+@@ -107,7 +105,7 @@
+ #############################################################################
+ ### install files                                                         ###
+ 
+-INSTALL(TARGETS libkwave LIBRARY DESTINATION ${KDE3_LIB_DIR})
++INSTALL(TARGETS libkwave LIBRARY DESTINATION ${KDE3_LIBDIR})
+ 
+ #############################################################################
+ #############################################################################
+--- doc/CMakeLists.txt.orig	2008-07-23 23:33:48.000000000 +0200
++++ doc/CMakeLists.txt	2008-07-24 00:10:36.000000000 +0200
+@@ -184,7 +184,7 @@
+             MESSAGE(STATUS \"Installing \$ENV{DESTDIR}${KDE3_HTMLDIR}/${_lang}/kwave/common\")
+         ")
+         INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND}
+-            -E create_symlink \"../common\"
++            -E create_symlink \"${KDE3_COMMONSYMLINK}\"
+             \"\$ENV{DESTDIR}${KDE3_HTMLDIR}/${_lang}/kwave/common\"
+         )")
+ 
+--- cmake/KwaveLibaudiofileSupport.cmake.orig	2008-07-23 01:40:43.000000000 +0200
++++ cmake/KwaveLibaudiofileSupport.cmake	2008-07-23 01:40:45.000000000 +0200
+@@ -44,17 +44,17 @@
+     MESSAGE(STATUS "Using the system's libaudiofile")
+     SET(USE_SYSTEM_LIB_AUDIOFILE BOOL ON)
+ ELSE (HAVE_AF_OPEN_VIRTUAL_FILE AND HAVE_AF_VIRTUAL_FILE_NEW)
+-    MESSAGE(STATUS "Using builtin libaudiofile")
++    MESSAGE(FATAL_ERROR "System libaudiofile not found")
+ ENDIF (HAVE_AF_OPEN_VIRTUAL_FILE AND HAVE_AF_VIRTUAL_FILE_NEW)
+ 
+ #############################################################################
+ ### enable builtin libaudiofile if needed                                 ###
+ 
+-IF (NOT USE_SYSTEM_LIB_AUDIOFILE)
++IF (WITH_BUILTIN_LIBAUDIOFILE)
+     INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/libaudiofile)
+     LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/libaudiofile)
+     ADD_SUBDIRECTORY( libaudiofile )
+-ENDIF (NOT USE_SYSTEM_LIB_AUDIOFILE)
++ENDIF (WITH_BUILTIN_LIBAUDIOFILE)
+ 
+ #############################################################################
+ #############################################################################
+--- libgui/CMakeLists.txt.orig	2008-07-24 23:00:02.000000000 +0200
++++ libgui/CMakeLists.txt	2008-07-24 23:00:11.000000000 +0200
+@@ -71,7 +71,7 @@
+ #############################################################################
+ ### install files                                                         ###
+ 
+-INSTALL(TARGETS libkwavegui LIBRARY DESTINATION ${KDE3_LIB_DIR})
++INSTALL(TARGETS libkwavegui LIBRARY DESTINATION ${KDE3_LIBDIR})
+ 
+ #############################################################################
+ #############################################################################
diff --git a/media-sound/kwave/files/kwave-0.7.11-desktop-entry-fix.diff b/media-sound/kwave/files/kwave-0.7.11-desktop-entry-fix.diff
new file mode 100644
index 000000000000..57b6e37bbcaa
--- /dev/null
+++ b/media-sound/kwave/files/kwave-0.7.11-desktop-entry-fix.diff
@@ -0,0 +1,18 @@
+--- ./kwave/kwave.desktop.orig	2008-07-14 21:53:59.000000000 +0200
++++ ./kwave/kwave.desktop	2008-07-14 22:03:32.000000000 +0200
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Version=1.0
+ Type=Application
+ Name=Kwave Sound Editor
+@@ -10,6 +9,6 @@
+ Comment[fr]=Un éditeur de sons pour KDE
+ TryExec=kwave
+ Exec=kwave %F
+-Icon=kwave.png
+-MimeType=audio/wav;audio/x-wav;audio/basic;audio/x-mp1;audio/x-mp2;audio/x-mp3;audio/x-ogg;application/ogg;audio/x-aifc;audio/x-aiff;audio/x-ircam
+-Terminal=0
++Icon=kwave
++MimeType=audio/wav;audio/x-wav;audio/basic;audio/x-mp1;audio/x-mp2;audio/x-mp3;audio/x-ogg;application/ogg;audio/x-aifc;audio/x-aiff;audio/x-ircam;
++Terminal=false
diff --git a/media-sound/kwave/kwave-0.7.11.ebuild b/media-sound/kwave/kwave-0.7.11.ebuild
new file mode 100644
index 000000000000..9253188379ab
--- /dev/null
+++ b/media-sound/kwave/kwave-0.7.11.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kwave/kwave-0.7.11.ebuild,v 1.1 2008/07/25 13:26:00 carlo Exp $
+
+EAPI=1
+
+inherit kde-functions flag-o-matic
+
+MY_P="${P}-1"
+
+DESCRIPTION="Kwave is a sound editor for KDE."
+HOMEPAGE="http://kwave.sourceforge.net/"
+SRC_URI="mirror://sourceforge/kwave/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE="alsa arts bindist debug flac mp3 ogg oss"
+
+RDEPEND="arts? ( || ( kde-base/kdemultimedia-arts:3.5 kde-base/kdemultimedia:3.5 ) )
+	alsa? ( media-libs/alsa-lib )
+	media-libs/audiofile
+	mp3? ( media-libs/id3lib media-libs/libmad )
+	ogg? ( media-libs/libogg media-libs/libvorbis )
+	flac? ( media-libs/flac )
+	sci-libs/gsl"
+DEPEND="${RDEPEND}
+	>=dev-util/cmake-2.4.6
+	|| ( kde-base/kdesdk-misc:3.5 kde-base/kdesdk:3.5 )
+	app-text/recode
+	media-gfx/imagemagick"
+need-kde 3.5
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/kwave-0.7.11-desktop-entry-fix.diff" \
+		"${FILESDIR}/kwave-0.7.11-build-script-fix.diff"
+}
+
+src_compile() {
+	# Work around the build script picking up KDE 4 binaries.
+	export PATH="${KDEDIR}/bin:${PATH}"
+
+	myconf="-DWITH_BUILTIN_LIBAUDIOFILE=OFF"
+	use alsa  || myconf+=" -DWITH_ALSA=OFF"
+	use arts  && myconf+=" -DWITH_ARTS=ON"
+	use flac  || myconf+=" -DWITH_FLAC=OFF"
+	use mp3   || myconf+=" -DWITH_MP3=OFF"
+	use ogg   || myconf+=" -DWITH_OGG=OFF"
+	use oss   || myconf+=" -DWITH_OSS=OFF"
+	use debug || myconf+=" -DDEBUG=ON --debug-output"
+
+	LDFLAGS="${LDFLAGS}" cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr			\
+		-DCMAKE_BUILD_TYPE=Release			\
+		-DCMAKE_C_COMPILER=$(type -P $(tc-getCC))	\
+		-DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX))	\
+		-DCMAKE_CXX_FLAGS="-DQT_THREAD_SUPPORT"		\
+		-DCMAKE_SHARED_LINKER_FLAGS="${LDFLAGS}"	\
+		-DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}"		\
+		${myconf} \
+	|| die "cmake failed"
+
+	emake || die "Error: emake failed!"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+}