Version bump resolves #337560, cleanup

(Portage version: 2.1.9.42/cvs/Linux x86_64)

5 files changed, 33 insertions, 133 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/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>