Version bump. Fixes bug 371375. Remove bundled sysfsutils. Some QA fixes. Remove fixed DT_RPATH.

Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64

6 files changed, 39 insertions, 236 deletions

diff --git a/sys-block/megacli/ChangeLog b/sys-block/megacli/ChangeLog
index 2ead39583aeb..83bb8c597f54 100644
--- a/sys-block/megacli/ChangeLog
+++ b/sys-block/megacli/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-block/megacli
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/megacli/ChangeLog,v 1.7 2011/05/26 18:12:27 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/megacli/ChangeLog,v 1.8 2011/07/11 18:42:13 idl0r Exp $
+
+*megacli-8.01.06 (11 Jul 2011)
+
+  11 Jul 2011; Christian Ruppert <idl0r@gentoo.org> -megacli-8.00.46.ebuild,
+  +megacli-8.01.06.ebuild, -files/1.01.40_Linux_Cli.txt,
+  -files/2.00.15_Linux_MegaCLI.txt, -files/4.00.11_Linux_MegaCLI.txt:
+  Version bump. Fixes bug 371375. Remove bundled sysfsutils. Some QA fixes.
+  Remove fixed DT_RPATH.
 
 *megacli-8.00.46 (26 May 2011)
 
diff --git a/sys-block/megacli/Manifest b/sys-block/megacli/Manifest
index 71ae2ebc8227..d68c58f64717 100644
--- a/sys-block/megacli/Manifest
+++ b/sys-block/megacli/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX 1.01.40_Linux_Cli.txt 1566 RMD160 3e7e46823dc1e18acc75999984deaa06fb0883ab SHA1 ad16c4bae9fee5b7ab9abe3d3a46e9a80e7f8cc1 SHA256 18d4ef415d8f02372739026b052cfbe595fc4d1989e10ea2b73ce08c9fed5a8a
-AUX 2.00.15_Linux_MegaCLI.txt 3037 RMD160 671591855262ed0fdc11898befa32afac3ef3ef4 SHA1 d70dc3bf7a49ced8af3787fd43490314345cbe86 SHA256 df9a99dbe478ac46a126fce33a5e17ef63fbc1070d2e207300a89837c2806a62
-AUX 4.00.11_Linux_MegaCLI.txt 1930 RMD160 329016500dfd30ec39cf787ebb9962d8e4b4c866 SHA1 86afb3f0a83d6e6e473e0b1016c7a4560879383f SHA256 4d93cfd667449965c29c4fed58edc8904d5b81e9154340a2ff83a281cffd4f3c
-DIST 8.00.46_Linux_MegaCLI.zip 2674478 RMD160 e2c994f83ba28837a32168cabe78f0898d7604a4 SHA1 286b4fc9667db7d50484fec87e4e089946e98bb9 SHA256 9b61f58068b1c46ae653e224512a51a6362de0e0fa16c878c41b83ec435f51e4
-EBUILD megacli-8.00.46.ebuild 2034 RMD160 4b832b34e279c12e006e31fd79559d343ca328dc SHA1 dc77aa68ee8eae8c1061d1f63e9196be2e03996b SHA256 6feac8525539299985d72476ccebe131666a30389d74f75610fa6282aeb03b13
-MISC ChangeLog 1432 RMD160 b695eda6de66485dda8916f4c31a16939a5bd631 SHA1 4dd8e17b55a95009c922f6d0bfbe32435bcb27c1 SHA256 e9caccc1a39de311d10612027cab116d9a0953a4c9a961b2ea23f995358faf76
+DIST 8.01.06_Linux_MegaCLI.zip 2711321 RMD160 3132d0db340a02647a9bc83f1327637aee89d446 SHA1 2056c7f5eeea1fc24222b935fd7f9d9a0fc216cd SHA256 c47295d3d789f6156f9e4cc2be05da809d8c79a5fe4b3f2bf4c7a150da08dc54
+EBUILD megacli-8.01.06.ebuild 1884 RMD160 d74724a975c115fdf981bd9fcb6cda9a68962946 SHA1 4125012c465fcb73627c484043df74756d2f724f SHA256 8fac2fff8b27b884939c1d4839a5e8defe32e3eb13405eba24c47e13ae49930e
+MISC ChangeLog 1767 RMD160 0d5f8740e8b188bb6fbec24fb1443800dc8f10c5 SHA1 746f2374395e14132e2949dda987dde35ebdcffb SHA256 243d2be5998a8ee5c80a773b768a1ee23c2c61e6f04640bf21ce67a08c7f264a
 MISC metadata.xml 452 RMD160 ee57a128814631684a09e18c0dc11adc0d02acaa SHA1 c73030024969e0c495072a04607525ceaa255608 SHA256 a11fce0e9be1e2ee9c876577fc8dfa6f4f37947bdeb65b4cd0b3d4c39313fdc7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iD8DBQFN3pgHQW+hXSf0t0IRAjryAKCEUquElaLNQB2V+QPMF6yrXjXWxgCfXwzx
