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

Package-Manager: portage-2.2.0_alpha158/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

5 files changed, 73 insertions, 48 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/Manifest b/media-libs/libprojectm/Manifest
index 154dffcfcc41..26b6509d406c 100644
--- a/media-libs/libprojectm/Manifest
+++ b/media-libs/libprojectm/Manifest
@@ -3,29 +3,28 @@ Hash: SHA256
 
 AUX libprojectm-1.2.0-gcc44.patch 350 SHA256 ccbc180723c15ea06e5faf33d6304099f5efdf3d81a413cc4db98b00c338d2f0 SHA512 c6544e7d187a7e0fe2786f0605dfa6156737062795d6cb5b18665b2e7f4c907153c3f168e32e12015797380f34108d7cd64dc9eb67be3fee5d7dac5618be4469 WHIRLPOOL 38f828e8c905744fb3be4251e669b20e6b15d2648af25a0b558c09b7fcb1205bc7b0c61d028c42b89a491a01c7a9146506e8aad3ba84f7e9b85af94e813bbf87
 AUX libprojectm-2.0.1-pcfix.patch 505 SHA256 242cfdb513f48a24b7c0ed8b326160424723433d56cd32aa3ac0514616aa2f20 SHA512 7e5da809e4245b17fbc1354fff373f7b9ef4ccc5f9ca9fedee453d7cc9434b0ee36fcda947f1a1f8573d83cbddb34cc4707e3aa192ded41200a0faf4929722fe WHIRLPOOL ba0877761e2892a762c6c05001df88c96c98ac06c1f225cd47d6aac01b76c1fecb7f4e3c94eb0bb9a54b790a2fbcfbc5e704b60b1c4463b0afc547a58511b25d
-AUX libprojectm-2.1.0-libsuffix.patch 1105 SHA256 d4e8d9a17762a4b9659d560b638432041eed2f4bc3d86551d7a356856c245183 SHA512 c91c7b4b564123f27779bd6fde39dbc5bb8e601174234e4d2facb07842f096c05ebf3faffdb8c6296d700d3687cc5c80da7ef9c2afc1725010bca4aedc22b113 WHIRLPOOL 28b47fd833fe68b610bc4a5d3f4668de2ecf506eec920870b7185a0d685ce07bdf55786355baf7182742f2fba9263dde63781d3b82555f96c3643bbffbf4a598
+AUX libprojectm-2.1.0-multilib.patch 2735 SHA256 a6d4291cdc32bc78c6ea12752778872474e30b4bb9189dcb26f3c48aa57ec28d SHA512 6c16f4e990adc3fef7c43a8c0765723362d3eabc938a894d6f56cdc6968fadbeae115c21eaeb467ca84526d032d9d7ab6312ae189eba3dabe47b1d8b48250909 WHIRLPOOL fc94b5f5fbede9be167a97cda1382b6f0ae4f0a8e3da448488bf35af6047a4c0f81e757df9f358f24310bf5e4182852b0093c2966b0d89737960dedd28cd16e7
 AUX libprojectm-2.1.0-path.patch 668 SHA256 13e71427f25229e8729153fa31cf72c0d0e8de3d8c5767cb5dffee94adeacdc0 SHA512 a119198702e63c7fd5d5aff634f81fe49a6a5689b86fea4152c27601d2d78a01ff51bf3edada50dd31bbc0a505f2ae0f5846a29e3c41ef9439b5f196c8423a99 WHIRLPOOL 19e6461da1c7114567eb1999b286aadd01adda8fd630f16071cfc5ef884ea1170adcc56cd10bb3beebe6dc9e8fde6c1999c6e9d3c5def8e83add95fb55f54e1d
 DIST projectM-2.0.1-Source.tar.gz 865784 SHA256 c305182dfc8b7f87b82a146af6cf50a982e7c9c647877a0559dfef4b11dacb93 SHA512 0edbf487d45983b0004ee67009931da985f3b9909cb10eb32a2c9116eed46f9cf9c7a1c696138d16a30aedd81d43ac5533fb7666c9fba9326c9c89f4e87f88db WHIRLPOOL e69b0130592fe92969a569542d9c4f1bfcb7a365d538e84a64180b48aa88d64b1076d9ad3f071d99348f987149e8e1b012dbc5d41fef7156f57b55512e111d08
 DIST projectM-complete-2.1.0-Source.tar.gz 31130351 SHA256 513204f033006bd3dcdf8aada196d816d6b7187266ddcbb1594d0285cc9406ee SHA512 53f4531208d2594f1c28a7f7842fb5ee3349ca9e48f9f0d999a90b6a62d315c9c0ae9cba1cdfacb8a149eba3e5ddc4517ac406ee2c53718191be8e26ee2cca5f WHIRLPOOL f60ee006dac8465a17e1397a9331bdabd7a3967455f9e16644e1ff5e544ab1662b3aa8a2b428c0258f0b38c91513bfbda3cd29b4419e05e64aa410e61ad03972
 EBUILD libprojectm-2.0.1-r1.ebuild 1317 SHA256 166e292b1f7c0ecd3321b2abe7bb19888fefdb939a186170e0d677953aec87ff SHA512 eef20f24b5c127f13d8123273b1704a4794db92b606efc4fe33422e0708ca42edf140c3e44332ccc8cb40d953936ff1be754c50131c2dedf26b3dd866fe05d66 WHIRLPOOL a3743f8f546a81614a13b532645a560ce2f1481b131784c6ed029d630765f807434d08c21fd194a7deb9cd9ebc43248c2004fa6865a0c8e15a8a5389b6b14f94
