Update the multilib patch rather than using sed in prepare phase.

(Portage version: 2.2.0_alpha158/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

4 files changed, 57 insertions, 31 deletions

diff --git a/media-libs/libprojectm/ChangeLog b/media-libs/libprojectm/ChangeLog
index 6330a05c9f91..f716d4fbcf2b 100644
--- a/media-libs/libprojectm/ChangeLog
+++ b/media-libs/libprojectm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libprojectm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/ChangeLog,v 1.48 2013/01/21 19:54:29 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/ChangeLog,v 1.49 2013/01/21 20:03:46 scarabeus Exp $
+
+  21 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/libprojectm-2.1.0-multilib.patch,
+  -files/libprojectm-2.1.0-libsuffix.patch, libprojectm-2.1.0-r1.ebuild:
+  Update the multilib patch rather than using sed in prepare phase.
 
   21 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> -libprojectm-1.2.0.ebuild:
   Drop oldest overshadowed version.
diff --git a/media-libs/libprojectm/files/libprojectm-2.1.0-libsuffix.patch b/media-libs/libprojectm/files/libprojectm-2.1.0-libsuffix.patch
deleted file mode 100644
index 99e6d4dac574..000000000000
--- a/media-libs/libprojectm/files/libprojectm-2.1.0-libsuffix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt
-===================================================================
---- projectM-complete-2.1.0-Source.orig/src/libprojectM/CMakeLists.txt
-+++ projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt
-@@ -35,7 +35,7 @@ set(PROJECTM_ABI_LEVEL 2)
- 
- ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="\\\"${CMAKE_INSTALL_PREFIX}\\\"")
- 
--SET(LIB_INSTALL_DIR "\${exec_prefix}/lib"
-+SET(LIB_INSTALL_DIR "\${exec_prefix}/lib${LIB_SUFFIX}"
-   CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib)"
-   FORCE)
- 
-@@ -237,4 +237,4 @@ INSTALL(FILES ${Renderer_SOURCE_DIR}/pro
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/config.inp DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM)
- INSTALL(FILES projectM.hpp event.h dlldefs.h fatal.h PCM.hpp Common.hpp DESTINATION include/libprojectM)
--INSTALL(TARGETS projectM DESTINATION lib)
-+INSTALL(TARGETS projectM DESTINATION lib${LIB_SUFFIX})
diff --git a/media-libs/libprojectm/files/libprojectm-2.1.0-multilib.patch b/media-libs/libprojectm/files/libprojectm-2.1.0-multilib.patch
new file mode 100644
index 000000000000..229d0fd22559
--- /dev/null
+++ b/media-libs/libprojectm/files/libprojectm-2.1.0-multilib.patch
@@ -0,0 +1,49 @@
+From 38d610ed8f9dd1390c37e341435a4c3d1837d8be Mon Sep 17 00:00:00 2001
+From: Tomas Chvatal <tchvatal@suse.cz>
+Date: Mon, 21 Jan 2013 21:00:07 +0100
+Subject: [PATCH] Fix multilib issues in libprojectM and projectM-qt
+
+---
+ src/libprojectM/CMakeLists.txt | 6 +++---
+ src/projectM-qt/CMakeLists.txt | 4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/libprojectM/CMakeLists.txt b/src/libprojectM/CMakeLists.txt
+index 8f275c8..3bccf05 100644
+--- a/src/libprojectM/CMakeLists.txt
++++ b/src/libprojectM/CMakeLists.txt
+@@ -35,7 +35,7 @@ set(PROJECTM_ABI_LEVEL 2)
+ 
+ ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\")
+ 
+-SET(LIB_INSTALL_DIR "\${exec_prefix}/lib"
++SET(LIB_INSTALL_DIR "\${exec_prefix}/lib${LIB_SUFFIX}"
+   CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib)"
+   FORCE)
+ 
+@@ -234,7 +234,7 @@ ENDIF(projectM_FONT_MENU MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fon
+ FILE(GLOB presets "presets/*.milk" "presets/*.prjm" "presets/*.tga")
+ INSTALL(FILES ${presets} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/presets)
+ INSTALL(FILES ${Renderer_SOURCE_DIR}/projectM.cg ${Renderer_SOURCE_DIR}/blur.cg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/shaders)
+-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
++INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig)
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/config.inp DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM)
+ INSTALL(FILES projectM.hpp event.h dlldefs.h fatal.h PCM.hpp Common.hpp DESTINATION include/libprojectM)
+-INSTALL(TARGETS projectM DESTINATION lib)
++INSTALL(TARGETS projectM DESTINATION lib${LIB_SUFFIX})
+diff --git a/src/projectM-qt/CMakeLists.txt b/src/projectM-qt/CMakeLists.txt
+index 750d1ed..ed14840 100644
+--- a/src/projectM-qt/CMakeLists.txt
++++ b/src/projectM-qt/CMakeLists.txt
+@@ -131,6 +131,6 @@ include_directories(${PROJECTM_INCLUDE} ${QT_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR
+ target_link_libraries(projectM-qt projectM GLEW GL ${QT_QTGUI_LIBRARIES} ${QT_QTOPENGL_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_LIBRARIES})
+ 
+ install(FILES qprojectm_mainwindow.hpp DESTINATION include/libprojectM-qt)
+-install(TARGETS projectM-qt DESTINATION lib)
+-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libprojectM-qt.pc" DESTINATION lib/pkgconfig)
++install(TARGETS projectM-qt DESTINATION lib${LIB_SUFFIX})
++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libprojectM-qt.pc" DESTINATION lib${LIB_SUFFIX}/pkgconfig)
+ install(FILES "images/icons/prjm16-transparent.svg" DESTINATION	${CMAKE_INSTALL_PREFIX}/share/pixmaps)
+-- 
+1.7.12.4
+
diff --git a/media-libs/libprojectm/libprojectm-2.1.0-r1.ebuild b/media-libs/libprojectm/libprojectm-2.1.0-r1.ebuild
index 5ffea5ef67cb..c9b0693119e7 100644
--- a/media-libs/libprojectm/libprojectm-2.1.0-r1.ebuild
+++ b/media-libs/libprojectm/libprojectm-2.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/libprojectm-2.1.0-r1.ebuild,v 1.1 2013/01/21 19:43:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libprojectm/libprojectm-2.1.0-r1.ebuild,v 1.2 2013/01/21 20:03:46 scarabeus Exp $
 
 EAPI=5
 
@@ -30,19 +30,10 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MY_P}/src/libprojectM
 
 PATCHES=(
-	"${FILESDIR}"/${P}-libsuffix.patch
+	"${FILESDIR}"/${P}-multilib.patch
 	"${FILESDIR}"/${P}-path.patch
 )
 
-src_prepare() {
-	# fix pc file location
-	sed -i \
-		-e "s:/lib/pkgconfig:/$(get_libdir)/pkgconfig:g" \
-		CMakeLists.txt
-
-	base_src_prepare
-}
-
 src_configure() {
 	if use video_cards_nvidia; then
 		append-ldflags -L/opt/nvidia-cg-toolkit/$(get_libdir)