-EWpvobAcO7GJ9M1d9sXI3OM=
-=YHY+
+iQEcBAEBCAAGBQJOG0QKAAoJEMOx0zmdw4Z1DFwH/3cgbdFOJiKBQ7LBCsthA9bG
+jnQXemh09wrPnEKZcTCS6U8zYc8mQW+mAy0frn6GKF1HN4eAniXOHwrGI5EpsPVV
+jdQF/de/vk0mpT/HDCCv/gbu+uzOSM16Pt2wDaMcQJZXOTOZxT3es6KDkn7XFlAD
+YzJZd0YsjM3iz5eNmjpKCvJrYUn8o1fkDhgYQota9SlCppGolkQp5IS+RpIaegrW
+7LcDMq4oPvoZpLwUDTn+VCKIRnbmG/5CDszX53c681o6cH0WrJTPX/uZtky/0WuV
+KpuzpE2PVdLVuUF99i+Jj75kXhjpk6smgPuOCuyukI0vN9dVZAPq/v6u0rpC+F0=
+=Wxho
 -----END PGP SIGNATURE-----
diff --git a/sys-block/megacli/files/1.01.40_Linux_Cli.txt b/sys-block/megacli/files/1.01.40_Linux_Cli.txt
deleted file mode 100644
index 36b1a2ca6ecd..000000000000
--- a/sys-block/megacli/files/1.01.40_Linux_Cli.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-*********************************************

-

-LSI Logic MegaRAID Linux MegaCLI Release 

-

-*********************************************

-

-Release Date: 10/01/07

-===================

-

-Supported Controllers

-==================

-

-MegaRAID SAS 84016E

-MegaRAID SAS 8704ELP

-MegaRAID SAS 8708ELP

-MegaRAID SAS 8888ELP

-MegaRAID SAS 8408E

-MegaRAID SAS 8480E

-MegaRAID SAS 8308ELP

-MegaRAID SAS 8344ELP

-MegaRAID SAS 8304ELP

-MegaRAID SAS 8300XLP

-MegaRAID SAS 8208ELP

-MegaRAID SAS 8208XLP

-MegaRAID SAS 8204ELP

-MegaRAID SAS 8204XLP

-MegaRAID SAS 8708EM2

-MegaRAID SAS 8880EM2

-

-

-Component:

-=========

-SAS MegaRAID Linux MegaCLI

-Release Date: 10/01/2007

-

-

-Version Numbers:	MegaCLI

-===============		===========			

-Current Version		1.01.40

-Previous Versoin	1.01.39

-

-Enhancements and Bug Fixes

-==========================

-LSID100071716 (DFCT) It´s impossible to see the cache size by MegaCli. 

-LSID100066440 (DFCT) LSI-MEGACLI: Commands failing On Netware 6.5 Sp6 on 9G Servers 

-LSID100071789 (DFCT) Typo in CLI adpallinfo 

-LSID100072738 (DFCT) SAS/CLI option to set connector mode to Auto is not shown in the help file. 

-LSID100072451 (DFCT) SWR5 -System fails with a General Protection Fault when clearing cfg using -A0,1 

-LSID100073111 (CO) do not want vitual enclosure when drives connected directly

-

-

-Known Restrictions

-================

-1.	NONE

-

-

-Known Bugs

-===========

-1.	NONE

-

-

-Installation Commands: 

-===================

-1.	Install the rpm file and run megacli from the terminal window.

-2.	Use -h option to see help menu.

diff --git a/sys-block/megacli/files/2.00.15_Linux_MegaCLI.txt b/sys-block/megacli/files/2.00.15_Linux_MegaCLI.txt
deleted file mode 100644
index a143b81e5316..000000000000
--- a/sys-block/megacli/files/2.00.15_Linux_MegaCLI.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-*********************************************

