Fix bug 390439 by setting properly get_libdir

Package-Manager: portage-2.1.10.34/cvs/Linux x86_64

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index b1e71661463190992c9e84956da5589da9d46f19..469f64ea2954097e3fa4642f8bf5ae792d6a8135 100644 (file)
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/blender
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.211 2011/11/13 18:52:07 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.212 2011/11/13 19:31:11 lu_zero Exp $
+
+  13 Nov 2011; Luca Barbato <lu_zero@gentoo.org> blender-2.60a.ebuild:
+  Fix bug 390439 by setting properly get_libdir
 
   13 Nov 2011; Sebastian Pipping <sping@gentoo.org> blender-2.60a.ebuild:
   Disable 3D mouse (as libspnav is not packaged yet) to fix compilation (bug

diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 35e8e2fa188b6a49e2f78cebd1d44d8d6118731e..92ba725e9a1ab77258a3b2741acbbc6f9088f820 100644 (file)
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX blender-2.37-dirs.patch 727 RMD160 ddf5c951182f809374c43f1a1cce47f4397a868c SHA1 9b3cb06a8bd23b1a5041bd3193018c2e5e28dcfd SHA256 beb5e5835cde71a00712ddf600278ca0bbdb6020123faeb6ea7a53e8f6812e5e
 AUX blender-2.44-scriptsdir.patch 2586 RMD160 8e80859edf1fae2f401b326be4cb939108879999 SHA1 50143946828d3f2b2568e71fae5ed28f6adf7449 SHA256 a7afac10ce2431cd94d10dc3f4cae33423b5a59d0c6918199006f623cd6d68e4
 AUX blender-2.46-cve-2008-1103-1.patch 636 RMD160 11d0b7dbff6e186334a80b7f6932ace4a1bd6628 SHA1 979fa1c2f0836b46dfd26c197798625a72e0a28b SHA256 a0dd64fb749a9577d84e22896872dc2956a8530700308d0aadad588191356b96
@@ -47,13 +44,6 @@ EBUILD blender-2.48a-r3.ebuild 4044 RMD160 831a9636988fb1a5ca9a406e45e6bf204511b
 EBUILD blender-2.49a.ebuild 4819 RMD160 109229feaf551d5c4829ecad0f4eb7c9cfea8c1e SHA1 3537ea47e3ccb11df14c321580559e04452bb7ee SHA256 67af33393f99caee9c451feb548d98836d2a0d75c714c253ec01416281339ed4
 EBUILD blender-2.49b-r2.ebuild 5050 RMD160 87bba6723e7f083f395666581f568848154c3233 SHA1 105297aa72047f8501775933f1d4b51bf992d60e SHA256 39dec297a537d22f07576adc90211ec8806f8d63c6c30906f58f6e51dc2cc764
 EBUILD blender-2.57-r1.ebuild 13935 RMD160 e379b03c655891ed9bfc0c0542ab5a955cc3710b SHA1 2d988031adfed101d7c6bec64ae36b7bfefba460 SHA256 98934feed8e0cc661dac38746f1a8322088269c470fb32c84d1af2c494f8f834
-EBUILD blender-2.60a.ebuild 13780 RMD160 55509870acbacb34af70b7d0479e96ab44d894a3 SHA1 8e2b789d55809fb1d4e83cdd37016048c0e2c366 SHA256 636e6d7216f541c90f7f11c08af1a4bee00fa61dd8e55eefb25007b76c062d86
-MISC ChangeLog 32704 RMD160 8cc261158c4fa8ecd9d4516f7a4ae63eaeba5a8a SHA1 06df9a2a01123e10359a611e983937fa07aed231 SHA256 6192c6bb1c9a173a63f775afa1f57b363758bf7e237fe0c0c0f1868079c9b6ea
+EBUILD blender-2.60a.ebuild 13802 RMD160 9954c3084e0e71f5110aa6416108c3282a43d433 SHA1 2ea7b5f0250c960afa33c5b0c43c324473a81438 SHA256 7dd83ad5996bce3ccb8e21f9a0b071ca75a0572bbab0df02f9cb6d87e72833cc
+MISC ChangeLog 32826 RMD160 27d3dad5a9ab12792579ad284a5bba5b9c5e851b SHA1 8f19438b3d1488667ac583c50d3afd9694245f4e SHA256 117eed3929c911f59e8bbb6e91be5d5354f5f1d2a7415db3f8b4b6072500077c
 MISC metadata.xml 1799 RMD160 7330ec5ccf7f7a86f31abf0b5f45bf84025c505a SHA1 a8bc4c5db954f24ea50e879b1bdbd5753430b3ee SHA256 f4bc849a0cc6a805fe6624699c5c1b9248336f7b879484f777f31b7c755759ea
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iEYEARECAAYFAk7AEdsACgkQsAvGakAaFgCs9ACcDreFdJzqw7vLFwLz8s7qdfVV
-VeAAmwQZC4CKhcBThC8fvgzmtVxzzxJ4
-=bL89
------END PGP SIGNATURE-----

diff --git a/media-gfx/blender/blender-2.60a.ebuild b/media-gfx/blender/blender-2.60a.ebuild
index beb073c0beef05dae757d53f1ffe7a029fe45318..8388a87d77dea25ebe7b0b1455a667e646874b93 100644 (file)
--- a/media-gfx/blender/blender-2.60a.ebuild
+++ b/media-gfx/blender/blender-2.60a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.2 2011/11/13 18:52:07 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.3 2011/11/13 19:31:11 lu_zero Exp $
 
 PYTHON_DEPEND="3:3.2"
 EAPI=4
@@ -333,9 +333,9 @@ src_install() {
 #      fi
 
        # install plugins
-       exeinto /usr/lib/${PN}/${SLOT}/plugins/texture
+       exeinto /usr/$(get_libdir)/${PN}/${SLOT}/plugins/texture
        doexe "${WORKDIR}"/${P}/release/plugins/texture/*.so
-       exeinto /usr/lib/${PN}/${SLOT}/plugins/sequences
+       exeinto /usr/$(get_libdir)/${PN}/${SLOT}/plugins/sequences
        doexe "${WORKDIR}"/${P}/release/plugins/sequence/*.so
        insinto /usr/include/${PN}/${SLOT}
        doins "${WORKDIR}"/${P}/source/blender/blenpluginapi/*.h