Import Fedora patchset. Fix building with _FORTIFY_SOURCE=2 wrt #274308. Fix building with GCC 4.5+.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 70 insertions, 15 deletions

diff --git a/sys-apps/raidutils/ChangeLog b/sys-apps/raidutils/ChangeLog
index fc1887e518da..c6bb89ee42bb 100644
--- a/sys-apps/raidutils/ChangeLog
+++ b/sys-apps/raidutils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/raidutils
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/raidutils/ChangeLog,v 1.12 2010/06/02 06:23:17 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/raidutils/ChangeLog,v 1.13 2010/06/06 00:33:54 ssuominen Exp $
+
+*raidutils-0.0.6-r2 (06 Jun 2010)
+
+  06 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +raidutils-0.0.6-r2.ebuild, +files/raidutils-0.0.6-gcc45.patch:
+  Import Fedora patchset. Fix building with _FORTIFY_SOURCE=2 wrt #274308.
+  Fix building with GCC 4.5+.
 
   02 Jun 2010; Torsten Veller <tove@gentoo.org> metadata.xml:
   Remove xmerlin from metadata.xml (#69210)
diff --git a/sys-apps/raidutils/Manifest b/sys-apps/raidutils/Manifest
index 187d67e18db2..ca74900348ff 100644
--- a/sys-apps/raidutils/Manifest
+++ b/sys-apps/raidutils/Manifest
@@ -1,15 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX raidutils-0.0.6-gcc45.patch 300 RMD160 648535c685d222926ed9876257be070cfc2ff6e6 SHA1 88ba79f4fa52c726376a4026d171ef78058b8a78 SHA256 b840a8cd023517902637a103ae6f28481c473a8f773138abd896ecd8afa37958
 AUX raidutils-0.0.6-misc-fixes.patch 14168 RMD160 6eaa94705ab77c497f0b259da1544f9461679901 SHA1 b4f8bf9a82c33032e5d01278d652fe566ca90206 SHA256 7e6118ebac8d80dc89e34caaf4a3d5826c18213c054b20b220bd22ddaaa045a1
 DIST raidutils-0.0.6.tar.bz2 968898 RMD160 9b5490d44d2a264ef0e5fa9f9290203069b135f1 SHA1 6003512fc580280915ead2c18197f0424fe8edb3 SHA256 ac350f60b9635d952a7a5664effa59e418ada9ad3deba66d46e6e0a094966d65
-EBUILD raidutils-0.0.6-r1.ebuild 904 RMD160 45160744e00c537027362990c6b7f8a0cdcae4af SHA1 cf44026ad7d9203e18355091562bcfd21c240b45 SHA256 17dbd7613563a54d5e8c1e47265329142af73a38fd869959dd4fcbf9fafb6153
-MISC ChangeLog 2016 RMD160 b59c1b07fa984b9ad19496dcc24f4d9b9e8a05fc SHA1 f4e75593b02d4704c941b45ea6271e170b9799f9 SHA256 e49591fc00ab090074dcd635718818b239796535171afa4271272ed64b95558a
+DIST raidutils-rpm.patch.bz2 6809 RMD160 15ee892925d5b567cdd6daf323b998b5cf5a44ec SHA1 85ec1d78f9da36b57a519dcb54e556568053ce85 SHA256 adf851e55aac1a0acf7fd47dac36bbf76396154fa6f52fb98615473139d77651
+EBUILD raidutils-0.0.6-r1.ebuild 917 RMD160 f50c2bf0c22cb1352ac531534a7c09a8d3bdaedf SHA1 82b7cac7228b73e8a05bc30e78e61955ba1d46e4 SHA256 aeb261a0b9da10ca785167aac082135d8b9f4ea9eab7ae0effd21347ca2450e1
+EBUILD raidutils-0.0.6-r2.ebuild 995 RMD160 537d4211cfe0ccfd77a4f9c6557fe31caeaca663 SHA1 e6b20ef9d4a66f31a8b5b2c662958f73a1005e48 SHA256 3efe2373539d612aa548763bc1d9828dc14aa9bcaf2b4de8f2b5e09318638701
+MISC ChangeLog 2282 RMD160 e89b8aafdf8285c49c9e4cec3b7d88a239d4e8c1 SHA1 52eace1868a836c40167bec245e631231836d5b7 SHA256 f4b8183976505f9e59f8c7746efd71786b2bfc2972dda85e08ae719b71f03724
 MISC metadata.xml 633 RMD160 63aad1a48c94d68cbb1f998e05017304e60f4fcb SHA1 fc0367ad7b8ea3e8c440a6174bc8fa30e1388c1f SHA256 07402d667206d2983a8eea57b866d6d26722ccc02d4cc5832d8e6356a68ff322
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwF+NoACgkQV3J2n04EauxLpgCgq4i3H8qAGa6tlHKmwtT3r2qP
-brcAn1FzLvjAAY4kWwNaDNkMB1x4pi71
-=Z7em
------END PGP SIGNATURE-----
diff --git a/sys-apps/raidutils/files/raidutils-0.0.6-gcc45.patch b/sys-apps/raidutils/files/raidutils-0.0.6-gcc45.patch
new file mode 100644
index 000000000000..91c52270ee40
--- /dev/null
+++ b/sys-apps/raidutils/files/raidutils-0.0.6-gcc45.patch
@@ -0,0 +1,14 @@
+--- raidutil/flash.cpp
++++ raidutil/flash.cpp
+@@ -177,11 +177,7 @@
+ {
+    ENTER( "Flash::Flash(" );
+ 
+-#if defined _DPT_UNIXWARE || defined _DPT_SCO
+    Flash( right.source, right.Resync, right.hba_Num );
+-#else
+-   Flash::Flash( right.source, right.Resync, right.hba_Num );
+-#endif
+ 
+    EXIT();
+ }
diff --git a/sys-apps/raidutils/raidutils-0.0.6-r1.ebuild b/sys-apps/raidutils/raidutils-0.0.6-r1.ebuild
index c8aedf18292d..a0e53d72f252 100644
--- a/sys-apps/raidutils/raidutils-0.0.6-r1.ebuild
+++ b/sys-apps/raidutils/raidutils-0.0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/raidutils/raidutils-0.0.6-r1.ebuild,v 1.3 2010/01/22 06:54:14 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/raidutils/raidutils-0.0.6-r1.ebuild,v 1.4 2010/06/06 00:33:54 ssuominen Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://i2o.shadowconnect.com/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 DEPEND=">=sys-kernel/linux-headers-2.6"
diff --git a/sys-apps/raidutils/raidutils-0.0.6-r2.ebuild b/sys-apps/raidutils/raidutils-0.0.6-r2.ebuild
new file mode 100644
index 000000000000..abfe44fda2fb
--- /dev/null
+++ b/sys-apps/raidutils/raidutils-0.0.6-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/raidutils/raidutils-0.0.6-r2.ebuild,v 1.1 2010/06/06 00:33:54 ssuominen Exp $
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="Utilities to manage i2o/dtp RAID controllers."
+HOMEPAGE="http://i2o.shadowconnect.com/"
+# http://cvs.fedoraproject.org/viewvc/rpms/raidutils/devel/
+SRC_URI="http://i2o.shadowconnect.com/raidutils/${P}.tar.bz2
+	http://dev.gentoo.org/~ssuominen/${PN}-rpm.patch.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+DEPEND=">=sys-kernel/linux-headers-2.6"
+RDEPEND=""
+
+src_prepare() {
+	epatch "${WORKDIR}"/${PN}-rpm.patch \
+		"${FILESDIR}"/${P}-gcc45.patch
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	emake -j1 || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS
+	find "${D}" -name '*.la' -delete
+}