Version bump to SV8.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 163 insertions, 2 deletions

diff --git a/media-sound/musepack-tools/ChangeLog b/media-sound/musepack-tools/ChangeLog
index 94875de81efe..788dfa8e7d1d 100644
--- a/media-sound/musepack-tools/ChangeLog
+++ b/media-sound/musepack-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/musepack-tools
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/ChangeLog,v 1.37 2009/05/14 20:11:37 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/ChangeLog,v 1.38 2009/07/25 15:24:18 ssuominen Exp $
+
+*musepack-tools-444 (25 Jul 2009)
+
+  25 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +musepack-tools-444.ebuild, +files/musepack-tools-444-gentoo.patch:
+  Version bump to SV8.
 
   14 May 2009; Markus Meier <maekke@gentoo.org>
   musepack-tools-1.15v-r1.ebuild:
diff --git a/media-sound/musepack-tools/Manifest b/media-sound/musepack-tools/Manifest
index b79eae95ff83..200f4074164a 100644
--- a/media-sound/musepack-tools/Manifest
+++ b/media-sound/musepack-tools/Manifest
@@ -3,7 +3,10 @@ AUX musepack-tools-1.15v-Makefile.patch 572 RMD160 c8402ba8d07c2381759ecb2eda1a3
 AUX musepack-tools-1.15v-execstack.patch 1256 RMD160 a4d15a6640db2dedf2790e398c2d5309eee1c416 SHA1 25de758e8982ac83aef017cfe1083985c7b3f4d2 SHA256 655b7945855d7e65bbaa5dee6be854c45c14e19036ab73ee207a939d3bd25277
 AUX musepack-tools-1.15v-fbsd.patch 469 RMD160 e969a4896ec14ca7a02a8b36f616f00977e0bd72 SHA1 0ce936e217d51a878450c7570905a8ca43324d72 SHA256 71b17ca4f444ca08685f3e0838b86b1c252cf6374a054884c6cc13c9809200e3
 AUX musepack-tools-1.15v-gcc4.patch 288 RMD160 6ab9a05d263c628e138f98a9ad72532f7a472543 SHA1 9232afeeab2e8f9ae5175275af3650ff7f71f048 SHA256 9e52b4d1b93538e6525d63aae2ea30fcad8e046f276419b4a2e0f30d714282ff
+AUX musepack-tools-444-gentoo.patch 5437 RMD160 ecc7747a65cca6bda39cbbd0f6d58e2025c7bef1 SHA1 57e1ff6dced9197e0d7b8dfe1e9a6b2c5b1c1cfc SHA256 c068bb10aabd49669b2134bfd268e23da5326699117569680ebd57ba182b5e20
 DIST mpcsv7-src-1.15v.tar.bz2 416868 RMD160 11b28faab8e23b22366ddd6a7b93aace257838e7 SHA1 4fb6b1a45858638eb6b854b910038baa1b410146 SHA256 ca602ea9d41038bdf7c04371d6f12d0eca5b71c29433633732d607e1b410a4bd
+DIST musepack-tools-444.tar.bz2 223636 RMD160 6acb25ff67d0c786b9bd1b5d38a81f025838b25a SHA1 0e25c211daba86640b53c019a6b2b91ca094a291 SHA256 db6c94b3587c8228a08597654dd71b47e8dc52f9722903cac7cc82665fccddbb
 EBUILD musepack-tools-1.15v-r1.ebuild 1963 RMD160 da318d4a95c48e49a1018ff530fec1e67bbdec28 SHA1 06c7ee054f5996dcb31970f4d9e28d56013da550 SHA256 29fb2de8085ceb764b95c7ceea5b955ac8a0d146ac2cd31f31c2b2dbe54fc123
-MISC ChangeLog 7213 RMD160 a980f630406532f6c7f18c29bdea59193f588df7 SHA1 fcae10402de9d8308404efa8f49a6e9b7906c075 SHA256 6d522d9f31cd226ff2c207308bc0355249728d3d9e71dab405ddaf7984269a82
+EBUILD musepack-tools-444.ebuild 782 RMD160 97b7d2040acbe11916d1e7f8e34140a7b372d352 SHA1 590284dafa7d12fb97716b19069a158e8d7fcdee SHA256 ac8c44c4e6bb1e2a5f2d8f4afe48b049e87b9132b3f3f93ad0fc4a66d006f588
+MISC ChangeLog 7399 RMD160 eb7c0c027b4bcd6ea33392b49bc564a070ebf679 SHA1 3c924928da682848fd3c0e6302eaeed76903b6f3 SHA256 820017d5e4f042df4eabd097ac6a6cb21a62dff08ec46491bd0af0258186762d
 MISC metadata.xml 269 RMD160 62382443b3292829e595043c71f5bd6d4402ad26 SHA1 22bb640da7fa718622c95863ce62f2e67a49191d SHA256 cac43becfa1a17ab8a8fc4250f7c67f7400b00d0651c3c75698ca48f040694bd