-

-LSI Logic MegaRAID Linux MegaCLI Release 

-

-*********************************************

-

-Release Date:09/23/08

-=====================

-

-Supported Controllers

-==================

-

-MegaRAID SAS 8704ELP

-MegaRAID SAS 8704EM2

-MegaRAID SAS 8708ELP

-MegaRAID SAS 8708EM2 

-MegaRAID SAS 8880EM2

-MegaRAID SAS 8888ELP

-

-

-Component:

-=========

-SAS MegaRAID Linux MegaCLI

-Release Date: 09/23/08

-

-

-Version Numbers:	MegaCLI

-===============		===========			

-Current Version		2.00.15

-Previous Versoin	2.00.11

-

-Enhancements and Bug Fixes

-==========================

-LSID100098502 (CO) CR96340 Add toggle/clear maintainpdfailhistory to CLI 

-LSID100098762 (CO) CR79693 Provide a function to view PD negotiated speed 

-LSID100099722 (CO) CR94086 Megaci to report inquiry data for enclosure  

-LSID100099723 (CO) CR94086 Megaci to report inquiry data for enclosure 

-LSID100095904 (CO) CR94572 Add support to CLI to clear the persistent data. 

-LSID100095388 (CO) CR_Ref# LSID100094883: Provide programmable delay during boot up

-LSID100096032 (CO) CR79894 CC Warning message requested

-LSID100096110 (CO) CR92395 MegaCLI for Solaris: Deliver as a package for install using "pkgadd" utility 

-LSID100096035 (CO) CR79053 SSD/HDD Detection, Mixing and RAID Level requirements 

-LSID100096109 (CO) CR93785 EbcHostCLI does not allow name specification or drive cache setting

-LSID100093792 (DFCT) CLI is not returning firmware error codes during create 

-LSID100096122 (DFCT) CLI command to save config gives wrong exit message. 

-LSID100096163 (DFCT) SCO CLI gives error message when you run command. 

-LSID100096612 (DFCT) PCLI - creation of a VD reports confirmation message with incorrect spelling 

-LSID100096754 (DFCT) CLI gives wrong output message it says created VD when VD is not created. 

-LSID100094467 (DFCT) Use Bison & Lex for windows to compile under Win. machine 

-LSID100094420 (DFCT) On specific OEM system CLI reports ambiguous character on Supported Drives 

-LSID100093404 (DFCT) MegaSCU -adpSettings doesn't return error if bad SasAddr found in INI file 

-LSID100094305 (DFCT) Firmware flash Fails if CC is running concurrently in two VDs 

-LSID100094680 (DFCT) Adpdiags fails on SLES 10 SP1 

-LSID100096121 (DFCT) Dos CLI fails to flash FW on controller. 

-LSID100094858 (DFCT) It is confusing if SCU return -1 with the msg "Failed to Program the Adapter" when any key is not correct from INI file 

-LSID100093406 (DFCT) MegaDCLI doesn't return OPROM Version 

-LSID100093869 (DFCT) FW CLI hangs at random intervals on particular system 

-LSID100094273 (DFCT) Flash fails on EFI system 

-LSID100093838 (DFCT) MegaDCLI version 2.00.02/ When displaying the help file, it displays ESRT2CLI as the command and not MegaDCLI 

-

-

-

-Known Restrictions

-================

-1.	NONE

-

-

-Known Bugs

-===========

-1.	NONE

-

-

-Installation Commands: 

-===================

-1.	Install the rpm file and run megacli from the terminal window.

-2.	Use -h option to see help menu.

-

diff --git a/sys-block/megacli/files/4.00.11_Linux_MegaCLI.txt b/sys-block/megacli/files/4.00.11_Linux_MegaCLI.txt
deleted file mode 100644
index 3c4f9ada1862..000000000000
--- a/sys-block/megacli/files/4.00.11_Linux_MegaCLI.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-*********************************************

-

-LSI Logic MegaRAID Linux MegaCLI Release 

-

-*********************************************

-

-Release Date: 02/19/2009

-========================

-

-Supported Controllers

-==================

-

-MegaRAID SAS 8704ELP

-MegaRAID SAS 8704EM2

-MegaRAID SAS 8708ELP

-MegaRAID SAS 8708EM2 

-MegaRAID SAS 8880EM2

-MegaRAID SAS 8888ELP

-

