old

(Portage version: 2.1.6.13/cvs/Linux x86_64)

7 files changed, 0 insertions, 668 deletions

diff --git a/media-sound/kwave/Manifest b/media-sound/kwave/Manifest
index 7a4b148c60c2..89bccd5f2487 100644
--- a/media-sound/kwave/Manifest
+++ b/media-sound/kwave/Manifest
@@ -1,13 +1,5 @@
 AUX 0.8.2-fix_gettext.patch 654 RMD160 1e76d3181991edbe7e94f4e6258c26008f1a0040 SHA1 49d186c79b2ee541b9c0947d3b4b58e9c36cf7aa SHA256 e12b40c17f4822f20502edc24ad6c9d06f39d8dd0e08f23c40874c94498775b5
-AUX kwave-0.7.11-build-script-fix.diff 9521 RMD160 0acac29ff6b764f165c1d0b5d3114e09ec351687 SHA1 48d835028dd8095f6e6b3576d914cd877225a18b SHA256 833134e4b4a430d9a594a78bd4fdb7b76de2d2ff31fe1e1bdc109b9aa4b5638d
-AUX kwave-0.7.11-desktop-entry-fix.diff 676 RMD160 8043f5a41ab667ceeb08a861dcf0e9120743b432 SHA1 03f745b772c05e175d92e38abf257cd72151e803 SHA256 1b9662dd6296a820f8ec802965ba06505f9a81e02970d4fbc35e240b3e29e710
-AUX kwave-0.7.9-debian-431199.diff 2860 RMD160 bb52e485f3eedad4be6e22221d9abdf246b7f07e SHA1 0fd87add1588e7d101d97e7802dc88e6317506af SHA256 8523183b25a5c080e988f104036ff6b62949445fd34b741c7dcf376bbde4409e
-AUX kwave-0.7.9_flac-v1.1.3_and_v1.1.4-support.diff 5727 RMD160 0e80108c96f87b499e9f10e3616d1a850f7b0784 SHA1 d190c37b9de20408242ab35ddde478113037c9c1 SHA256 47e450dde406c54fc46ea125431c8df34fbd59d3b684e1e9fe63d9ed16f61042
-DIST kwave-0.7.11-1.tar.gz 2824113 RMD160 e5032774a4d377ce72e905a51410c9b81a996b6e SHA1 71fd07006487f6a34a25f0d350c7de97db60b029 SHA256 99371fb1b0feef607c23750cc611c2f464abbd0fe633f15dfbb8b2bb02d09819
-DIST kwave-0.7.9.tar.gz 3108173 RMD160 23e3176f2e2fbe57a048e99dfa3eea67c0be462d SHA1 32ccd6596912f9f0e6b9b1ca6a39ef50f23ed31c SHA256 c0a71d861190f45e06997dfaecbd598d1310f05ae99d4c4d6573fb9834cd8c14
 DIST kwave-0.8.2-1.tar.bz2 2134080 RMD160 2b5821f28cb0e5d9d96befeae2759524dd26097d SHA1 c4681dbba8af01bf8c83d089a8a1aa196dd57c5e SHA256 4704960f7fa06e4bbbc13d315bfd2e1a1347e3c06c1b69a4b4d863be884e5e44
