version bump, fix bug #231427, add ~amd64 and multilib check

(Portage version: 2.1.5.6)

4 files changed, 15 insertions, 54 deletions

diff --git a/sys-block/dellmgr/ChangeLog b/sys-block/dellmgr/ChangeLog
index c76356fa9948..9a15f148581b 100644
--- a/sys-block/dellmgr/ChangeLog
+++ b/sys-block/dellmgr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-block/dellmgr
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/dellmgr/ChangeLog,v 1.3 2008/04/24 13:06:14 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/dellmgr/ChangeLog,v 1.4 2008/07/11 09:00:26 wschlich Exp $
+
+*dellmgr-5.32 (11 Jul 2008)
+
+  11 Jul 2008; Wolfram Schlich <wschlich@gentoo.org> -files/dellmgr,
+  -dellmgr-5.31.ebuild, -dellmgr-5.31-r1.ebuild, +dellmgr-5.32.ebuild:
+  version bump, fix bug #231427, add ~amd64 and multilib check
 
   24 Apr 2008; Wolfram Schlich <wschlich@gentoo.org> files/dellmgr-r1:
   fix wrapper script
diff --git a/sys-block/dellmgr/dellmgr-5.31.ebuild b/sys-block/dellmgr/dellmgr-5.31.ebuild
deleted file mode 100644
index 3c738ac61eb5..000000000000
--- a/sys-block/dellmgr/dellmgr-5.31.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/dellmgr/dellmgr-5.31.ebuild,v 1.1 2008/02/07 19:48:22 wschlich Exp $
-
-inherit rpm
-
-MY_PV=${PV}-0
-DESCRIPTION="Dell PERC 2/3/4 RAID controller management tool"
-HOMEPAGE="http://linux.dell.com/"
-SRC_URI="http://ftp.us.dell.com/ide/perc-cerc-apps-6.03-A06.tar.gz"
-
-LICENSE="Dell"
-SLOT="0"
-# This package can never enter stable, it can't be mirrored and upstream
-# can remove the distfiles from their mirror anytime.
-KEYWORDS="~x86"
-IUSE=""
-
-RESTRICT="strip mirror test"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${A}
-	rpm_unpack "${S}"/Dellmgr-${MY_PV}.i386.rpm || die "failed to unpack RPM"
-}
-
-src_compile() {
-	echo "Nothing to compile."
-}
-
-src_install() {
-	dosbin "${FILESDIR}"/dellmgr
-	dosbin usr/sbin/dellmgr.bin
-}
diff --git a/sys-block/dellmgr/dellmgr-5.31-r1.ebuild b/sys-block/dellmgr/dellmgr-5.32.ebuild
index 59627a99cb1f..2a990d38a1be 100644
--- a/sys-block/dellmgr/dellmgr-5.31-r1.ebuild
+++ b/sys-block/dellmgr/dellmgr-5.32.ebuild
@@ -1,25 +1,29 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/dellmgr/dellmgr-5.31-r1.ebuild,v 1.1 2008/04/24 08:58:02 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/dellmgr/dellmgr-5.32.ebuild,v 1.1 2008/07/11 09:00:26 wschlich Exp $
 
 inherit rpm
 
 MY_PV=${PV}-0
 DESCRIPTION="Dell PERC 2/3/4 RAID controller management tool"
 HOMEPAGE="http://linux.dell.com/"
-SRC_URI="http://ftp.us.dell.com/ide/perc-cerc-apps-6.03-A06.tar.gz"
+SRC_URI="http://ftp.us.dell.com/scsi-raid/perc-apps-A08.tar.gz"
 
 LICENSE="Dell"
 SLOT="0"
 # This package can never enter stable, it can't be mirrored and upstream
 # can remove the distfiles from their mirror anytime.
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RESTRICT="strip mirror test"
 
 S="${WORKDIR}"
 
+pkg_setup() {
+	use amd64 && { has_multilib_profile || die "needs multilib profile on amd64"; }
+}
+
 src_unpack() {
 	unpack ${A}
 	rpm_unpack "${S}"/Dellmgr-${MY_PV}.i386.rpm || die "failed to unpack RPM"
@@ -30,6 +34,6 @@ src_compile() {
 }
 
 src_install() {
-	dosbin "${FILESDIR}"/dellmgr-r1
+	newsbin "${FILESDIR}"/dellmgr-r1 dellmgr
 	dosbin usr/sbin/dellmgr.bin
 }
diff --git a/sys-block/dellmgr/files/dellmgr b/sys-block/dellmgr/files/dellmgr
deleted file mode 100644
index b07d16d7a8ad..000000000000
--- a/sys-block/dellmgr/files/dellmgr
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-# Get the major number of the megadev ioctl node
-set -- $(grep megadev /proc/devices)
-major=${1}
-set --
-if [[ -z ${major} ]]; then
-	echo "ERROR: failed to find megadev device in /proc/devices"
-	exit 1
-fi
-# Remove device node if it already exists, just to be sure
-test -e /dev/megadev0 && rm -f /dev/megadev0
-mknod /dev/megadev0 c ${major} 0
-dellmgr.bin
-clear