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

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

8 files changed, 53 insertions, 121 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/Manifest b/sys-block/megamgr/Manifest
index 9d04638e7b39..0d4db8e86c27 100644
--- a/sys-block/megamgr/Manifest
+++ b/sys-block/megamgr/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX megamgr 692 RMD160 da4038b095d552c19aaa9795858d1d3f37a1ae6a SHA1 2354e216c79a6aeaa129fd5e1765872413f1daf0 SHA256 d08fd8c6800103ab2c392d8dad9a5180cd4d26537cd5c97f3c766a53848ea5fe
-AUX megamgr-r1 702 RMD160 3a30b1e3775086c47a3a9c7367bf84d2e1a03f15 SHA1 8bbb1c9fb9ae1d7db156ef328ff1d3f8ed7654a4 SHA256 611d258fd116d6827890d119f78ef105aa926f94342d5e0ca67f8e085104eeac
 DIST ut_linux_mgr_5.20.zip 253549 RMD160 f5e099db7c8507350d22a89430a7ab66ca26ab95 SHA1 4bf30a27ffa4a0d2edb7544930a641f18e65d0fb SHA256 e7313ed8f59897f132ffed55ed606f19dc72a5d529e6b647cb157a39f0d79123
-EBUILD megamgr-5.20-r1.ebuild 1011 RMD160 165ca82ca0f665bd27b4f088e9dc1eda7f9d157e SHA1 882f41241a8aae6560598bc6fa77e9076f38d517 SHA256 fa58047959c1e874de87347dbfb48dc2bb687a0ffe754d479b425209d0f274ec
-EBUILD megamgr-5.20.ebuild 957 RMD160 f415ebe70468b3cdf0f0dc9bb126dddeb1d744a1 SHA1 d1533e3fd95b77cd1e2a952f24f67b7765ae25f4 SHA256 c4c69ce7fab5545f5e93a4dd00009489435ce104c2ff0de2757e2602371a0a09
-MISC ChangeLog 878 RMD160 680cad7ce5dd9edc32efb9ac86652d7c495d18cd SHA1 11c89e179c170bbc9f5fd59a568b13f794a378e8 SHA256 21bb83cf362fe3f7608675b43e4fe5ccecdce9da8ed50c3b23bbd49cfb2a3a56
-MISC metadata.xml 300 RMD160 3b9c1cd628f9d7ac94b68543ec737d5c2381a47e SHA1 33c5efd31a8aa789118535b921e211ffb5023ac3 SHA256 bc07a9aecce5770d1ace9af0a6c6af8ff6c7b16eb5e7947a1b178d1970855e43
+EBUILD megamgr-5.20-r2.ebuild 963 RMD160 2112b89856a82ebc5ba5de1108c88dd2918ce693 SHA1 14eefc9e56302ed3b2e7b224890f00156738576f SHA256 3f1a78c24b87ca6a4fdf0f6efb97d90635f08a70e81d93db310913d1712b1c32
+MISC ChangeLog 1212 RMD160 0f1ff149865b189e0baaf52baedc3f2d7ec01b69 SHA1 64493d58dbf02190e6da860dfd3419df6b4d5eb6 SHA256 be092d6b41d5513253542b822116b8e41057044d3615a7d6bf394ff9d1bea7b6
+MISC metadata.xml 452 RMD160 50fcb802d1fc3b83b52c41822efa86871d428c6d SHA1 e191cbbb1fec879a7a2240f4c4ec5b6da963718d SHA256 85a21574f8af02c4cff502f340ac92a7cb195b32e5166442c838148a3a56e945
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAklkMuMACgkQ2ZWR0Jhg/EvDegCfarSzmbbAetZYD5EVGdMt7bhc
-BjAAnjaNDaigrHrPic/6QnCVwj/1kA44
-=6jIm
+iQEcBAEBCAAGBQJOFemKAAoJEMOx0zmdw4Z19bIH+wbIznNqQ9YKmZJZC6sPNcx/
+MYNOXBRbmBifTO9jdIlvQ3Ss0FYoTg9toz0JvIFmOW8JErfL14jPtCBW6kKZP/11
+TmAIKID5mZjmH+mh846dqj7D5M1JHFvVgM89txSnBB44vbhJEQtYPHXkymiZUc+n
+ZoUDe+QKx/IHJoepOo7FgEMzHh3DxuQSTpLQgXSC514uVJTcv96iKz3qCuoxpvK3
+cCAPcltdhq7AxpxaYL8GSI+3oeV9UsNqStz0mFKbJ4MTwkB3WgG0LmBy/V3qJKTW
+QKrS9Aqs4EvAiDcceBntKNvy95DvSq9NzpjMFU1AS5GblFxO92uuYyzxo87ch6Q=
+=xToS
 -----END PGP SIGNATURE-----
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>
diff --git a/sys-block/megarc/Manifest b/sys-block/megarc/Manifest
index 85466584e732..3be66e24b93e 100644
--- a/sys-block/megarc/Manifest
+++ b/sys-block/megarc/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA256
 
 DIST ut_linux_megarc_1.11.zip 301703 RMD160 fdec18302dc802b0d594586095f2e355af5c1a50 SHA1 8c5751e8ca069ab8ee1fc8f1b8d8eac04f8c7283 SHA256 bba008e40c66b74a87e3ecf3c068d35ae8f464c332635400096cbb856c33eb4b
-EBUILD megarc-1.11.ebuild 1066 RMD160 90795b2d6c8ed04f030ee65ce711532cc2ceab3b SHA1 3db4ed134a6be3b78156dbb520038831ae9a54e4 SHA256 6b640fc20eac678cd36234d6df308eef8286c7c4a234bd380c829585c10fccda
-MISC ChangeLog 948 RMD160 2040ee2c4ee4295f7a2c434d17d5da0919deb40d SHA1 b1f3ac960b1f975b140a6358551a43c2b1ade742 SHA256 55ad9bd4293826572e95874452ced86d8cecde4aec96d9d1188e570626f21be4
+EBUILD megarc-1.11-r1.ebuild 1086 RMD160 24e0b4768e843fa4c2ebfcdeb921ccf28e29abc1 SHA1 d828c125d982d9e5f800f7e9dc07c499659caf60 SHA256 582ae603b71b78218df57bbb79e9e0f5512985493274909d4b84700a7f2d0b26
+MISC ChangeLog 1125 RMD160 a3228a620771e30bfefb6c520e466e9e12765d0e SHA1 d4b3dd7ce5da96ad24a77de44e4df2b22e484714 SHA256 bdb231f5e55758297d8b8e37fcbd77c31ea20ed42e7029325f77595da594e277
 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
+iQEcBAEBCAAGBQJOFeolAAoJEMOx0zmdw4Z1kDgH/jcJAK7iD3h9uvIpvcWBmkkw
+HetGLz5tV/2WTov7hcGO6IrJ7NTKNaFujn3QsEjbCKx4j6FiYURmsdfARSs0xZFB
+svk0TfhjvHSJPFDsQQmFJy9v69o+WONGiOFgDlswvck6p8NM7FOncvE4vgIZWEJ5
+mS7txPhoWReQjkHFs11qpc+O4zL/Zk2Ww1N9oz4NGTG+fygT1dGC8rtu0j88nAOQ
+AMvNLgmeQHglDznsk0FKcAYuUU6aeBbzdjm/vTpWp5hSLYWzSXQ2PwxXdsL76TOp
+dcqXadG6dvL60Q1MHL65XRXnlxdL3/OFpzxsYpHvAjFg0CFVj7T6Ylg5ezN8Jug=
+=JJEu
 -----END PGP SIGNATURE-----