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.

Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64

5 files changed, 44 insertions, 56 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/Manifest b/sys-block/megarc/Manifest
index 15f25f32019b..85466584e732 100644
--- a/sys-block/megarc/Manifest
+++ b/sys-block/megarc/Manifest
@@ -1,5 +1,18 @@
-AUX megarc 1189 RMD160 cafb54b3c671ef8a7abb3b01320f6adece3b2a8e SHA1 bb9ecd6ae346fef2f466eebf53b7871a4dbd1a03 SHA256 28fb68a26ed289d1f75fb489dd59be02160ec526895d3f840fcab8557de98f6d
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST ut_linux_megarc_1.11.zip 301703 RMD160 fdec18302dc802b0d594586095f2e355af5c1a50 SHA1 8c5751e8ca069ab8ee1fc8f1b8d8eac04f8c7283 SHA256 bba008e40c66b74a87e3ecf3c068d35ae8f464c332635400096cbb856c33eb4b
-EBUILD megarc-1.11.ebuild 1069 RMD160 14d6385e71d46b7790a967ff8bc4d424689f91a7 SHA1 2cf52657b5bda72456fa4e74ca16237236ef5043 SHA256 6f9b842a421fbd773f1fb3f7964673b2c2a60323dd3bc6e5657982e4871903f8
-MISC ChangeLog 691 RMD160 4a8b0334ad26dda05362b26955c94a5a1ba00ec5 SHA1 34dbf502ca0901d043dc90243743f5d94c2a6e7e SHA256 ac58d8c754370d42a640d1011817244207851c46fbf6c3645dc647a290cc32ab
-MISC metadata.xml 300 RMD160 3b9c1cd628f9d7ac94b68543ec737d5c2381a47e SHA1 33c5efd31a8aa789118535b921e211ffb5023ac3 SHA256 bc07a9aecce5770d1ace9af0a6c6af8ff6c7b16eb5e7947a1b178d1970855e43
+EBUILD megarc-1.11.ebuild 1066 RMD160 90795b2d6c8ed04f030ee65ce711532cc2ceab3b SHA1 3db4ed134a6be3b78156dbb520038831ae9a54e4 SHA256 6b640fc20eac678cd36234d6df308eef8286c7c4a234bd380c829585c10fccda
+MISC ChangeLog 948 RMD160 2040ee2c4ee4295f7a2c434d17d5da0919deb40d SHA1 b1f3ac960b1f975b140a6358551a43c2b1ade742 SHA256 55ad9bd4293826572e95874452ced86d8cecde4aec96d9d1188e570626f21be4
+MISC metadata.xml 452 RMD160 50fcb802d1fc3b83b52c41822efa86871d428c6d SHA1 e191cbbb1fec879a7a2240f4c4ec5b6da963718d SHA256 85a21574f8af02c4cff502f340ac92a7cb195b32e5166442c838148a3a56e945
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBCAAGBQJOFcMUAAoJEMOx0zmdw4Z1PJwIAI1aOYa9nlrVkVGfHBR8q6PN
+mUXL6+v3CpSK1pp9w3C4aUb1p7/C7l2WYUE9seX1FMfqofTGCew+/Lrhx5X6QuF5
+mRkLkJE+obtw1UrEKpTx+idluB66ZX81aU9doZVrKOKrPXZWEp4PC047DlGJbY58
+qjdp7X3XrSDpnUniRHTlXaW+3x8/LA2vJ5Jtaf9HOw7rfUfJLoszhNvH7Nidhy3m
+rWevVZw2nVm+Fa6t5S882V69akmeUDXAV7Ae5uZpxpFduK4L1bYPbdlR7rPxA1TE
+TzCfi67FZjGz9MinLnV7Jpq1nhIy2JddT8ZhSx6vC/1qJjA+Ch6fwcyTDFyL+oY=
+=vtWM
+-----END PGP SIGNATURE-----
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>