-EBUILD libprojectm-2.1.0-r1.ebuild 1705 SHA256 8e89769b601164437d150d7cc25ee5d9efe576823b6f03a12828186db3a83225 SHA512 26224deb82c68c77e61a5681101748ffe6777d8494797a14156825ca3d87987a744c3c2afcee7fd8b7ce10e4c350488866840e89b6f0c7e9de268caface33a7f WHIRLPOOL 117ff2954b5eed8b2c656c5c34872755bd52f9068c44197e60aecaef6b2800700430512b8244e411d1537f9b938462379ae96ccab2303fb11d8ea3a974b19604
-EBUILD libprojectm-2.1.0.ebuild 1371 SHA256 b9d48c61ec249b9f866a73a97b52fce0c22e0251526157cbab07ee93dc480077 SHA512 1f04bea45dc990eeb45645eb81fb99af64024119260208bfbe57be9a2437f1d8ab00fdbff5714bee5f78da03c0f3a912398832d4338d9fa482db72cc898a3aaf WHIRLPOOL 8b61f4f3e62d120bef12e7c7eaac641ca712d0b7d74af2668437d7bb1324893891e1fd272ff407cebeb533dfe57f1480ce6b0e9f3464397c625df2abf9c97832
-MISC ChangeLog 7104 SHA256 44f1c0feb95de5095ca2a854b2b78ad82ec366f414445ad6a33f33d75ed4edc1 SHA512 cd1acaca9c41cd411a86028b19d5565ab63c7e6a3d57715f87a339d6c12e6978a5c0fd9991b4749098212c03a263f3696f0a5150ec8bcffddc721bfaffab5aa4 WHIRLPOOL 9af12eb366e429eeaa03bd359dacd13f290dc7a85094f5ee190376974f8c945cf3e232ccd1fbd3d0fb775d77469f26ffdbf6a1bfebe7aaf31e59a9bad6a90db0
+EBUILD libprojectm-2.1.0-r1.ebuild 1562 SHA256 49157bdd283d52f9e4b5b1afa2f3ca5b11ceb362bf8c842fbd800f99c7fdd6e9 SHA512 7269c3d5b0fe7b08971854f1701387d5aef60b1421781b52c6c12765edc02a2f981d0e04d59ed74da15f9050c01a8a2a693225fa308e3e02b34c503f8513b6cb WHIRLPOOL ae269b5b09a4e638c03d70ddcb6409c79af9e3769abd3c8e1328ee1d52b12657dad4f6731652d05bac74651db34fcab13c4d7c9e0ef2e0ad0baf285b3e0a31bd
+MISC ChangeLog 7344 SHA256 7c0991acf710cba7c6b9bdafc78dcdbcb35261d89091a45b24a433463487824d SHA512 f3c25ea1d782bdb63664af26b77842da058cf71e98228f8cce830d18425b2cf98e273e5f12d66a504e11e138fb6d99b0d5ff28c7309663dbe0f763449aa7a45d WHIRLPOOL 81930eb0584c8e4f65e4cff99f1bfafda1b291174ac5ecb3b101d4b400d56e317bef1506d6d5b5aa64f70e11584d170ec2c60ad7df90f7aafe33e9eca132b2fd
 MISC metadata.xml 158 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b SHA512 90f74979d228a35f81de50665ead63d228bc4f0d11f3def4832c9607f4242cbc4562db0a123bdcf2c4b6e0be78fc5565a65f75cdb53ed4c8d45544ebf74255dc WHIRLPOOL a90483bd4fa01ed5fa21bfe9f59c11b97c793146e3031eae342a3355c6dc2e4ef2b356af0bf711b5e16e16551c91d63ecdbb48e708df606017264e8bff5e9fe9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ/Zz2AAoJEOSiRoyO7jvojrIP+gIlv0dbkn7Z5+LHiVKOTwGR
