Forgot to commit this...

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

3 files changed, 40 insertions, 10 deletions

diff --git a/media-libs/libcuefile/ChangeLog b/media-libs/libcuefile/ChangeLog
index 8db9515bd4ef..d9be572e1074 100644
--- a/media-libs/libcuefile/ChangeLog
+++ b/media-libs/libcuefile/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libcuefile
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcuefile/ChangeLog,v 1.4 2009/07/29 14:31:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcuefile/ChangeLog,v 1.5 2009/07/31 18:30:43 ssuominen Exp $
+
+  31 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> libcuefile-444.ebuild,
+  files/libcuefile-444-multilib_and_shared.patch:
+  Update patch for upstream.
 
   29 Jul 2009; Jeroen Roovers <jer@gentoo.org> libcuefile-444.ebuild:
   Marked ~hppa (bug #279069).
diff --git a/media-libs/libcuefile/files/libcuefile-444-multilib_and_shared.patch b/media-libs/libcuefile/files/libcuefile-444-multilib_and_shared.patch
index e23e741e9763..cecc75167499 100644
--- a/media-libs/libcuefile/files/libcuefile-444-multilib_and_shared.patch
+++ b/media-libs/libcuefile/files/libcuefile-444-multilib_and_shared.patch
@@ -1,7 +1,23 @@
-diff -ur libcuefile-444.orig/src/CMakeLists.txt libcuefile-444/src/CMakeLists.txt
+diff -ruN libcuefile-444.orig/CMakeLists.txt libcuefile-444/CMakeLists.txt
+--- libcuefile-444.orig/CMakeLists.txt	2009-07-25 15:58:50.000000000 +0300
++++ libcuefile-444/CMakeLists.txt	2009-07-31 16:35:29.000000000 +0300
+@@ -4,4 +4,7 @@
+ 

+ set(CMAKE_VERBOSE_MAKEFILE false)

+ 

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

++

+ add_subdirectory(src)

++add_subdirectory(include)

+diff -ruN libcuefile-444.orig/include/CMakeLists.txt libcuefile-444/include/CMakeLists.txt
+--- libcuefile-444.orig/include/CMakeLists.txt	1970-01-01 02:00:00.000000000 +0200
++++ libcuefile-444/include/CMakeLists.txt	2009-07-31 16:37:17.000000000 +0300
+@@ -0,0 +1 @@
++INSTALL(DIRECTORY cuetools DESTINATION include)
+diff -ruN libcuefile-444.orig/src/CMakeLists.txt libcuefile-444/src/CMakeLists.txt
 --- libcuefile-444.orig/src/CMakeLists.txt	2009-07-25 15:58:50.000000000 +0300
-+++ libcuefile-444/src/CMakeLists.txt	2009-07-25 16:04:43.000000000 +0300
-@@ -1,3 +1,10 @@
++++ libcuefile-444/src/CMakeLists.txt	2009-07-31 16:36:16.000000000 +0300
+@@ -1,3 +1,16 @@
  add_definitions(-DYY_NEVER_INTERACTIVE)
  include_directories(${libcuefile_SOURCE_DIR}/include)
 -add_library(cuefile STATIC cd cdtext cue_parse cue_print cue_scan cuefile time toc toc_parse toc_print toc_scan)
@@ -10,7 +26,13 @@ diff -ur libcuefile-444.orig/src/CMakeLists.txt libcuefile-444/src/CMakeLists.tx
 +add_library(cuefile-static STATIC cd cdtext cue_parse cue_print cue_scan cuefile time toc toc_parse toc_print toc_scan)
 +set_target_properties(cuefile-static PROPERTIES OUTPUT_NAME cuefile CLEAN_DIRECT_OUTPUT 1)
 +
-+add_library(cuefile-shared SHARED cd cdtext cue_parse cue_print cue_scan cuefile time toc toc_parse toc_print toc_scan)
-+set_target_properties(cuefile-shared PROPERTIES OUTPUT_NAME cuefile CLEAN_DIRECT_OUTPUT 1 VERSION 0.0.0 SOVERSION 0)
++if(SHARED)
++  add_library(cuefile-shared SHARED cd cdtext cue_parse cue_print cue_scan cuefile time toc toc_parse toc_print toc_scan)
++  set_target_properties(cuefile-shared PROPERTIES OUTPUT_NAME cuefile CLEAN_DIRECT_OUTPUT 1 VERSION 0.0.0 SOVERSION 0)
++endif(SHARED)
 +
-+install(TARGETS cuefile-static cuefile-shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
++install(TARGETS cuefile-static LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
++
++if(SHARED)
++  install(TARGETS cuefile-shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
++endif(SHARED)
diff --git a/media-libs/libcuefile/libcuefile-444.ebuild b/media-libs/libcuefile/libcuefile-444.ebuild
index 1669185cb15a..370ae777fe73 100644
--- a/media-libs/libcuefile/libcuefile-444.ebuild
+++ b/media-libs/libcuefile/libcuefile-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/libcuefile/libcuefile-444.ebuild,v 1.5 2009/07/29 14:31:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcuefile/libcuefile-444.ebuild,v 1.6 2009/07/31 18:30:43 ssuominen Exp $
 
 inherit cmake-utils
 
@@ -18,8 +18,12 @@ IUSE=""
 
 PATCHES=( "${FILESDIR}/${P}-multilib_and_shared.patch" )
 
+pkg_setup() {
+	mycmakeargs="-DSHARED=ON"
+}
+
 src_install() {
 	cmake-utils_src_install
-	insinto /usr/include/cuetools
-	doins include/cuetools/*.h || die "doins failed"
+	# Forgot to remove .svn directories from snapshot.
+	rm -rf "${D}"/usr/include/cuetools/.svn || die "rm -rf failed"
 }