Version bump.

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

5 files changed, 58 insertions, 36 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/Manifest b/media-sound/musepack-tools/Manifest
index 80d1daaf6438..d88aa6541eb7 100644
--- a/media-sound/musepack-tools/Manifest
+++ b/media-sound/musepack-tools/Manifest
@@ -1,8 +1,8 @@
 AUX musepack-tools-444-gentoo.patch 6615 RMD160 ea228d0fcff63e6abebf002491d72d21206ea84a SHA1 d94cbda61f5de293396bd40ba54f8eb5d83e9e08 SHA256 cf89b7e5b5cfec29ae4d1950462dc205ff273810713207473450165a7a6e4f82
-AUX musepack-tools-458-gentoo.patch 1776 RMD160 9cb9f9d70e079f7066917034c7513b855bd3d2d4 SHA1 2ef3787da3ab9fbab9054f7687c47e4a78125b4f SHA256 185019ac4dbb02e5bf040b066221138b7b3cec576104c219f3a7b4390d638bc7
+AUX musepack-tools-465-gentoo.patch 1550 RMD160 c370a4fe68703761f85a2d8958bf0dd625fc7d2c SHA1 64d301c4044a65b109c4eba3c6e4550a3f095de4 SHA256 2be117d2d336a2245360dddef315ef6e48fb5b82e1c6dc64297fbe3a120e3739
 DIST musepack-tools-444.tar.bz2 223636 RMD160 6acb25ff67d0c786b9bd1b5d38a81f025838b25a SHA1 0e25c211daba86640b53c019a6b2b91ca094a291 SHA256 db6c94b3587c8228a08597654dd71b47e8dc52f9722903cac7cc82665fccddbb
-DIST musepack-tools-458.tar.bz2 166922 RMD160 bd889d8c96a1cb3e9e158d56c321ea4f719e5485 SHA1 274fc83dd4269ce86071b0eb99fb6ea316f20ae4 SHA256 85560791eb6396f1f3e8c3a0219cd463f461396d776c363a1d045db410b522e1
+DIST musepack-tools-465.tar.bz2 167612 RMD160 a4c75f128a928b9bfd246923d5b8ab440748ba66 SHA1 ed7083a6b4aaeccc135407217712df644a3123a9 SHA256 3c14ea0cbbabf3b3141d680ade1caa1c48d77fb0ab286a4fbf449643f302760a
 EBUILD musepack-tools-444-r1.ebuild 976 RMD160 57f26eadc28a34629eb939c1873b8a84b5134f41 SHA1 bc8946fc92464e88c3b8909659ce569aaac9fb76 SHA256 c6b51dad8523cb125a927c54fbc9f8d2b2f971444941845e7ea924ef1f388517
-EBUILD musepack-tools-458.ebuild 890 RMD160 a3ee4c77d590926b0120b6dac99f4bcf2b25995b SHA1 8e24b71cd2793dc7bed4459b7e7e609966e3cfe4 SHA256 2e86a4bd6aedb3acd458d50d21c2dd6ac37ae070e5d07ad7c2254118f4776802
-MISC ChangeLog 9352 RMD160 cfddb3ded9b349d0f3b156f8ec30a014d94da1dd SHA1 ffc57f1518483aa12f890133a8074afb13c21535 SHA256 3d22c23a155025fd187f7d59b894b05fab210c85dcd575ad794e8f4d8a0e0d8f
+EBUILD musepack-tools-465.ebuild 915 RMD160 1a503cb3145d80eb6d7212273f129e1cb5cde03f SHA1 b587d11986342deed84895cc2e57cac7cd7c7261 SHA256 52f28fa069c417b0b8bd0b241b26a1b6b492128cb68e30659e16579261f6f585
+MISC ChangeLog 9528 RMD160 e39468adaed5585abe0555c9b1690ba167812cef SHA1 9e3800b0103b24efc0eb9ab929c09bd639eecd61 SHA256 fd392340474735b4d73658a7eb1f9ae2ad2eaae711847e8843474db707ffe9a9
 MISC metadata.xml 160 RMD160 10be84fed28405abd22adc6689e87e5bb77e3501 SHA1 0c1bb16a7cc376ef35b87d8699ec9504718d36b9 SHA256 6bafe4a5c7b42309f124ebc2a9d78ebe5379aec4dcdc88c0bda2ab79c9851a6b
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" )