Version bump resolves #337560, cleanup

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

6 files changed, 47 insertions, 141 deletions

diff --git a/sys-block/megacli/ChangeLog b/sys-block/megacli/ChangeLog
index 23359ec51aa6..2ead39583aeb 100644
--- a/sys-block/megacli/ChangeLog
+++ b/sys-block/megacli/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-block/megacli
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/megacli/ChangeLog,v 1.6 2009/05/07 13:10:49 wschlich Exp $
+# 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 $
+
+*megacli-8.00.46 (26 May 2011)
+
+  26 May 2011; Lance Albertson <ramereth@gentoo.org> -megacli-1.01.40.ebuild,
+  -megacli-2.00.15.ebuild, -megacli-4.00.11.ebuild, +megacli-8.00.46.ebuild,
+  metadata.xml:
+  Version bump resolves #337560, cleanup
 
 *megacli-2.00.15 (07 May 2009)
 
diff --git a/sys-block/megacli/Manifest b/sys-block/megacli/Manifest
index 579ef3288085..71ae2ebc8227 100644
--- a/sys-block/megacli/Manifest
+++ b/sys-block/megacli/Manifest
@@ -1,11 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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 1.01.40_Linux_Cli.zip 1325516 RMD160 36b8204d02df4777ffbb4ce32e0de40fe6586e0f SHA1 f7228553536d468250707917ba7e8f3ba2752fd4 SHA256 b3b4cdce85bdb14bebb88ad3ab3f072f22f27ca86a12a62308b40e5227157080
-DIST 2.00.15_Linux_MegaCLI.zip 1373388 RMD160 c70f0acace66a3494edfb52f500412ac3ebb1bcd SHA1 dd30508d4e265e58eb6286d8fb4ac1a0f5ae8009 SHA256 11d93efc59307ac3321c187d01b86511839ddb33ead8567783d877fff3f7284e
-DIST 4.00.11_Linux_MegaCLI.zip 1486077 RMD160 fa9b9e6e5b41aa3f3a489730b8699e114d22299f SHA1 2fe1e72f09eb4a0abdd61e52eb10f6287c84184d SHA256 26eb2546fc22489a5c4571fcab4a330b86e590f2268a451dd657d9d21b75a506
-EBUILD megacli-1.01.40.ebuild 1680 RMD160 c648f83d8d752b173c8af0c8a144daf469b447ed SHA1 8ba2e9072fbcc5c1f7f7c8a982d3454b5b2ebf89 SHA256 666093a6312ab8193bc8456100b07f2472c4a703b70fde5752348565fb2ead3a
-EBUILD megacli-2.00.15.ebuild 1764 RMD160 66dada072f392f5101641441f0de04abcbf06788 SHA1 1eca79e2a1cddf8b5df17d9aee9cf09183a7363c SHA256 035384b47e23c2dbbd69bd474d81b76cd06d0087660be4f85503e1b865064b83
-EBUILD megacli-4.00.11.ebuild 1795 RMD160 6044cd5d371d8c419306a7377a27b0306f637bda SHA1 46320588ca8321f8293eac8c9258feca14bedc0c SHA256 c8e7ae3e02936022dbdc9d41f66059e6b146835ed3a2882bc1729ef84f942466
-MISC ChangeLog 1187 RMD160 bef71fef764f30e4b0760fe50e7d75a6706f2cb2 SHA1 231193b6a8e56b32dbcf2486c2fb2f35cce978c5 SHA256 7ef3b42a288e248b6cd7aa3b6a98e9624c4e26f61ff7617a5673abf9f910db71
-MISC metadata.xml 300 RMD160 3b9c1cd628f9d7ac94b68543ec737d5c2381a47e SHA1 33c5efd31a8aa789118535b921e211ffb5023ac3 SHA256 bc07a9aecce5770d1ace9af0a6c6af8ff6c7b16eb5e7947a1b178d1970855e43
+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
+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+
+-----END PGP SIGNATURE-----
diff --git a/sys-block/megacli/megacli-1.01.40.ebuild b/sys-block/megacli/megacli-1.01.40.ebuild
deleted file mode 100644
index c2aae18bab2c..000000000000
--- a/sys-block/megacli/megacli-1.01.40.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/megacli/megacli-1.01.40.ebuild,v 1.4 2009/05/07 13:10:49 wschlich Exp $
-
-inherit rpm
-
-DESCRIPTION="LSI Logic MegaRAID Command Line Interface management tool"
-HOMEPAGE="http://www.lsi.com/"
-SRC_URI="http://www.lsi.com/DistributionSystem/AssetDocument/support/downloads/megaraid/miscellaneous/linux/${PV}_Linux_Cli.zip"
-
-LICENSE="LSI"
-SLOT="0"
-# This package can never enter stable, it can't be mirrored and upstream
-# can remove the distfiles from their mirror anytime.
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="strip mirror test"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${A}
-	rpm_unpack "${S}"/MegaCli-${PV}-0.i386.rpm || die "failed to unpack RPM"
-}
-
-src_compile() {
-	echo "Nothing to compile."
-}
-
-src_install() {
-	exeinto /opt/MegaRAID/MegaCli
-	case ${ARCH} in
-		amd64) MegaCli=MegaCli64;;
-		x86) MegaCli=MegaCli;;
-		*) die "invalid ARCH";;
-	esac
-	doexe opt/MegaRAID/MegaCli/${MegaCli}
-	dosym /opt/MegaRAID/MegaCli/${MegaCli} /usr/sbin/MegaCli
-	dodoc "${FILESDIR}"/${PV}_Linux_Cli.txt
-}
-
-pkg_postinst() {
-	einfo
-	einfo "See ${PV}_Linux_Cli.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
-	einfo "As there's no dedicated manual, you might want to have"
-	einfo "a look at the following cheat sheet:"
-	einfo "http://tools.rapidsoft.de/perc/perc-cheat-sheet.pdf"
-	einfo
-	einfo "For more information about working with Dell PERCs see:"
-	einfo "http://tools.rapidsoft.de/perc/"
-	einfo
-}
diff --git a/sys-block/megacli/megacli-2.00.15.ebuild b/sys-block/megacli/megacli-2.00.15.ebuild
deleted file mode 100644
index aaddcb6eb40a..000000000000
--- a/sys-block/megacli/megacli-2.00.15.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/megacli/megacli-2.00.15.ebuild,v 1.1 2009/05/07 13:10:49 wschlich Exp $
-
-inherit rpm
-
-DESCRIPTION="LSI Logic MegaRAID Command Line Interface management tool"
-HOMEPAGE="http://www.lsi.com/"
-SRC_URI="http://www.lsi.com/DistributionSystem/AssetDocument/support/downloads/megaraid/miscellaneous/linux/${PV}_Linux_MegaCLI.zip"
-
-LICENSE="LSI"
-SLOT="0"
-# This package can never enter stable, it can't be mirrored and upstream
-# can remove the distfiles from their mirror anytime.
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="strip mirror test"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	unpack ./MegaCliLin.zip || die "failed to unpack inner ZIP"
-	rpm_unpack "${S}"/MegaCli-${PV}-1.i386.rpm || die "failed to unpack RPM"
-}
-
-src_compile() {
-	echo "Nothing to compile."
-}
-
-src_install() {
-	exeinto /opt/MegaRAID/MegaCli
-	case ${ARCH} in
-		amd64) MegaCli=MegaCli64;;
-		x86) MegaCli=MegaCli;;
-		*) die "invalid ARCH";;
-	esac
-	doexe opt/MegaRAID/MegaCli/${MegaCli}
-	dosym /opt/MegaRAID/MegaCli/${MegaCli} /usr/sbin/MegaCli
-	dodoc "${FILESDIR}"/${PV}_Linux_MegaCLI.txt
-}
-
-pkg_postinst() {
-	einfo
-	einfo "See ${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
-	einfo "As there's no dedicated manual, you might want to have"
-	einfo "a look at the following cheat sheet:"
-	einfo "http://tools.rapidsoft.de/perc/perc-cheat-sheet.pdf"
-	einfo
-	einfo "For more information about working with Dell PERCs see:"
-	einfo "http://tools.rapidsoft.de/perc/"
-	einfo
-}
diff --git a/sys-block/megacli/megacli-4.00.11.ebuild b/sys-block/megacli/megacli-8.00.46.ebuild
index 53205b1e50ae..2827357d017b 100644
--- a/sys-block/megacli/megacli-4.00.11.ebuild
+++ b/sys-block/megacli/megacli-8.00.46.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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-4.00.11.ebuild,v 1.2 2009/05/07 13:10:49 wschlich Exp $
+# $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"
 
 inherit rpm
 
 DESCRIPTION="LSI Logic MegaRAID Command Line Interface management tool"
 HOMEPAGE="http://www.lsi.com/"
