Version bump.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 54 insertions, 32 deletions

diff --git a/media-sound/musepack-tools/ChangeLog b/media-sound/musepack-tools/ChangeLog
index 2006d0411681..59411b24dd45 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/ChangeLog,v 1.53 2010/03/05 22:49:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/ChangeLog,v 1.54 2010/07/21 13:31:35 ssuominen Exp $
+
+*musepack-tools-465 (21 Jul 2010)
+
+  21 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +musepack-tools-465.ebuild, +files/musepack-tools-465-gentoo.patch:
+  Version bump.
 
 *musepack-tools-444-r1 (05 Mar 2010)
 
diff --git a/media-sound/musepack-tools/files/musepack-tools-458-gentoo.patch b/media-sound/musepack-tools/files/musepack-tools-458-gentoo.patch
deleted file mode 100644
index a0dfcde61459..000000000000
--- a/media-sound/musepack-tools/files/musepack-tools-458-gentoo.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur musepack-tools-458.orig/libmpcdec/CMakeLists.txt musepack-tools-458/libmpcdec/CMakeLists.txt
---- musepack-tools-458.orig/libmpcdec/CMakeLists.txt	2009-12-09 15:44:52.000000000 +0200
-+++ musepack-tools-458/libmpcdec/CMakeLists.txt	2009-12-09 15:55:48.000000000 +0200
-@@ -1,2 +1,22 @@
- 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)
-+
-+if(SHARED)
-+  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 7.0.1 SOVERSION 7)
-+  if(NOT MSVC)
-+    target_link_libraries(mpcdec_shared m)
-+  endif(NOT MSVC)                                                                                                                                             
-+endif(SHARED)
-+
-+install(TARGETS mpcdec_static LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
-+
-+if(SHARED)
-+  install(TARGETS mpcdec_shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
-+endif(SHARED)
diff --git a/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch b/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch
new file mode 100644
index 000000000000..a93b5ebddadd
--- /dev/null
+++ b/media-sound/musepack-tools/files/musepack-tools-465-gentoo.patch
@@ -0,0 +1,40 @@
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -15,10 +15,6 @@
+ 
+ add_definitions(-DFAST_MATH -DCVD_FASTLOG)
+ 
+-if(NOT MSVC)
+-  set(CMAKE_C_FLAGS "-O3 -Wall -fomit-frame-pointer -pipe")
+-endif(NOT MSVC)
+-
+ add_subdirectory(libmpcdec)
+ add_subdirectory(libmpcpsy)
+ add_subdirectory(libmpcenc)
+--- libmpcdec/CMakeLists.txt
++++ libmpcdec/CMakeLists.txt
+@@ -1,7 +1,22 @@
+ include_directories(${libmpc_SOURCE_DIR}/include)
+ if(SHARED)
+   add_library(mpcdec_shared SHARED huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
+-else(SHARED)
+-  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_shared PROPERTIES OUTPUT_NAME mpcdec CLEAN_DIRECT_OUTPUT 1 VERSION 7.0.1 SOVERSION 7)
++  if(NOT MSVC)
++    target_link_libraries(mpcdec_shared m)
++  endif(NOT MSVC)
+ endif(SHARED)
+ 
++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)
++
++install(TARGETS mpcdec_static LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
++
++if(SHARED)
++  install(TARGETS mpcdec_shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
++endif(SHARED)
diff --git a/media-sound/musepack-tools/musepack-tools-458.ebuild b/media-sound/musepack-tools/musepack-tools-465.ebuild
index 75d2885a2116..af9615dab6b1 100644
--- a/media-sound/musepack-tools/musepack-tools-458.ebuild
+++ b/media-sound/musepack-tools/musepack-tools-465.ebuild
@@ -1,25 +1,27 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/musepack-tools-458.ebuild,v 1.5 2010/03/05 22:49:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/musepack-tools-465.ebuild,v 1.1 2010/07/21 13:31:35 ssuominen Exp $
 
+EAPI=3
 inherit cmake-utils
 
-# svn co http://svn.musepack.net/libmpc/trunk musepack-tools-${PV}
-# find ./musepack-tools-${PV} -type d -name .svn | xargs rm -rf
+# svn export 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="mirror://gentoo/${P}.tar.bz2"
+SRC_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.bz2"
+#SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="BSD LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
-DEPEND=">=media-libs/libcuefile-${PV}
+RDEPEND=">=media-libs/libcuefile-${PV}
 	>=media-libs/libreplaygain-${PV}
 	!media-libs/libmpcdec
 	!media-libs/libmpcdecsv7"
+DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}/${P}-gentoo.patch" )