-8zSOoTcQVl4H1qUAbhetJr3+E7EXuN/ElErWIZyp065i44g2hNkQmOgSGkSBiBvs
-CTzrBPB9/y8v5Ffqy6DS8ib/gCZDP4Pxmyo3cUUd/jN1XbRke/ii9XIc2mAAzMe3
-fFCq2SBu6y79TEk1rwuKJT0glsnqrVf9e8QfCE6BNk2wCfhnKy0FgiVsatgP8QFu
-/1rUSLwNgJ+Q7Frpo9pAjw/92pqKHwEoV7G+fkNTzeUxJWtaW8RQIeOO0pwMhHHE
-dRFUX7pB3PsKvolh4akO/hnV8+O/qsrWIjV5tWRUhxxv4FTt72OtUw9/iQeT7XoF
-Dm3bTBlGXOeJbPFaaGzo/U9YaREhXzvf62BYDthqvg0Rh1kkAfxuef24rS1ZBYXj
-7md1weLwd0rJYiYlgyP7lqEdkYhC5sQBiOPLfXNsLkxZeFBUR37yZjMUkLJOJqhX
-FPWQGyeNUmZ6zx+4i1SWtu4anaeJki4D7adUn12ldXRfV4ne6xqJmRJooDLJAml9
-gALgz/yzm2XW8XFA9rFH7TDNsYxnb8eipJkCCawUHqYURDqOQz5+BiKjIXic7Tv7
-2MN6BXdC1NqocWYD+R0aa3c2p1exIgNJbehqrNMTV2YctNbuqNOUBM2mToAKqHb8
-rPLLbfP5H5BL3XR15dyC
-=khcS
+iQIcBAEBCAAGBQJQ/Z8kAAoJEOSiRoyO7jvo7AgP/j+PJPue2dX/NMHO7yiEt8YV
+xllhJwYz0FILsSHgZ1FtU4BYHa7UPt10tcCT3Zc9eSQ3m6cZbUdF3G11WTsQJb+6
+900iiytj5rDtGB7sN5TynUyi0Mxj8dvoOHy3o6B5nfPAuWnOONoUsNeD5ZJPbjTq
+8J78L22iqPwZA/8JXn7XoMiTgF43isnb8HMQPCvJJDkWyzE+gXFdaW/alrrfjV6b
+nzZIqpa34aAkAeJwO9178bgienxAjIyni6juTPDZDd78CANM/fKqUzM24saBkC3W
+n3pv4AKho7aPb6Fwj3rR43uh6JRWUGcQB8+pcZe3rL25wkkdf6ctWy1uj/bsJbrd
+eVo/se+X9NPaCEhyJS8OnUPoyU/QJOJMZ30Y1bglNd9a3gJ7ONYnQMSv35m2Fd9m
+bqvhiiVo60xjrHFuCiU/54eLXwzSvu4Oa3ud4fo3bchCieJ02NVfgoU1YQvkqtJf
+fh7AQMtZdgXkeiIL+3yVYZIxYUA5Cc6DxGRSE6gHq8qM2AQXNcv54G1EmSHnQVoU
+NdFf3tsD6wtWSlreDuIHeIjNzB4fPOBxz6U3+mf38qO6w5Usk+8+/29Zwgx4SP97
+RtqLbsR3+MihbknGNHDAq+2SVUejeQGF8hh4Ho631Ut06M8HJujrrkIvWePYcVyy
+XRa98Fgg2BjuyYRsvPQn
+=YxBu
 -----END PGP SIGNATURE-----
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)