--- megacli-8.00.46.ebuild	2011-07-08 09:44:09.938456041 +0200
+++ megacli-8.01.06.ebuild	2011-07-08 10:03:34.412646425 +0200
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-block/megacli/megacli-8.00.46.ebuild,v 1.1 2011/05/26 18:12:27 ramereth Exp $
 
-EAPI="3"
+EAPI="4"
 
-inherit rpm
+inherit rpm multilib
 
 DESCRIPTION="LSI Logic MegaRAID Command Line Interface management tool"
 HOMEPAGE="http://www.lsi.com/"
-SRC_URI="http://www.lsi.com/DistributionSystem/User/AssetMgr.aspx?asset=56682 -> ${PV}_Linux_MegaCLI.zip"
+SRC_URI="http://www.lsi.com/downloads/Public/MegaRAID%20Common%20Files/${PV}_Linux_MegaCLI.zip"
 
 LICENSE="LSI"
 SLOT="0"
@@ -22,12 +22,24 @@
 
 RESTRICT="strip mirror test"
 
+S=${WORKDIR}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	unpack ./MegaCliLin.zip || die "failed to unpack inner ZIP"
-	rpm_unpack ./MegaCli-${PV}-1.i386.rpm || die "failed to unpack RPM"
-	rpm_unpack ./Lib_Utils-1.00-08.noarch.rpm || die "failed to unpack RPM"
+	unpack ./MegaCliLin.zip || die
+	rpm_unpack ./MegaCli-${PV}-1.i386.rpm || die
+	rpm_unpack ./Lib_Utils-1.00-08.noarch.rpm || die
+}
+
+src_prepare() {
+	libsysfs=libsysfs.so.2.0.2
+	case ${ARCH} in
+		amd64) MegaCli=MegaCli64 libsysfs_path="x86_64/${libsysfs}";;
+		x86) MegaCli=MegaCli;;
+		*) die "invalid ARCH";;
+	esac
+	export MegaCli libsysfs libsysfs_path
 }
 
 src_compile() {
@@ -37,16 +49,11 @@
 src_install() {
 	exeinto /opt/MegaRAID/MegaCli
 
-	libsysfs=libsysfs.so.2.0.2
-	case ${ARCH} in
-		amd64) MegaCli=MegaCli64 libsysfs="x86_64/${libsysfs}";;
-		x86) MegaCli=MegaCli;;
-		*) die "invalid ARCH";;
-	esac
 	doexe opt/MegaRAID/MegaCli/${MegaCli}
-	dosym /opt/MegaRAID/MegaCli/${MegaCli} /usr/sbin/MegaCli
-	dosym /opt/MegaRAID/MegaCli/${MegaCli} /usr/sbin/megacli
-	dolib.so opt/lsi/3rdpartylibs/${libsysfs}
+	dosym /opt/MegaRAID/MegaCli/${MegaCli} usr/sbin/MegaCli
+	dosym /opt/MegaRAID/MegaCli/${MegaCli} usr/sbin/megacli
+	dosym ${libsysfs} usr/$(get_libdir)/libsysfs.so.2
+	dolib.so opt/lsi/3rdpartylibs/${libsysfs_path}
 	dodoc ${PV}_Linux_MegaCLI.txt
 }