fix bug #218606

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 72 insertions, 13 deletions

diff --git a/sys-block/megactl/ChangeLog b/sys-block/megactl/ChangeLog
index 83dbba751789..9127e0c6914d 100644
--- a/sys-block/megactl/ChangeLog
+++ b/sys-block/megactl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-block/megactl
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/megactl/ChangeLog,v 1.3 2008/05/28 21:18:58 maekke Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/megactl/ChangeLog,v 1.4 2009/11/21 13:51:48 wschlich Exp $
+
+*megactl-0.4.1-r1 (21 Nov 2009)
+
+  21 Nov 2009; Wolfram Schlich <wschlich@gentoo.org>
+  +files/megactl-0.4.1-Makefile.patch, +megactl-0.4.1-r1.ebuild:
+  fix bug #218606
 
   28 May 2008; Markus Meier <maekke@gentoo.org> megactl-0.4.1.ebuild:
   add ~amd64, bug #218606
diff --git a/sys-block/megactl/Manifest b/sys-block/megactl/Manifest
index 737a08ce5d65..ec19b64dff8e 100644
--- a/sys-block/megactl/Manifest
+++ b/sys-block/megactl/Manifest
@@ -1,15 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX megactl-0.4.1-Makefile.patch 829 RMD160 3ba978494c5ad5b8d42c2be6ad9aa2e4c139164b SHA1 45070bba7d720bd3a33e9652cb48352d081585f9 SHA256 adc9b926c9914bdf5f4fce787cd7f20fe764df9f5858398873bdf19ea74a8020
 AUX megactl-0.4.1.patch 1297 RMD160 cc8152b28b5e298c5fd75ac010ec333e8ce2d6f2 SHA1 708fbebaa9359db57056c0e73b7232deff5c3de9 SHA256 7f57c47b137f8774aff79fc9b192e11b4227e620a13c4c7ed3e2a1475f927eb4
 DIST megactl-0.4.1.tar.gz 179173 RMD160 822692e81ff0fe423b3d5b75e639929e204048eb SHA1 b53ea7bb985c7c732452a0e387167fecd0a04f9b SHA256 d7aee98035c97a1ff098450192f073565c4f2355079763f6dc6202be121720e8
+EBUILD megactl-0.4.1-r1.ebuild 894 RMD160 bc3d57817777251605f438c4a42466f9d37657a6 SHA1 f919d751345914fcffcba55579ed63e22a3fee09 SHA256 b37b114a7158217f0b9ca76f4ad8b49f322c7f2877681e3edb0ebfcbd356b3c6
 EBUILD megactl-0.4.1.ebuild 664 RMD160 23ee614986a5449b983fd327187e1d18e7f8eed6 SHA1 8aad338a5033d40edc3eae8e5c9334175a31643e SHA256 c84f54c624c8d2eaa9c72e75b5df6f396bcb44a46da4672a58733709ef5d7566
-MISC ChangeLog 570 RMD160 34cdfb7e32b6082c544ac479e398f6ca42443eff SHA1 a4a760b6e026d6c0ee2e3ae39456a878a5bee59d SHA256 3e89c627f256ccaf52815d6b1de7d942c70550b39e5ae39935de1281db728e45
+MISC ChangeLog 742 RMD160 35d6d571f08221e1b1826a6bfbc1bf08b809f494 SHA1 77f98d83d36aa784749cfd3ef2832225258da8b4 SHA256 4ba701e028664cc4cce4490a0a7f15f26195f5e5df57e7a62b83b381c6cdf8eb
 MISC metadata.xml 515 RMD160 56d7ec1412ec0224dd60f09fd483458e1eafe57a SHA1 8c1131dcae3bc102ed58f888a96e0ffb3cd80fac SHA256 f409744d466b975da5890e03c8721cee3ffc39c1891f51c17c9a0fc11945161c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkg9zHkACgkQkKaRLQcq0GIUVwCgnVYO1uuwopqLAIha3NYlfD3z
-D+UAnRIu8iWx33AvIJdXScndeW0ZTvkC
-=7fuy
------END PGP SIGNATURE-----
diff --git a/sys-block/megactl/files/megactl-0.4.1-Makefile.patch b/sys-block/megactl/files/megactl-0.4.1-Makefile.patch
new file mode 100644
index 000000000000..f1ee2f9bb2a4
--- /dev/null
+++ b/sys-block/megactl/files/megactl-0.4.1-Makefile.patch
@@ -0,0 +1,26 @@
+diff -urN megactl-0.4.1.orig/src/Makefile megactl-0.4.1/src/Makefile
+--- megactl-0.4.1.orig/src/Makefile	2007-08-21 09:19:53.000000000 +0200
++++ megactl-0.4.1/src/Makefile	2009-11-21 12:30:44.242501898 +0100
+@@ -1,11 +1,17 @@
+ 
+-SRCS=		megactl.c adapter.c megaioctl.c megatrace.c callinfo.c dumpbytes.c logpage.c ntrim.c
++SRCS=		megactl.c adapter.c megaioctl.c callinfo.c dumpbytes.c logpage.c ntrim.c
+ INC=		-I./schily -Iincludes-hack
+ HDRS=		mega.h adapter.h megaioctl.h callinfo.h logpage.h dumpbytes.h
+-ARCH=		-m32
+-CFLAGS=		-g -Wall $(INC) $(ARCH)
+-LDFLAGS=	-g $(ARCH)
+-PROGRAMS=	megactl megasasctl megatrace
++ARCH?=		-m32
++CFLAGS?=	-g -Wall
++CFLAGS+=	$(INC) $(ARCH)
++LDFLAGS?=	-g
++LDFLAGS+=	$(ARCH)
++PROGRAMS=	megactl megasasctl
++ifeq ($(ARCH),-m32)
++PROGRAMS+=	megatrace
++SRCS+=		megatrace.c
++endif
+ 
+ all:		$(PROGRAMS)
+ 
diff --git a/sys-block/megactl/megactl-0.4.1-r1.ebuild b/sys-block/megactl/megactl-0.4.1-r1.ebuild
new file mode 100644
index 000000000000..2d9a3357dff2
--- /dev/null
+++ b/sys-block/megactl/megactl-0.4.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/megactl/megactl-0.4.1-r1.ebuild,v 1.1 2009/11/21 13:51:48 wschlich Exp $
+
+EAPI=2
+
+inherit eutils
+
+IUSE=""
+DESCRIPTION="LSI MegaRAID control utility"
+HOMEPAGE="http://sourceforge.net/projects/megactl/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}.patch
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+}
+
+src_compile() {
+	cd src
+	use x86 && MY_MAKEOPTS="ARCH=-m32"
+	use amd64 && MY_MAKEOPTS="ARCH=-m64"
+	emake ${MY_MAKEOPTS} || die "make failed"
+}
+
+src_install() {
+	cd src
+	dosbin megactl megasasctl
+	use x86 && dosbin megatrace
+	use amd64 && ewarn "megatrace was not installed because it does not compile on amd64"
+	dodoc megarpt megasasrpt ../README
+}