app-misc/mc-mp: Make this multilib friendly

svn path=/sunrise/; revision=2616

3 files changed, 23 insertions, 20 deletions

diff --git a/app-misc/mc-mp/ChangeLog b/app-misc/mc-mp/ChangeLog
index 84a774c0d..f2b2f7cd0 100644
--- a/app-misc/mc-mp/ChangeLog
+++ b/app-misc/mc-mp/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for app-misc/mc-mp
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Jan 2007; Jakub Moc <jakub@gentoo.org> mc-mp-4.1.40_pre9.ebuild:
+  Make this multilib friendly
+
   09 Jun 2006; Jakub Moc <jakub@gentoo.org> +mc-mp-4.1.40_pre9.ebuild:
   New ebuild, based on work of Dmitry S. Kulyabov. Bug 35032.
 
diff --git a/app-misc/mc-mp/Manifest b/app-misc/mc-mp/Manifest
index a7e88b76f..6f8424d13 100644
--- a/app-misc/mc-mp/Manifest
+++ b/app-misc/mc-mp/Manifest
@@ -39,14 +39,14 @@ MD5 ac27c225eeccafdd68871714a9c18b7c files/mcserv.rc 727
 RMD160 e67ca2c2c5d6c63568c01e66240c3111ea4b4651 files/mcserv.rc 727
 SHA256 e7b586089b0e1bc97ebde285ccfbd31845b649dd0a3de9d322dde34a0a6a5f1e files/mcserv.rc 727
 DIST mc-4.1.40-pre9.tar.bz2 991346 RMD160 83a46ad300cf8ce950b62eb1bfef455e90a90709 SHA1 3babc25d79fd7c4e498665fd6259f3c103e340b3 SHA256 a191e9ca93767af876fa2dade7c77db86bef42c304d2f3a10216d4be98b5805a
-EBUILD mc-mp-4.1.40_pre9.ebuild 3068 RMD160 d2b7656e3adb24dbb8efdb003ad12862b328cda4 SHA1 0dd7c13441d5846b24154c08d0d8e25d7102e56b SHA256 fb249a4b182a2d1f13a90b22caf35370f204a327b3a7f990757ff4246bc670e8
-MD5 ee38daab0880ba58a9bade1d5a1d0a56 mc-mp-4.1.40_pre9.ebuild 3068
-RMD160 d2b7656e3adb24dbb8efdb003ad12862b328cda4 mc-mp-4.1.40_pre9.ebuild 3068
-SHA256 fb249a4b182a2d1f13a90b22caf35370f204a327b3a7f990757ff4246bc670e8 mc-mp-4.1.40_pre9.ebuild 3068
-MISC ChangeLog 249 RMD160 8afe3a0d8c605ecfa9c2d4f155fa8d0bf0bd6667 SHA1 091d991a37f20da25b25770f07ed82c7c8d09051 SHA256 e622ff786fa93299a6d97cf0af1562e21747e1f2b18f9c3d0335e86ec1e18c5b
-MD5 df56d49412a22061bb1df70c385d4841 ChangeLog 249
-RMD160 8afe3a0d8c605ecfa9c2d4f155fa8d0bf0bd6667 ChangeLog 249
-SHA256 e622ff786fa93299a6d97cf0af1562e21747e1f2b18f9c3d0335e86ec1e18c5b ChangeLog 249
+EBUILD mc-mp-4.1.40_pre9.ebuild 3167 RMD160 702f07719e3aff90892588b02489bc7720a7a1a8 SHA1 311d60e1bb6b01578d1daa712061bad2cbfecb98 SHA256 bcb5190d618fd2604641ce2f2881ad422bf6838777c03f301588d85fc3866211
+MD5 6ba49a842e7263d0aa9520187901e921 mc-mp-4.1.40_pre9.ebuild 3167
+RMD160 702f07719e3aff90892588b02489bc7720a7a1a8 mc-mp-4.1.40_pre9.ebuild 3167
+SHA256 bcb5190d618fd2604641ce2f2881ad422bf6838777c03f301588d85fc3866211 mc-mp-4.1.40_pre9.ebuild 3167
+MISC ChangeLog 350 RMD160 cba1bdd3913385267df11575e31d4fd8b0b398ab SHA1 4ee6f9cc5a455873fdf56de3b4b1b3ee4f006543 SHA256 5cea4096c935a67eb00e327cda0e0d04cd3008a98b1c05fea45d7c12bf478332
+MD5 e2ea3db2460bd3268fbf383b75cccd80 ChangeLog 350
+RMD160 cba1bdd3913385267df11575e31d4fd8b0b398ab ChangeLog 350
+SHA256 5cea4096c935a67eb00e327cda0e0d04cd3008a98b1c05fea45d7c12bf478332 ChangeLog 350
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
diff --git a/app-misc/mc-mp/mc-mp-4.1.40_pre9.ebuild b/app-misc/mc-mp/mc-mp-4.1.40_pre9.ebuild
index 506c96d75..27f9dac96 100644
--- a/app-misc/mc-mp/mc-mp-4.1.40_pre9.ebuild
+++ b/app-misc/mc-mp/mc-mp-4.1.40_pre9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit flag-o-matic eutils pam
+inherit flag-o-matic eutils pam multilib
 
 MY_PN="mc"
 MY_P="${MY_PN}-${PV/_/-}"
@@ -88,25 +88,25 @@ src_compile() {
 }
 
 src_install() {
-	cat "${FILESDIR}/chdir.gentoo" > "${S}/lib/mc.sh"
+	cat "${FILESDIR}/chdir.gentoo" > "${S}/$(get_libdir)/mc.sh"
 	rm -f "${S}/README."{NT,OS2,QNX}
 
 	einstall || die
 
 	# install cons.saver setuid, to actually work
-	chmod u+s "${D}/usr/lib/mc/bin/cons.saver"
+	chmod u+s "${D}/usr/$(get_libdir)/mc/bin/cons.saver"
 
 	use pam && newpamd "${FILESDIR}/mcserv.pamd" mcserv
 	use pam && newinitd "${FILESDIR}/mcserv.rc" mcserv
 
-	exeinto /usr/lib/mc/bin
-	doexe "${S}/lib/mc.sh"
-	doexe "${S}/lib/mc.csh"
+	exeinto /usr/$(get_libdir)/mc/bin
+	doexe "${S}/$(get_libdir)/mc.sh"
+	doexe "${S}/$(get_libdir)/mc.csh"
 
-	insinto /usr/lib/mc
+	insinto /usr/$(get_libdir)/mc
 	doins "${FILESDIR}/mc."{gentoo,ini}
 
-	insinto /usr/lib/mc/syntax
+	insinto /usr/$(get_libdir)/mc/syntax
 	doins "${FILESDIR}/ebuild.syntax"
 
 	rm -rf "${D}/usr/man" "${D}/usr/share/man"
@@ -119,7 +119,7 @@ pkg_postinst() {
 	elog "allow mc to chdir to its latest working dir at exit"
 	elog
 	elog "# Midnight Commander chdir enhancement"
-	elog "if [ -f /usr/lib/mc/mc.gentoo ]; then"
-	elog ". /usr/lib/mc/mc.gentoo"
+	elog "if [ -f /usr/$(get_libdir)/mc/mc.gentoo ]; then"
+	elog ". /usr/$(get_libdir)/mc/mc.gentoo"
 	elog "fi"
 }