-

-Component:

-=========

-SAS MegaRAID Linux MegaCLI

-Release Date: 02/19/2009

-

-

-Version Numbers:	MegaCLI

-===============		===========			

-Current Version		4.00.11

-Previous Version	4.00.08

-

-

-Enhancements and Bug Fixes

-==========================

-LSID100106567 (CO) CR_Ref# LSID100097538: MegaCLI error messages via FW

-LSID100107491 (CO) CR_Ref# LSID100071008: Change Vivaldi drive size reporting from MB to GB.

-LSID100108945 (CO) LSIP200008587 (PR):  Show correct SATA HDD Fw versions in all Utilities  

-LSID100108959 (CO) LSIP200009557 (PR):  Add the new option in Mega CLI to schedule the Patrol Read next time. 

-LSID100107030 (DFCT) MegaCi,CmdTool2,MegaSCU gives unwanted information in commands realted Enclosure. 

-LSID100100157 (DFCT) Not Displaying Supported Raid levels 

-LSID100107389 (DFCT) Port code of Enable + Disable maintainPdFailHistory via MegaCLI from Unicoi to EF 

-LSID100107388 (DFCT) MegaCLI is expecting "noverchk" sub-option during upgrading fw pkg. 

-LSID100098542 (DFCT) Debug messages written by MegaCLI even with -nolog option 

-LSID100101003 (DFCT) Time stamp of NVRAM log shows an offset of 1 hr 

-LSID100107030 (DFCT) MegaCi,CmdTool2,MegaSCU gives unwanted information in commands realted Enclosure. 

-LSID100108055 (DFCT) MegaCli--pd info not shown for all slots.

-

-

-Known Restrictions

-================

-1.	NONE

-

-

-Known Bugs

-===========

-1.	NONE

-

-

-Installation Commands: 

-===================

-1.	Install the rpm file and run megacli from the terminal window.

-2.	Use -h option to see help menu.

-

diff --git a/sys-block/megacli/megacli-8.00.46.ebuild b/sys-block/megacli/megacli-8.01.06.ebuild
index 2827357d017b..7622046d7e28 100644
--- a/sys-block/megacli/megacli-8.00.46.ebuild
+++ b/sys-block/megacli/megacli-8.01.06.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/sys-block/megacli/megacli-8.00.46.ebuild,v 1.1 2011/05/26 18:12:27 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/megacli/megacli-8.01.06.ebuild,v 1.1 2011/07/11 18:42:13 idl0r Exp $
 
 EAPI="3"
 
@@ -8,7 +8,7 @@ inherit rpm
 
 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"
@@ -17,42 +17,41 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
+DEPEND="app-arch/unzip
+	app-admin/chrpath"
+RDEPEND="sys-fs/sysfsutils"
 
-RESTRICT="strip mirror test"
+S="${WORKDIR}"
+
+RESTRICT="mirror"
+
+QA_PRESTRIPPED="/opt/bin/megacli"
 
 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"
-}
-
-src_compile() {
-	echo "Nothing to compile."
 }
 
 src_install() {
-	exeinto /opt/MegaRAID/MegaCli
-
-	libsysfs=libsysfs.so.2.0.2
+	exeinto /opt/bin
 	case ${ARCH} in
-		amd64) MegaCli=MegaCli64 libsysfs="x86_64/${libsysfs}";;
+		amd64) MegaCli=MegaCli64;;
 		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}
+	newexe opt/MegaRAID/MegaCli/${MegaCli} megacli || die
+	dosym /opt/bin/megacli /opt/bin/MegaCli
 	dodoc ${PV}_Linux_MegaCLI.txt
+
+	# Get a rid of DT_RPATH
+	chrpath -d "${D}/opt/bin/megacli"
 }
 
 pkg_postinst() {
 	einfo
-	einfo "See ${PV}_Linux_MegaCli.txt for a list of supported controllers"
+	einfo "See /usr/share/doc/${PF}/${PV}_Linux_MegaCli.txt for a list of supported controllers"
 	einfo "(contains LSI model names only, not those sold by 3rd parties"
 	einfo "under custom names like Dell PERC etc)."
 	einfo
@@ -64,4 +63,4 @@ pkg_postinst() {
 	einfo "For more information about working with Dell PERCs see:"
 	einfo "http://tools.rapidsoft.de/perc/"
 	einfo
-}
+}
\ No newline at end of file