Fix SRC_URI. Remove "useless" restricts and instead use QA_PRESTRIPPED. Get a rid of the wrapper, udev should always be able to handle the device nodes.

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

4 files changed, 27 insertions, 52 deletions

diff --git a/sys-block/megarc/ChangeLog b/sys-block/megarc/ChangeLog
index 2d374dd084b7..f229594daa78 100644
--- a/sys-block/megarc/ChangeLog
+++ b/sys-block/megarc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-block/megarc
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/megarc/ChangeLog,v 1.4 2009/08/03 19:29:25 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/megarc/ChangeLog,v 1.5 2011/07/07 14:30:39 idl0r Exp $
+
+  07 Jul 2011; Christian Ruppert <idl0r@gentoo.org> megarc-1.11.ebuild,
+  -files/megarc, metadata.xml:
+  Fix SRC_URI. Remove "useless" restricts and instead use QA_PRESTRIPPED. Get a
+  rid of the wrapper, udev should always be able to handle the device nodes.
 
   03 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> megarc-1.11.ebuild:
   Fix SRC_URI wrt #250426, thanks to Christophe LEFEBVRE for reporting.
diff --git a/sys-block/megarc/files/megarc b/sys-block/megarc/files/megarc
deleted file mode 100755
index 19ccc55a0df5..000000000000
--- a/sys-block/megarc/files/megarc
+++ /dev/null
@@ -1,39 +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
-
-# Create temporary working directory for megarc
-# (as it creates megarc.log in CWD for example)
-# and change to it afterwards
-megarc_tmpdir=$(mktemp -q -d -t -p /var/tmp megarc.XXXXXX)
-if [ -z "${megarc_tmpdir}" ] || [ ! -d "${megarc_tmpdir}" ]; then
-	echo "ERROR: failed to create temporary megarc working directory"
-	exit 1
-elif ! cd "${megarc_tmpdir}"; then
-	echo "ERROR: failed to change to temporary megarc working directory '${megarc_tmpdir}'"
-	exit 1
-fi
-
-# Start the real megarc binary
-"${0%/*}/megarc.bin" "${@}"
-
-# Cleanup
-rm -rf "${megarc_tmpdir}"
diff --git a/sys-block/megarc/megarc-1.11.ebuild b/sys-block/megarc/megarc-1.11.ebuild
index 4be69eb69ea1..5af4e473c91c 100644
--- a/sys-block/megarc/megarc-1.11.ebuild
+++ b/sys-block/megarc/megarc-1.11.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/megarc/megarc-1.11.ebuild,v 1.3 2009/08/03 19:29:25 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/megarc/megarc-1.11.ebuild,v 1.4 2011/07/07 14:30:39 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/DistributionSystem/AssetDocument/files/support/rsa/utilities/megaconf/ut_linux_${PN}_${PV}.zip"
+SRC_URI="http://www.lsi.com/downloads/Public/MegaRAID%20Common%20Files/ut_linux_${PN}_${PV}.zip"
 
 LICENSE="LSI"
 SLOT="0"
@@ -18,10 +20,12 @@ IUSE="doc"
 DEPEND="app-arch/unzip
 	doc? ( app-text/antiword )"
 
-RESTRICT="strip mirror test"
+RESTRICT="mirror"
 
 S="${WORKDIR}"
 
+QA_PRESTRIPPED="/usr/sbin/megarc"
+
 pkg_setup() {
 	use amd64 && { has_multilib_profile || die "needs multilib profile on amd64"; }
 }
@@ -33,5 +37,5 @@ src_compile() {
 src_install() {
 	useq doc && dodoc ${PN}-manual.txt
 	newdoc ut_linux_${PN}_${PV}.txt ${PN}-release-${PV}.txt
-	dosbin "${FILESDIR}"/megarc megarc.bin
+	newsbin megarc.bin megarc || die
 }
diff --git a/sys-block/megarc/metadata.xml b/sys-block/megarc/metadata.xml
index a7162e9b7104..99b2fa655a9a 100644
--- a/sys-block/megarc/metadata.xml
+++ b/sys-block/megarc/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>