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

Package-Manager: portage-2.1.5.6

5 files changed, 18 insertions, 59 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/Manifest b/sys-block/dellmgr/Manifest
index 4d0e0aaf1a1a..0ac35f487334 100644
--- a/sys-block/dellmgr/Manifest
+++ b/sys-block/dellmgr/Manifest
@@ -1,7 +1,5 @@
-AUX dellmgr 371 RMD160 12f9b5c08acb41b0d229e2e8a6fbf76689252262 SHA1 8c9e92b6f2b1d3bc0353afb97965e21602b25967 SHA256 2a1cc0fb5a116b44bb6d613726585a152d4f90113724dc7933a30e8268bc0796
 AUX dellmgr-r1 692 RMD160 99673068163f9cbf776fad32af5aadfb27d523e5 SHA1 bf7f3bf03aa3ee5248e74e333e0a3c768767f2e3 SHA256 b3a1d5926ca916cc270fba667dde41e72e123d448c9937a5c599033ff779b7bd
-DIST perc-cerc-apps-6.03-A06.tar.gz 860474 RMD160 fd4ac34992195e23c0e9f0e728fc928dec69d48e SHA1 5c623be885690e44260ede13915f358669a32fea SHA256 695c0962cf803ce3dd0f94ccd6e692d7c87fd653307dc884ba6eb3d3c8190bc8
-EBUILD dellmgr-5.31-r1.ebuild 872 RMD160 632ab40b2b48b49bb604d2917766181e3ef0e048 SHA1 7e44395cfc9a8b589f257e4d52629b89e8cf65cc SHA256 78cf9ada26246dfd1b48405f286bd8e7d909aee078bb9aa36276dfcbb351f84a
-EBUILD dellmgr-5.31.ebuild 866 RMD160 0b44759dfeaea59aa0060c0cf7ee08851b5fbbfe SHA1 7f91023bdeeaa3c236de42a4c1c288779cf614e8 SHA256 4220eb483bb84f58fdaa56e892bbb5934c1dd5edd89a89dc89dc1c1dcd3d205f
-MISC ChangeLog 631 RMD160 31833afda35967707b177b1c891324221b8266be SHA1 a67d8ad6e1294a3c971323c70a7454aa844c3630 SHA256 dd75dbb0daadc0e77ed8fb104d49a693db318b1df591b87b754ba289bbd75759
+DIST perc-apps-A08.tar.gz 761709 RMD160 d296fac7d9d043efacaafca7b7ffa4823710837c SHA1 85fa41b43143f00e853215e22cb21982f1eba14e SHA256 9e1700dbe72a4557c449829be6ac4ca94c241f87ac42c015091e36336c1a706a
+EBUILD dellmgr-5.32.ebuild 979 RMD160 82923ca60f4c5287ee2f46cdf1c649d5a1207f44 SHA1 b11d120dbb70d3ecabab82a815a6ace510abd428 SHA256 95ed059a9bfbb7e661cdfd6afba76ee6afef924fe1e2a29f57e9cb2de26b2a44
+MISC ChangeLog 864 RMD160 3e679abcabe5962015f9149d7c803af7f4909954 SHA1 b28d34b3871a17bb7a3dfd9eb656de859ee479cb SHA256 abe9422a668e0483ba0e71e428c197462dde2de6df45a44e7c3b4618967ca2fd
 MISC metadata.xml 300 RMD160 3b9c1cd628f9d7ac94b68543ec737d5c2381a47e SHA1 33c5efd31a8aa789118535b921e211ffb5023ac3 SHA256 bc07a9aecce5770d1ace9af0a6c6af8ff6c7b16eb5e7947a1b178d1970855e43
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