-SRC_URI="http://www.lsi.com/DistributionSystem/AssetDocument/${PV}_Linux_MegaCLI.zip"
+SRC_URI="http://www.lsi.com/DistributionSystem/User/AssetMgr.aspx?asset=56682 -> ${PV}_Linux_MegaCLI.zip"
 
 LICENSE="LSI"
 SLOT="0"
@@ -16,16 +18,16 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="app-arch/unzip"
+RDEPEND=""
 
 RESTRICT="strip mirror test"
 
-S="${WORKDIR}"
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	unpack ./MegaCliLin.zip || die "failed to unpack inner ZIP"
-	rpm_unpack "${S}"/MegaCli-${PV}-1.i386.rpm || die "failed to unpack RPM"
+	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() {
@@ -34,14 +36,18 @@ src_compile() {
 
 src_install() {
 	exeinto /opt/MegaRAID/MegaCli
+
+	libsysfs=libsysfs.so.2.0.2
 	case ${ARCH} in
-		amd64) MegaCli=MegaCli64;;
+		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
-	dodoc "${FILESDIR}"/${PV}_Linux_MegaCLI.txt
+	dosym /opt/MegaRAID/MegaCli/${MegaCli} /usr/sbin/megacli
+	dolib.so opt/lsi/3rdpartylibs/${libsysfs}
+	dodoc ${PV}_Linux_MegaCLI.txt
 }
 
 pkg_postinst() {
diff --git a/sys-block/megacli/metadata.xml b/sys-block/megacli/metadata.xml
index a7162e9b7104..640d069bc39d 100644
--- a/sys-block/megacli/metadata.xml
+++ b/sys-block/megacli/metadata.xml
@@ -2,9 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>no-herd</herd>
-<maintainer>
-	<email>wschlich@gentoo.org</email>
-	<name>Wolfram Schlich</name>
-	<description>Primary maintainer</description>
-</maintainer>
+	<maintainer>
+		<email>wschlich@gentoo.org</email>
+		<name>Wolfram Schlich</name>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer>
+		<email>ramereth@gentoo.org</email>
+		<name>Lance Albertson</name>
+		<description>Secondary maintainer</description>
+	</maintainer>
 </pkgmetadata>