Update patch for upstream.

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

4 files changed, 54 insertions, 13 deletions

diff --git a/media-libs/libreplaygain/ChangeLog b/media-libs/libreplaygain/ChangeLog
index abcc466a3275..5435a382860b 100644
--- a/media-libs/libreplaygain/ChangeLog
+++ b/media-libs/libreplaygain/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libreplaygain
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libreplaygain/ChangeLog,v 1.4 2009/07/29 14:29:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libreplaygain/ChangeLog,v 1.5 2009/07/31 13:32:13 ssuominen Exp $
+
+  31 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  libreplaygain-444.ebuild, files/libreplaygain-444-multilib.patch:
+  Update patch for upstream.
 
   29 Jul 2009; Jeroen Roovers <jer@gentoo.org> libreplaygain-444.ebuild:
   Marked ~hppa (bug #279069).
diff --git a/media-libs/libreplaygain/Manifest b/media-libs/libreplaygain/Manifest
index 358e088a7b87..98ac6e00a03d 100644
--- a/media-libs/libreplaygain/Manifest
+++ b/media-libs/libreplaygain/Manifest
@@ -1,5 +1,5 @@
-AUX libreplaygain-444-multilib.patch 676 RMD160 68375b65a1e46480fe5aed0c089e504025b8dbe5 SHA1 57186de514c1c536bd5ae44fda3a393e3bebb3f9 SHA256 1d80c6247da632b5cda948616573b4f559d0676faa1b2006dc4aba5a05f42001
+AUX libreplaygain-444-multilib.patch 2030 RMD160 368cdc1ab3c3524714267bec47f6ef1b4ce4f83e SHA1 ede663c5db226c5959a7c4314e328c96dbf1c1cf SHA256 d7513551551558ceb7f60b5511a8ed8f86b2f6f36c8563c2b1f231e0c2d66926
 DIST libreplaygain-444.tar.bz2 12540 RMD160 758b0ee00fe64ba64a82855f08b371737d391de9 SHA1 5c9ebeb1d244aeb691f87a94bca1e25553974656 SHA256 a4264b1980e7b5e0bc7887bfcc7d0b125ac466a1b33a428e413048fe2a52cf9e
-EBUILD libreplaygain-444.ebuild 754 RMD160 87c2833ca9dc2d9fb0588cd71232ac66ffd6920b SHA1 c6040e47bd1f69b6837ae7223dc2c106428d936f SHA256 0082733a7fe070be4143ef7f95901fae2abacafad282adb00a411ec3163e57e3
-MISC ChangeLog 715 RMD160 648b4bd6ec6a7908503a7a66c39ebde7dcc8af37 SHA1 7abce37c1a99153b59c7e000d6079c8dca617442 SHA256 e61548eea23b5c701f52e65452ce0f401f288733aa039410ab84502e1241b767
+EBUILD libreplaygain-444.ebuild 834 RMD160 b6a1dc635d18b80282a4269a924972da748e6483 SHA1 ed692885913de86595595ad1f48aa883cbbe2bd8 SHA256 edc46842e735d2a0bdab92bfc5765223fd73bee7e26063b2b593feb91e5196a8
+MISC ChangeLog 873 RMD160 00248856232a370a41eb3a1e86d5a4a0accf8d99 SHA1 4466b97707011fb746e6dc11c70467e7433e7118 SHA256 d2040518bd10c35c027b111e11401d603635fe3a3f01667faad990d0f6293b9a
 MISC metadata.xml 159 RMD160 568344dc99ebe68c2e2d43d268d186757532144d SHA1 3f9589301dbaa4363c56de0f309cf792d8c38b63 SHA256 eb5b8cfa9aed067cd72d6439beac2dd0abdba30248f27e4b337012b493a18369
diff --git a/media-libs/libreplaygain/files/libreplaygain-444-multilib.patch b/media-libs/libreplaygain/files/libreplaygain-444-multilib.patch
index d1cceb05e9bc..16bc0ea5aa8f 100644
--- a/media-libs/libreplaygain/files/libreplaygain-444-multilib.patch
+++ b/media-libs/libreplaygain/files/libreplaygain-444-multilib.patch
@@ -1,9 +1,42 @@
-diff -ur libreplaygain-444.orig/src/CMakeLists.txt libreplaygain-444/src/CMakeLists.txt
+diff -ruN libreplaygain-444.orig/CMakeLists.txt libreplaygain-444/CMakeLists.txt
+--- libreplaygain-444.orig/CMakeLists.txt	2009-07-25 14:49:52.000000000 +0300
++++ libreplaygain-444/CMakeLists.txt	2009-07-31 16:29:50.000000000 +0300
+@@ -4,8 +4,11 @@
+ 

+ set(CMAKE_VERBOSE_MAKEFILE false)

+ 

++option(SHARED "Use shared libreplaygain" OFF)

++

+ if(NOT MSVC)

+ set(CMAKE_C_FLAGS "-O3 -fomit-frame-pointer -pipe")

+ endif(NOT MSVC)

+ 

+-add_subdirectory(src)
+\ No newline at end of file
++add_subdirectory(src)

++add_subdirectory(include)

+diff -ruN libreplaygain-444.orig/include/CMakeLists.txt libreplaygain-444/include/CMakeLists.txt
+--- libreplaygain-444.orig/include/CMakeLists.txt	1970-01-01 02:00:00.000000000 +0200
++++ libreplaygain-444/include/CMakeLists.txt	2009-07-31 16:28:59.000000000 +0300
+@@ -0,0 +1 @@
++INSTALL(DIRECTORY replaygain DESTINATION include)
+diff -ruN libreplaygain-444.orig/src/CMakeLists.txt libreplaygain-444/src/CMakeLists.txt
 --- libreplaygain-444.orig/src/CMakeLists.txt	2009-07-25 14:49:52.000000000 +0300
-+++ libreplaygain-444/src/CMakeLists.txt	2009-07-25 15:00:48.000000000 +0300
-@@ -6,4 +6,4 @@
- add_library(replaygain-shared SHARED gain_analysis)
- set_target_properties(replaygain-shared PROPERTIES OUTPUT_NAME replaygain CLEAN_DIRECT_OUTPUT 1 VERSION 1.0.0 SOVERSION 1)
++++ libreplaygain-444/src/CMakeLists.txt	2009-07-31 16:31:36.000000000 +0300
+@@ -3,7 +3,13 @@
+ add_library(replaygain-static STATIC gain_analysis)
+ set_target_properties(replaygain-static PROPERTIES OUTPUT_NAME replaygain CLEAN_DIRECT_OUTPUT 1)
+ 
+-add_library(replaygain-shared SHARED gain_analysis)
+-set_target_properties(replaygain-shared PROPERTIES OUTPUT_NAME replaygain CLEAN_DIRECT_OUTPUT 1 VERSION 1.0.0 SOVERSION 1)
++if(SHARED)
++  add_library(replaygain-shared SHARED gain_analysis)
++  set_target_properties(replaygain-shared PROPERTIES OUTPUT_NAME replaygain CLEAN_DIRECT_OUTPUT 1 VERSION 1.0.0 SOVERSION 1)
++endif(SHARED)
  
 -install(TARGETS replaygain-static replaygain-shared LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
-+install(TARGETS replaygain-static replaygain-shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
++install(TARGETS replaygain-static LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
++
++if(SHARED)
++  install(TARGETS replaygain-shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
++endif(SHARED)
diff --git a/media-libs/libreplaygain/libreplaygain-444.ebuild b/media-libs/libreplaygain/libreplaygain-444.ebuild
index 699fe6598daa..35d5696e9800 100644
--- a/media-libs/libreplaygain/libreplaygain-444.ebuild
+++ b/media-libs/libreplaygain/libreplaygain-444.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libreplaygain/libreplaygain-444.ebuild,v 1.8 2009/07/29 14:29:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libreplaygain/libreplaygain-444.ebuild,v 1.9 2009/07/31 13:32:13 ssuominen Exp $
 
 inherit cmake-utils
 
@@ -18,8 +18,12 @@ IUSE=""
 
 PATCHES=( "${FILESDIR}/${P}-multilib.patch" )
 
+pkg_setup() {
+	mycmakeargs="-DSHARED=ON"
+}
+
 src_install() {
 	cmake-utils_src_install
-	insinto /usr/include/replaygain
-	doins -r include/replaygain/*.h || die "doins failed"
+	# Forgot to remove .svn directories from snapshot.
+	rm -rf "${D}"/usr/include/replaygain/.svn || die "rm -rf failed"
 }