-EBUILD kwave-0.7.11.ebuild 2244 RMD160 1c89478c2c1f0b980723edb2237e2acba76192a2 SHA1 9571cb5a36c274520d26199890966100855b0a73 SHA256 02dc68fa67fa3b95ee2d417beb4dfcab8ab129c54d984163a883d95df3ca78b5
-EBUILD kwave-0.7.9.ebuild 1398 RMD160 d4e97278a6b79b26c1ef19690fcaa592e5c69cd5 SHA1 35aadd53a96dbe8f6a5787e7674dd5cb0427a472 SHA256 7b4cafcd88706a162289a6cf668275c7ba06fdcd86fddbfe04108b4d351c9aed
 EBUILD kwave-0.8.2.ebuild 1188 RMD160 a65438c95d8848078227be53833f0a92cd69252a SHA1 145b9721109ede20a19e767fc14f335d5700089d SHA256 d84b8900c2d8ccae00fdf22795d09a41510329407f69496efff7cd89b6a4c5a6
 MISC ChangeLog 2259 RMD160 e8e9c28670708a0b91ffb7b1bfd3c487f033ac43 SHA1 739635a25f7ba323af22ea7ca6fcdf830b146915 SHA256 0db62dc2f80bf6806f8c825eff5ee768e505440c0bc57e0896ae3ec6d39ede94
 MISC metadata.xml 517 RMD160 0f693008ebbd4520bfeeb3292ae37570da04eaaf SHA1 c8b99c21604452a4eb80b0f57707931b5a22a3a7 SHA256 460292b9dd1af2739b377d06f424cdc3138ef169427fd5c7d7800ac8e885cd11
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
deleted file mode 100644
index 335f678a8d57..000000000000
--- a/media-sound/kwave/files/kwave-0.7.11-build-script-fix.diff
+++ /dev/null
@@ -1,268 +0,0 @@
---- 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
deleted file mode 100644
index 57b6e37bbcaa..000000000000
--- a/media-sound/kwave/files/kwave-0.7.11-desktop-entry-fix.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./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/files/kwave-0.7.9-debian-431199.diff b/media-sound/kwave/files/kwave-0.7.9-debian-431199.diff
deleted file mode 100644
index 03ae184ce782..000000000000
--- a/media-sound/kwave/files/kwave-0.7.9-debian-431199.diff
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -u plugins/codec_flac/FlacDecoder.cpp /usr/src/packages/multimedia/sound/kwave-svn/trunk/plugins/codec_flac/FlacDecoder.cpp
---- a/plugins/codec_flac/FlacDecoder.cpp	2007-07-01 09:50:18.000000000 +0200
-+++ b/plugins/codec_flac/FlacDecoder.cpp	2007-06-17 10:28:45.000000000 +0200
-@@ -54,7 +54,7 @@
- 
- //***************************************************************************
- ::FLAC__StreamDecoderReadStatus FlacDecoder::read_callback(
--        FLAC__byte buffer[], unsigned int *bytes)
-+        FLAC__byte buffer[], size_t *bytes)
- {
-     Q_ASSERT(bytes);
-     Q_ASSERT(m_source);
-@@ -67,7 +67,7 @@
-     }
- 
-     // read into application buffer
--    unsigned long int len = *bytes;
-+    Q_LONG len = *bytes;
-     *bytes = m_source->readBlock((char*)(&(buffer[0])), len);
- 
-     if (!*bytes) return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
-diff -u plugins/codec_flac/FlacDecoder.h /usr/src/packages/multimedia/sound/kwave-svn/trunk/plugins/codec_flac/FlacDecoder.h
---- a/plugins/codec_flac/FlacDecoder.h	2007-07-01 09:49:39.000000000 +0200
-+++ b/plugins/codec_flac/FlacDecoder.h	2007-06-17 10:28:45.000000000 +0200
-@@ -101,7 +101,7 @@
-      * @return read state
-      */
-     virtual ::FLAC__StreamDecoderReadStatus read_callback(
--        FLAC__byte buffer[], unsigned int *bytes);
-+        FLAC__byte buffer[], size_t *bytes);
- 
-     /**
-      * FLAC decoder interface: write callback.
-diff -u plugins/codec_flac/FlacEncoder.cpp /usr/src/packages/multimedia/sound/kwave-svn/trunk/plugins/codec_flac/FlacEncoder.cpp
---- a/plugins/codec_flac/FlacEncoder.cpp	2007-07-01 09:50:18.000000000 +0200
-+++ b/plugins/codec_flac/FlacEncoder.cpp	2007-06-17 10:28:45.000000000 +0200
-@@ -73,8 +73,8 @@
- 
- /***************************************************************************/
- ::FLAC__StreamEncoderWriteStatus FlacEncoder::write_callback(
--        const FLAC__byte buffer[], unsigned int bytes,
--        unsigned int /* samples */, unsigned int /* current_frame */)
-+        const FLAC__byte buffer[], size_t bytes,
-+        unsigned /* samples */, unsigned /* current_frame */)
- {
- //    qDebug("FlacEncoder::write_callback(%u)", samples); // ###
-     Q_ASSERT(m_dst);
-diff -u plugins/codec_flac/FlacEncoder.h /usr/src/packages/multimedia/sound/kwave-svn/trunk/plugins/codec_flac/FlacEncoder.h
---- a/plugins/codec_flac/FlacEncoder.h	2007-07-01 09:49:39.000000000 +0200
-+++ b/plugins/codec_flac/FlacEncoder.h	2007-06-17 10:28:45.000000000 +0200
-@@ -70,8 +70,8 @@
-      * @return FLAC stream encoder write status
-      */
-     virtual ::FLAC__StreamEncoderWriteStatus write_callback(
--        const FLAC__byte buffer[], unsigned int bytes,
--        unsigned int samples, unsigned int current_frame);
-+        const FLAC__byte buffer[], size_t bytes,
-+        unsigned samples, unsigned current_frame);
- 
-     /**
-      * Callback for encoding meta data
diff --git a/media-sound/kwave/files/kwave-0.7.9_flac-v1.1.3_and_v1.1.4-support.diff b/media-sound/kwave/files/kwave-0.7.9_flac-v1.1.3_and_v1.1.4-support.diff
deleted file mode 100644
index 92b92540c2f0..000000000000
--- a/media-sound/kwave/files/kwave-0.7.9_flac-v1.1.3_and_v1.1.4-support.diff
+++ /dev/null
@@ -1,175 +0,0 @@
-Index: plugins/codec_flac/FlacEncoder.cpp
-===================================================================
---- plugins/codec_flac/FlacEncoder.cpp	(Revision 1972)
-+++ plugins/codec_flac/FlacEncoder.cpp	(Arbeitskopie)
-@@ -208,15 +208,27 @@
- 	}
- 
- 	// initialize the FLAC stream, this already writes some meta info
--	FLAC::Encoder::Stream::State state = init();
--	if (state != FLAC__STREAM_ENCODER_OK) {
--	    qWarning("state = %s", state.as_cstring());
--	    KMessageBox::error(widget,
--		i18n("Unable to open the FLAC encoder!"));
--	    m_info = 0;
--	    result = false;
--	    break;
--	}
-+#if defined(FLAC_API_VERSION_1_1_3)
-+        FLAC__StreamEncoderInitStatus init_state = init();
-+        if (init_state != FLAC__STREAM_ENCODER_INIT_STATUS_OK) {
-+            qWarning("state = %d", (int)init_state);
-+            KMessageBox::error(widget,
-+                i18n("Unable to open the FLAC encoder!"));
-+            m_info = 0;
-+            result = false;
-+            break;
-+        }
-+#else
-+	FLAC::Encoder::Stream::State init_state = init();
-+	if (init_state != FLAC__STREAM_ENCODER_OK) {
-+            qWarning("state = %s", init_state.as_cstring());
-+            KMessageBox::error(widget,
-+                i18n("Unable to open the FLAC encoder!"));
-+            m_info = 0;
-+            result = false;
-+            break;
-+        }
-+#endif
- 
- 	// allocate output buffers, with FLAC 32 bit format
- 	unsigned int len = 8192; // samples
-Index: plugins/codec_flac/FlacDecoder.cpp
-===================================================================
---- plugins/codec_flac/FlacDecoder.cpp	(Revision 1972)
-+++ plugins/codec_flac/FlacDecoder.cpp	(Arbeitskopie)
-@@ -158,7 +158,7 @@
-         const FLAC::Metadata::VorbisComment &vorbis_comments)
- {
-     // first of all: the vendor string, specifying the software
--#ifdef FLAC_API_VERSION_1_1_1_OR_OLDER
-+#if defined(FLAC_API_VERSION_1_1_1_OR_OLDER)
-     if (vorbis_comments.get_vendor_string().is_valid()) {
- 	const FLAC::Metadata::VorbisComment::Entry &entry =
- 		vorbis_comments.get_vendor_string();
-@@ -169,13 +169,15 @@
- 	m_info.set(INF_SOFTWARE, s);
- 	qDebug("Encoded by: '%s'\n\n", s.local8Bit().data());
-     }
--#else
-+#elif defined(FLAC_API_VERSION_1_1_2) || defined(FLAC_API_VERSION_1_1_3)
-     QString vendor = QString::fromUtf8(reinterpret_cast<const char *>(
- 	vorbis_comments.get_vendor_string()));
-     if (vendor.length()) {
- 	m_info.set(INF_SOFTWARE, vendor);
- 	qDebug("Encoded by: '%s'\n\n", vendor.local8Bit().data());
-     }
-+#else
-+    #error "no usable FLAC API found"
- #endif
- 
-     // parse all vorbis comments into Kwave file properties
-@@ -275,17 +277,26 @@
-     set_metadata_respond_all();
- 
-     // initialize the stream
--    FLAC::Decoder::Stream::State state = init();
--    if (state >= FLAC__STREAM_DECODER_END_OF_STREAM) {
--	KMessageBox::error(widget, i18n(
--	   "opening the FLAC bitstream failed."));
--	return false;
-+#if defined(FLAC_API_VERSION_1_1_3)
-+    FLAC__StreamDecoderInitStatus init_state = init();
-+    if (init_state > FLAC__STREAM_DECODER_INIT_STATUS_OK) {
-+        KMessageBox::error(widget, i18n(
-+           "opening the FLAC bitstream failed."));
-+        return false;
-     }
-+#else /* API v1.1.2 and older */
-+    FLAC::Decoder::Stream::State init_state = init();
-+    if (init_state >= FLAC__STREAM_DECODER_END_OF_STREAM) {
-+        KMessageBox::error(widget, i18n(
-+           "opening the FLAC bitstream failed."));
-+        return false;
-+    }
-+#endif
- 
-     // read in all metadata
-     process_until_end_of_metadata();
- 
--    state = get_state();
-+    FLAC::Decoder::Stream::State state = get_state();
-     if (state >= FLAC__STREAM_DECODER_END_OF_STREAM) {
- 	KMessageBox::error(widget, i18n(
- 	   "error while parsing FLAC metadata. (%s)"),
-Index: configure.in
-===================================================================
---- configure.in	(Revision 1972)
-+++ configure.in	(Arbeitskopie)
-@@ -449,6 +449,7 @@
- 	AC_LINK_IFELSE([
- 	    #include <FLAC/format.h>
- 	    #include <FLAC++/decoder.h>
-+	    #include <FLAC++/encoder.h>
- 	    #include <FLAC++/metadata.h>
- 
- 	    int main(int, char **)
-@@ -456,16 +457,54 @@
- 		const FLAC::Metadata::VorbisComment vorbis_comments;
- 		const FLAC__byte *vendor = vorbis_comments.get_vendor_string();
- 		if (!vendor) return -1;
-+
-+		FLAC::Decoder::Stream *decoder = 0;
-+		FLAC::Encoder::Stream *encoder = 0;
-+		FLAC::Decoder::Stream::State init_state_d = decoder->init();
-+		FLAC::Encoder::Stream::State init_state_e = encoder->init();
-+
- 		return 0;
- 	    }
- 	],
- 	AC_MSG_RESULT([ok. use v1.1.2 API])
--	AC_DEFINE(FLAC_API_VERSION_1_1_2_OR_NEWER, 1, [new API from v1.1.2 and newer])
-+	AC_DEFINE(FLAC_API_VERSION_1_1_2, 1, [API from v1.1.2])
- 	,
- 	[
--	AC_MSG_ERROR([unable to figure out a valid API])
--	]
--	)
-+	    AC_LINK_IFELSE([
-+		#include <FLAC/export.h>
-+		#include <FLAC/format.h>
-+		#include <FLAC++/decoder.h>
-+		#include <FLAC++/encoder.h>
-+		#include <FLAC++/metadata.h>
-+
-+		/* FLAC-1.1.3 has cur=8, rev=0 */
-+		/* FLAC-1.1.4 has cur=8, rev=1 */
-+		#if !defined(FLAC_API_VERSION_CURRENT) || \
-+		    !defined(FLAC_API_VERSION_REVISION)
-+		    #error "FLAC API is much too old"
-+		#endif
-+
-+		#if (FLAC_API_VERSION_CURRENT < 8)
-+		    #error "FLAC API is too old"
-+		#endif
-+
-+		int main(int, char **)
-+		{
-+		    FLAC__StreamEncoderInitStatus init_state_d =
-+			    FLAC__STREAM_ENCODER_INIT_STATUS_OK;
-+		    FLAC__StreamDecoderInitStatus init_state_e =
-+			    FLAC__STREAM_DECODER_INIT_STATUS_OK;
-+		    return 0;
-+		}
-+	    ],
-+	    AC_MSG_RESULT([ok. use v1.1.3 API])
-+	    AC_DEFINE(FLAC_API_VERSION_1_1_3, 1, [new API from v1.1.3])
-+	    ,
-+	    [
-+	    AC_MSG_ERROR([unable to figure out a valid API])
-+	    ]
-+	    )
-+	])
-     ]
- )
- AC_LANG_POP(C++)
diff --git a/media-sound/kwave/kwave-0.7.11.ebuild b/media-sound/kwave/kwave-0.7.11.ebuild
deleted file mode 100644
index 718eda2e032e..000000000000
--- a/media-sound/kwave/kwave-0.7.11.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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.2 2008/07/25 13:31:27 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"
-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
-
-pkg_setup() {
-	if ! built_with_use --missing true media-libs/flac cxx; then
-		eerror "To build ${PN} you need the C++ bindings for flac."
-		eerror "Please enable the cxx USE flag for media-libs/flac"
-	die "Missing FLAC C++ bindings."
-	fi
-}
-
-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
-}
diff --git a/media-sound/kwave/kwave-0.7.9.ebuild b/media-sound/kwave/kwave-0.7.9.ebuild
deleted file mode 100644
index c056a12bce14..000000000000
--- a/media-sound/kwave/kwave-0.7.9.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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.9.ebuild,v 1.7 2008/02/19 01:52:12 ingmar Exp $
-
-ARTS_REQUIRED=yes
-inherit kde flag-o-matic
-
-DESCRIPTION="Kwave is a sound editor for KDE."
-HOMEPAGE="http://kwave.sourceforge.net/"
-SRC_URI="mirror://sourceforge/kwave/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc mmx"
-
-RDEPEND="media-libs/alsa-lib
-	media-libs/audiofile
-	media-libs/id3lib
-	media-libs/libmad
-	media-libs/libogg
-	media-libs/libvorbis
-	media-libs/flac
-	sci-libs/gsl"
-
-DEPEND="${RDEPEND}
-	|| ( =kde-base/kdemultimedia-arts-3.5* =kde-base/kdemultimedia-3.5* )
-	|| ( =kde-base/kdesdk-misc-3.5* =kde-base/kdesdk-3.5* )
-	app-text/recode
-	media-gfx/imagemagick"
-
-need-kde 3.4
-
-pkg_setup() {
-	kde_pkg_setup
-
-	if ! built_with_use --missing true media-libs/flac cxx; then
-		eerror "To build ${PN} you need the C++ bindings for flac."
-		eerror "Please enable the cxx USE flag for media-libs/flac"
-		die "Missing FLAC C++ bindings."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}_flac-v1.1.3_and_v1.1.4-support.diff"
-	epatch "${FILESDIR}/${P}-debian-431199.diff"
-	eautoreconf
-}
-
-src_compile() {
-	local myconf="--without-builtin-libaudiofile"
-
-	myconf="$(use_enable doc)"
-	use mmx && append-flags "-mmmx"
-
-	kde_src_compile
-}