Fix SRC_URI. Fix bug 261749 and bug 273322. Remove the old wrapper, udev should be able to handle the device nodes part.

(Portage version: 2.2.0_alpha43/cvs/Linux x86_64)

6 files changed, 32 insertions, 101 deletions

diff --git a/sys-block/megamgr/ChangeLog b/sys-block/megamgr/ChangeLog
index 7f87885cd5e6..e0fd58a13214 100644
--- a/sys-block/megamgr/ChangeLog
+++ b/sys-block/megamgr/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-block/megamgr
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/megamgr/ChangeLog,v 1.5 2009/01/07 04:42:40 tsunam Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/megamgr/ChangeLog,v 1.6 2011/07/07 17:14:45 idl0r Exp $
+
+*megamgr-5.20-r2 (07 Jul 2011)
+
+  07 Jul 2011; Christian Ruppert <idl0r@gentoo.org> -megamgr-5.20.ebuild,
+  -megamgr-5.20-r1.ebuild, +megamgr-5.20-r2.ebuild, -files/megamgr,
+  -files/megamgr-r1, metadata.xml:
+  Fix SRC_URI. Fix bug 261749 and bug 273322. Remove the old wrapper, udev
+  should be able to handle the device nodes part.
 
   07 Jan 2009; <tsunam@gentoo.org> megamgr-5.20-r1.ebuild:
   Changing download url per bug 250385, thanks to Christophe Lefebvre for
diff --git a/sys-block/megamgr/files/megamgr b/sys-block/megamgr/files/megamgr
deleted file mode 100755
index 9c219f1fdd34..000000000000
--- a/sys-block/megamgr/files/megamgr
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-# Get the major number of the megadev ioctl device node
-megadev_major=$(egrep '[[:space:]]megadev$' /proc/devices 2>/dev/null | awk '{print $1}' 2>/dev/null)
-megadev_node=/dev/megadev0
-
-# MegaRAID device node major number found
-if [ -z "${megadev_major}" ]; then
-	echo "ERROR: failed to determine device node major number"
-	exit 1
-fi
-if [ -e "${megadev_node}" ]; then
-	if ! rm -f "${megadev_node}"; then
-		echo "ERROR: failed to remove existing device node ${megadev_node}"
-		exit 1
-	fi
-fi
-if ! mknod "${megadev_node}" c "${megadev_major}" 0; then
-	echo "ERROR: failed to create device node ${megadev_node}"
-	exit 1
-fi
-
-# Start the real megamgr binary
-"${0%/*}/megamgr.bin" "${@}"
diff --git a/sys-block/megamgr/files/megamgr-r1 b/sys-block/megamgr/files/megamgr-r1
deleted file mode 100755
index 37b129a6dbd2..000000000000
--- a/sys-block/megamgr/files/megamgr-r1
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-# Get the major number of the megadev ioctl device node
-megadev_major=$(egrep '[[:space:]]megadev(_legacy)?$' /proc/devices 2>/dev/null | awk '{print $1}' 2>/dev/null)
-megadev_node=/dev/megadev0
-
-# MegaRAID device node major number found
-if [ -z "${megadev_major}" ]; then
-	echo "ERROR: failed to determine device node major number"
-	exit 1
-fi
-if [ -e "${megadev_node}" ]; then
-	if ! rm -f "${megadev_node}"; then
-		echo "ERROR: failed to remove existing device node ${megadev_node}"
-		exit 1
-	fi
-fi
-if ! mknod "${megadev_node}" c "${megadev_major}" 0; then
-	echo "ERROR: failed to create device node ${megadev_node}"
-	exit 1
-fi
-
-# Start the real megamgr binary
-"${0%/*}/megamgr.bin" "${@}"
diff --git a/sys-block/megamgr/megamgr-5.20-r1.ebuild b/sys-block/megamgr/megamgr-5.20-r1.ebuild
deleted file mode 100644
index f47e58f1a6da..000000000000
--- a/sys-block/megamgr/megamgr-5.20-r1.ebuild
+++ /dev/null
@@ -1,36 +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/megamgr/megamgr-5.20-r1.ebuild,v 1.2 2009/01/07 04:42:40 tsunam Exp $
-
-inherit multilib
-
-DESCRIPTION="LSI Logic MegaRAID Text User Interface management tool"
-HOMEPAGE="http://www.lsi.com"
-SRC_URI="http://www.lsi.com/DistributionSystem/AssetDocument/files/support/rsa/utilities/megamgr/ut_linux_${PN##mega}_${PV}.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}"
-
-pkg_setup() {
-	use amd64 && { has_multilib_profile || die "needs multilib profile on amd64"; }
-}
-
-src_compile() {
-	echo "Nothing to compile."
-}
-
-src_install() {
-	newdoc ut_linux_${PN##mega}_${PV}.txt ${PN}-release-${PV}.txt
-	newsbin "${FILESDIR}"/megamgr-r1 megamgr
-	dosbin megamgr.bin
-}
diff --git a/sys-block/megamgr/megamgr-5.20.ebuild b/sys-block/megamgr/megamgr-5.20-r2.ebuild
index f7f10216cb69..00efb3063b8f 100644
--- a/sys-block/megamgr/megamgr-5.20.ebuild
+++ b/sys-block/megamgr/megamgr-5.20-r2.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2008 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/megamgr/megamgr-5.20.ebuild,v 1.2 2008/07/11 09:10:04 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/megamgr/megamgr-5.20-r2.ebuild,v 1.1 2011/07/07 17:14:45 idl0r Exp $
+
+EAPI="3"
 
 inherit multilib
 
 DESCRIPTION="LSI Logic MegaRAID Text User Interface management tool"
 HOMEPAGE="http://www.lsi.com"
-SRC_URI="http://www.lsi.com/files/support/rsa/utilities/megamgr/ut_linux_${PN##mega}_${PV}.zip"
+SRC_URI="http://www.lsi.com/downloads/Public/MegaRAID%20Common%20Files/ut_linux_${PN##mega}_${PV}.zip"
 
 LICENSE="LSI"
 SLOT="0"
@@ -17,19 +19,19 @@ IUSE=""
 
 DEPEND="app-arch/unzip"
 
-RESTRICT="strip mirror test"
+RESTRICT="mirror"
 
 S="${WORKDIR}"
 
+QA_PRESTRIPPED="/opt/bin/megamgr"
+
 pkg_setup() {
 	use amd64 && { has_multilib_profile || die "needs multilib profile on amd64"; }
 }
 
-src_compile() {
-	echo "Nothing to compile."
-}
-
 src_install() {
 	newdoc ut_linux_${PN##mega}_${PV}.txt ${PN}-release-${PV}.txt
-	dosbin "${FILESDIR}"/megamgr megamgr.bin
+
+	exeinto /opt/bin
+	newexe megamgr.bin megamgr || die
 }
diff --git a/sys-block/megamgr/metadata.xml b/sys-block/megamgr/metadata.xml
index a7162e9b7104..99b2fa655a9a 100644
--- a/sys-block/megamgr/metadata.xml
+++ b/sys-block/megamgr/metadata.xml
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!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>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>wschlich@gentoo.org</email>
+		<name>Wolfram Schlich</name>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer>
+		<email>idl0r@gentoo.org</email>
+		<name>Christian Ruppert</name>
+		<description>Secondary maintainer</description>
+	</maintainer>
 </pkgmetadata>