diff --git a/media-sound/musepack-tools/files/musepack-tools-444-gentoo.patch b/media-sound/musepack-tools/files/musepack-tools-444-gentoo.patch
new file mode 100644
index 000000000000..fed26426882f
--- /dev/null
+++ b/media-sound/musepack-tools/files/musepack-tools-444-gentoo.patch
@@ -0,0 +1,127 @@
+diff -ruN musepack-tools-444.orig/CMakeLists.txt musepack-tools-444/CMakeLists.txt
+--- musepack-tools-444.orig/CMakeLists.txt	2009-07-25 16:49:11.000000000 +0300
++++ musepack-tools-444/CMakeLists.txt	2009-07-25 18:04:19.000000000 +0300
+@@ -22,3 +22,4 @@
+ add_subdirectory(mpc2sv8)
+ add_subdirectory(mpccut)
+ add_subdirectory(mpcchap)
++add_subdirectory(wavcmp)
+diff -ruN musepack-tools-444.orig/include/mpc/mpcmath.h musepack-tools-444/include/mpc/mpcmath.h
+--- musepack-tools-444.orig/include/mpc/mpcmath.h	2009-07-25 16:49:10.000000000 +0300
++++ musepack-tools-444/include/mpc/mpcmath.h	2009-07-25 17:37:16.000000000 +0300
+@@ -16,6 +16,8 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
+ 
++#include <math.h>
++
+ #include <mpc/mpc_types.h>
+ 
+ typedef union mpc_floatint
+diff -ruN musepack-tools-444.orig/libmpcdec/CMakeLists.txt musepack-tools-444/libmpcdec/CMakeLists.txt
+--- musepack-tools-444.orig/libmpcdec/CMakeLists.txt	2009-07-25 16:49:10.000000000 +0300
++++ musepack-tools-444/libmpcdec/CMakeLists.txt	2009-07-25 17:58:04.000000000 +0300
+@@ -1,2 +1,15 @@
+ include_directories(${libmpc_SOURCE_DIR}/include)
++
+ add_library(mpcdec_static STATIC huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
++set_target_properties(mpcdec_static PROPERTIES OUTPUT_NAME mpcdec CLEAN_DIRECT_OUTPUT 1)
++if(NOT MSVC)
++target_link_libraries(mpcdec_static m)
++endif(NOT MSVC)
++
++add_library(mpcdec_shared SHARED huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
++set_target_properties(mpcdec_shared PROPERTIES OUTPUT_NAME mpcdec CLEAN_DIRECT_OUTPUT 1 VERSION 6.1.0 SOVERSION 6)
++if(NOT MSVC)
++target_link_libraries(mpcdec_shared m)
++endif(NOT MSVC)
++
++install(TARGETS mpcdec_static mpcdec_shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
+diff -ruN musepack-tools-444.orig/mpc2sv8/CMakeLists.txt musepack-tools-444/mpc2sv8/CMakeLists.txt
+--- musepack-tools-444.orig/mpc2sv8/CMakeLists.txt	2009-07-25 16:49:11.000000000 +0300
++++ musepack-tools-444/mpc2sv8/CMakeLists.txt	2009-07-25 17:59:54.000000000 +0300
+@@ -12,7 +12,7 @@
+ 
+ add_executable(mpc2sv8 mpc2sv8.c)
+ 
+-target_link_libraries(mpc2sv8 mpcdec_static)
++target_link_libraries(mpc2sv8 mpcdec_shared)
+ target_link_libraries(mpc2sv8 mpcenc_static)
+ 
+ if(WIN32)
+@@ -27,3 +27,4 @@
+ target_link_libraries(mpc2sv8 ossaudio)
+ endif(CMAKE_SYSTEM_NAME STREQUAL OpenBSD)
+ 
++install(TARGETS mpc2sv8 RUNTIME DESTINATION bin)
+diff -ruN musepack-tools-444.orig/mpcchap/CMakeLists.txt musepack-tools-444/mpcchap/CMakeLists.txt
+--- musepack-tools-444.orig/mpcchap/CMakeLists.txt	2009-07-25 16:49:11.000000000 +0300
++++ musepack-tools-444/mpcchap/CMakeLists.txt	2009-07-25 17:59:30.000000000 +0300
+@@ -14,7 +14,7 @@
+ 
+ add_executable(mpcchap mpcchap dictionary iniparser ${libmpc_SOURCE_DIR}/common/tags)
+ 
+-target_link_libraries(mpcchap mpcdec_static)
++target_link_libraries(mpcchap mpcdec_shared)
+ target_link_libraries(mpcchap mpcenc_static)
+ target_link_libraries(mpcchap ${CUEFILE_LIBRARY})
+ 
+@@ -22,3 +22,4 @@
+ target_link_libraries(mpcchap m)
+ endif(NOT MSVC)
+ 
++install(TARGETS mpcchap RUNTIME DESTINATION bin)
+diff -ruN musepack-tools-444.orig/mpccut/CMakeLists.txt musepack-tools-444/mpccut/CMakeLists.txt
+--- musepack-tools-444.orig/mpccut/CMakeLists.txt	2009-07-25 16:49:10.000000000 +0300
++++ musepack-tools-444/mpccut/CMakeLists.txt	2009-07-25 18:00:24.000000000 +0300
+@@ -12,10 +12,11 @@
+ 
+ add_executable(mpccut mpccut)
+ 
+-target_link_libraries(mpccut mpcdec_static)
++target_link_libraries(mpccut mpcdec_shared)
+ target_link_libraries(mpccut mpcenc_static)
+ 
+ if(NOT MSVC)
+ target_link_libraries(mpccut m)
+ endif(NOT MSVC)
+ 
++install(TARGETS mpccut RUNTIME DESTINATION bin)
+diff -ruN musepack-tools-444.orig/mpcdec/CMakeLists.txt musepack-tools-444/mpcdec/CMakeLists.txt
+--- musepack-tools-444.orig/mpcdec/CMakeLists.txt	2009-07-25 16:49:10.000000000 +0300
++++ musepack-tools-444/mpcdec/CMakeLists.txt	2009-07-25 18:00:49.000000000 +0300
+@@ -17,4 +17,6 @@
+ endif(NOT MSVC)
+ 
+ target_link_libraries(mpcdec wavformat_static)
+-target_link_libraries(mpcdec mpcdec_static)
++target_link_libraries(mpcdec mpcdec_shared)
++
++install(TARGETS mpcdec RUNTIME DESTINATION bin)
+diff -ruN musepack-tools-444.orig/mpcgain/CMakeLists.txt musepack-tools-444/mpcgain/CMakeLists.txt
+--- musepack-tools-444.orig/mpcgain/CMakeLists.txt	2009-07-25 16:49:11.000000000 +0300
++++ musepack-tools-444/mpcgain/CMakeLists.txt	2009-07-25 18:05:03.000000000 +0300
+@@ -18,9 +18,10 @@
+ add_executable(mpcgain mpcgain.c)
+ 
+ target_link_libraries(mpcgain ${REPLAY_GAIN_LIBRARY})
+-target_link_libraries(mpcgain mpcdec_static)
++target_link_libraries(mpcgain mpcdec_shared)
+ 
+ if(NOT MSVC)
+ target_link_libraries(mpcgain m)
+ endif(NOT MSVC)
+ 
++install(TARGETS mpcgain RUNTIME DESTINATION bin)
+diff -ruN musepack-tools-444.orig/wavcmp/CMakeLists.txt musepack-tools-444/wavcmp/CMakeLists.txt
+--- musepack-tools-444.orig/wavcmp/CMakeLists.txt	1970-01-01 02:00:00.000000000 +0200
++++ musepack-tools-444/wavcmp/CMakeLists.txt	2009-07-25 18:20:36.000000000 +0300
+@@ -0,0 +1,8 @@
++include_directories(${libmpc_SOURCE_DIR}/libwavformat)
++link_directories(${libmpc_BINARY_DIR}/libwavformat)
++
++add_executable(wavcmp wavcmp)
++
++target_link_libraries(wavcmp wavformat_static)
++
++install(TARGETS wavcmp RUNTIME DESTINATION bin)
diff --git a/media-sound/musepack-tools/musepack-tools-444.ebuild b/media-sound/musepack-tools/musepack-tools-444.ebuild
new file mode 100644
index 000000000000..b7086e085847
--- /dev/null
+++ b/media-sound/musepack-tools/musepack-tools-444.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/musepack-tools-444.ebuild,v 1.1 2009/07/25 15:24:18 ssuominen Exp $
+
+inherit cmake-utils
+
+# svn co http://svn.musepack.net/libmpc/trunk musepack-tools-${PV}
+# tar -cjf musepack-tools-${PV}.tar.bz2 musepack-tools-${PV}
+
+DESCRIPTION="Musepack SV8 libraries and utilities"
+HOMEPAGE="http://www.musepack.net"
+SRC_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.bz2
+	mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="BSD LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=media-libs/libcuefile-${PV}
+	>=media-libs/libreplaygain-${PV}"
+DEPEND="${RDEPEND}
+	!media-libs/libmpcdec"
+
+PATCHES=( "${FILESDIR}/${P}-gentoo.patch" )