Ebuild cleanup, fixed compilation.

Package-Manager: portage-2.1.2-r9

9 files changed, 394 insertions, 340 deletions

diff --git a/sys-apps/raidutils/ChangeLog b/sys-apps/raidutils/ChangeLog
index 56792dc1f7bf..8b507e0aab66 100644
--- a/sys-apps/raidutils/ChangeLog
+++ b/sys-apps/raidutils/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-apps/raidutils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/raidutils/ChangeLog,v 1.8 2007/02/22 01:19:49 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/raidutils/ChangeLog,v 1.9 2007/02/28 22:59:11 xmerlin Exp $
+
+*raidutils-0.0.6-r1 (28 Feb 2007)
+
+  28 Feb 2007; Christian Zoffoli <xmerlin@gentoo.org>
+  -files/raidutils-0.0.5-i2octl-fixpath.patch,
+  -files/raidutils-0.0.6-gcc41x-compilefix.patch,
+  +files/raidutils-0.0.6-misc-fixes.patch, -raidutils-0.0.5.ebuild,
+  -raidutils-0.0.6.ebuild, +raidutils-0.0.6-r1.ebuild:
+  Ebuild cleanup, fixed compilation.
 
   22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/sys-apps/raidutils/Manifest b/sys-apps/raidutils/Manifest
index a274f2db1370..5fcf78dfec72 100644
--- a/sys-apps/raidutils/Manifest
+++ b/sys-apps/raidutils/Manifest
@@ -1,42 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX raidutils-0.0.5-i2octl-fixpath.patch 1597 RMD160 bf68f2765283b8f63aa75c1f53e376b644034548 SHA1 4ec1486bcfea8257c4f73d46dccef23f1d81e144 SHA256 aba8b926dc203967951a7d4662252691fd6ed6003503467ddea36a8f8663928b
-MD5 4099a4c6960a610930541d55d9bb4e5d files/raidutils-0.0.5-i2octl-fixpath.patch 1597
-RMD160 bf68f2765283b8f63aa75c1f53e376b644034548 files/raidutils-0.0.5-i2octl-fixpath.patch 1597
-SHA256 aba8b926dc203967951a7d4662252691fd6ed6003503467ddea36a8f8663928b files/raidutils-0.0.5-i2octl-fixpath.patch 1597
-AUX raidutils-0.0.6-gcc41x-compilefix.patch 9054 RMD160 d5864b9c9334cc3004195a58bc1ef744365b89d0 SHA1 296b604a7fddbd251f8ba1b96a15f82908dc5039 SHA256 0e434fd6b5e4928df9db12f96de1205970fea4cbcac69bf84f15b4800ab26877
-MD5 8669ba86260197b1772c8d99c25a3c3a files/raidutils-0.0.6-gcc41x-compilefix.patch 9054
-RMD160 d5864b9c9334cc3004195a58bc1ef744365b89d0 files/raidutils-0.0.6-gcc41x-compilefix.patch 9054
-SHA256 0e434fd6b5e4928df9db12f96de1205970fea4cbcac69bf84f15b4800ab26877 files/raidutils-0.0.6-gcc41x-compilefix.patch 9054
-DIST raidutils-0.0.5.tar.bz2 933250 RMD160 29b94f9b693de754a7e08db67a3a05e5c2bd852b SHA1 84240ecfe3772afdb058d76bbbf0c307bd2f18a5 SHA256 8c7850f294fba508770afb486fc841506d3361a9976f00a1ca5d4ee69033f0f7
+AUX raidutils-0.0.6-misc-fixes.patch 14168 RMD160 6eaa94705ab77c497f0b259da1544f9461679901 SHA1 b4f8bf9a82c33032e5d01278d652fe566ca90206 SHA256 7e6118ebac8d80dc89e34caaf4a3d5826c18213c054b20b220bd22ddaaa045a1
+MD5 57e581a9d12aacb27e8368dd90823606 files/raidutils-0.0.6-misc-fixes.patch 14168
+RMD160 6eaa94705ab77c497f0b259da1544f9461679901 files/raidutils-0.0.6-misc-fixes.patch 14168
+SHA256 7e6118ebac8d80dc89e34caaf4a3d5826c18213c054b20b220bd22ddaaa045a1 files/raidutils-0.0.6-misc-fixes.patch 14168
 DIST raidutils-0.0.6.tar.bz2 968898 RMD160 9b5490d44d2a264ef0e5fa9f9290203069b135f1 SHA1 6003512fc580280915ead2c18197f0424fe8edb3 SHA256 ac350f60b9635d952a7a5664effa59e418ada9ad3deba66d46e6e0a094966d65
-EBUILD raidutils-0.0.5.ebuild 759 RMD160 4b93577d783c54f7cc5dcbd54ff0b591d8d153c7 SHA1 c3b268655b32dc5de5487d9d5a85f74661ea3ce2 SHA256 547a4fbe58537a63b16342d084e3c70db3da036f8a43b4895e1be12506855522
-MD5 2317a595cb0ee3201204264c2a9128d9 raidutils-0.0.5.ebuild 759
-RMD160 4b93577d783c54f7cc5dcbd54ff0b591d8d153c7 raidutils-0.0.5.ebuild 759
-SHA256 547a4fbe58537a63b16342d084e3c70db3da036f8a43b4895e1be12506855522 raidutils-0.0.5.ebuild 759
-EBUILD raidutils-0.0.6.ebuild 826 RMD160 49b5092190c214be687aa22b20cad41efc056310 SHA1 adb758258a4f5f0bd8dce6682cefc02854c1676a SHA256 35547a2a2efe39842d03791050c5dfc568be954dbe8de882151ae77e5dd4e5bc
-MD5 4c42331e5c50de7936bc56ca13c04ce0 raidutils-0.0.6.ebuild 826
-RMD160 49b5092190c214be687aa22b20cad41efc056310 raidutils-0.0.6.ebuild 826
-SHA256 35547a2a2efe39842d03791050c5dfc568be954dbe8de882151ae77e5dd4e5bc raidutils-0.0.6.ebuild 826
-MISC ChangeLog 1335 RMD160 377b79b07877a42c86e54b23375ae4678dffcf79 SHA1 b4d05eea3b816a4d648a4c9f0a45f6eac1ab26b3 SHA256 e4e4838c43e113788663531b31cbb7b18a6703dd5bda017a406829f95aaa4a93
-MD5 2e765ce9cc40b43396f48785b12deca3 ChangeLog 1335
-RMD160 377b79b07877a42c86e54b23375ae4678dffcf79 ChangeLog 1335
-SHA256 e4e4838c43e113788663531b31cbb7b18a6703dd5bda017a406829f95aaa4a93 ChangeLog 1335
+EBUILD raidutils-0.0.6-r1.ebuild 916 RMD160 7038aac4ab989e0fe8da2a44d3012dc950cd2c74 SHA1 e2dde77d6b86ae69abde937efddad07e7c7f5156 SHA256 6185094afab4f6abbc6036ae4486ce9e7f64402d0bbbe01b45b6f4dbad681847
+MD5 afe0947b401f13516141e9fbba4da477 raidutils-0.0.6-r1.ebuild 916
+RMD160 7038aac4ab989e0fe8da2a44d3012dc950cd2c74 raidutils-0.0.6-r1.ebuild 916
+SHA256 6185094afab4f6abbc6036ae4486ce9e7f64402d0bbbe01b45b6f4dbad681847 raidutils-0.0.6-r1.ebuild 916
+MISC ChangeLog 1684 RMD160 cd8865d85fdc2cb2c9c1a2207d3f2a9119c2ded1 SHA1 fd93fe5ea4a8d9476fdfe385e8139195eaf41467 SHA256 3ba044f2a3d69e7a36275568ebde00c0e0563ba9112287853f029d69bbfaf784
+MD5 9be9aa755c2226d4db9c715246553b0f ChangeLog 1684
+RMD160 cd8865d85fdc2cb2c9c1a2207d3f2a9119c2ded1 ChangeLog 1684
+SHA256 3ba044f2a3d69e7a36275568ebde00c0e0563ba9112287853f029d69bbfaf784 ChangeLog 1684
 MISC metadata.xml 643 RMD160 b1c08e375dbdd03d73325f24b97512e7194cd16e SHA1 bc227a46c4c35e13ad64f534f5a50915dd666315 SHA256 279956ce2c043e403f167510f1ac778ceea27bd61cf794e52d99a4db78f2cd3d
 MD5 6b2a95b826d212207a259717f1c7c6e2 metadata.xml 643
 RMD160 b1c08e375dbdd03d73325f24b97512e7194cd16e metadata.xml 643
 SHA256 279956ce2c043e403f167510f1ac778ceea27bd61cf794e52d99a4db78f2cd3d metadata.xml 643
-MD5 4ccf6a2abfc2db05b95b71e8fe3a4d1c files/digest-raidutils-0.0.5 250
-RMD160 c74d55c5bb6cef1917773bbd525713a78c32d406 files/digest-raidutils-0.0.5 250
-SHA256 a6b113b3adb5820f951afb768d3766f01e78f7128856ca0b86d7703aaea06f6a files/digest-raidutils-0.0.5 250
-MD5 aee545f2ac2c76252639d3842d42c6a9 files/digest-raidutils-0.0.6 250
-RMD160 d3b3d21c97ea549c5a163998588658d07a2b7de1 files/digest-raidutils-0.0.6 250
-SHA256 8d36dc9bd8a07ae515c3fd0139208069e61094413c3edbfa97f21f771f5b9bf6 files/digest-raidutils-0.0.6 250
+MD5 aee545f2ac2c76252639d3842d42c6a9 files/digest-raidutils-0.0.6-r1 250
+RMD160 d3b3d21c97ea549c5a163998588658d07a2b7de1 files/digest-raidutils-0.0.6-r1 250
+SHA256 8d36dc9bd8a07ae515c3fd0139208069e61094413c3edbfa97f21f771f5b9bf6 files/digest-raidutils-0.0.6-r1 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFF3O9Iz974XjDVpbkRAioLAJsHqyoWUFwahEOw3ZDykT9CIMt2swCfc1xh
-ufp6QbSSqIm5t15GEeJArUk=
-=+jvc
+iD8DBQFF5glHgMUyd/cdjWsRAi97AJ9nCzfZ5GyY+HmRn1PyuQNC3lo4CwCfbcKr
+rNDBR2fCON7X0i56LpOJFFo=
+=xeS2
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/raidutils/files/digest-raidutils-0.0.5 b/sys-apps/raidutils/files/digest-raidutils-0.0.5
deleted file mode 100644
index dabbe2026f5c..000000000000
--- a/sys-apps/raidutils/files/digest-raidutils-0.0.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 dad485c458727a9197b3af950b02e3e6 raidutils-0.0.5.tar.bz2 933250
-RMD160 29b94f9b693de754a7e08db67a3a05e5c2bd852b raidutils-0.0.5.tar.bz2 933250
-SHA256 8c7850f294fba508770afb486fc841506d3361a9976f00a1ca5d4ee69033f0f7 raidutils-0.0.5.tar.bz2 933250
diff --git a/sys-apps/raidutils/files/digest-raidutils-0.0.6 b/sys-apps/raidutils/files/digest-raidutils-0.0.6-r1
index 38acee772319..38acee772319 100644
--- a/sys-apps/raidutils/files/digest-raidutils-0.0.6
+++ b/sys-apps/raidutils/files/digest-raidutils-0.0.6-r1
diff --git a/sys-apps/raidutils/files/raidutils-0.0.5-i2octl-fixpath.patch b/sys-apps/raidutils/files/raidutils-0.0.5-i2octl-fixpath.patch
deleted file mode 100644
index 799ef0a9fa7d..000000000000
--- a/sys-apps/raidutils/files/raidutils-0.0.5-i2octl-fixpath.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- raidutils-0.0.5/raideng/osd_unix.cpp.chris	2005-01-04 03:09:59.848442592 +0100
-+++ raidutils-0.0.5/raideng/osd_unix.cpp	2005-01-04 03:10:41.000000000 +0100
-@@ -1232,7 +1232,7 @@
- #elif defined (_DPT_SCO) || defined (SNI_MIPS) || defined(_DPT_SOLARIS) || defined(_DPT_BSDI) || defined(_DPT_FREE_BSD) || defined(_DPT_LINUX)
- 
- #if defined(_DPT_LINUX_I2O)
--		     if(strcmp(HbaDevs[HbaNum].NodeName, "/dev/i2o/ctl"))
-+		     if(strcmp(HbaDevs[HbaNum].NodeName, "/dev/i2octl"))
-                         i = ioctl(FileID,I2OUSRCMD,IoctlBuffer_P);
- 		     else {
-                         struct i2o_cmd_passthru pt;
-@@ -2144,7 +2144,7 @@
-                        i = 0;
-                 }
- #elif defined(_DPT_LINUX_I2O)
--                if(strcmp(HbaDevs[Count].NodeName, "/dev/i2o/ctl"))
-+                if(strcmp(HbaDevs[Count].NodeName, "/dev/i2octl"))
-                    i = osdSendIoctl(&HbaDevs[Count],DPT_CTRLINFO,DataBuff,&pkt);
- 		else {
- 		   /*
-@@ -3745,13 +3745,13 @@
- #  if (defined(_DPT_LINUX_I2O))
-    memset(&pkt, 0, sizeof(EATA_CP));
-    HbaDevs[NumEntries].Flags = 0;
--   strcpy(HbaDevs[NumEntries].NodeName, "/dev/i2o/ctl");
-+   strcpy(HbaDevs[NumEntries].NodeName, "/dev/i2octl");
-    IoctlRtn = osdSendIoctl(&HbaDevs[NumEntries], I2OGETIOPS, (uCHAR *)&NumEntries, &pkt);
-    if(!IoctlRtn) {
-      for(i = 0; i < NumEntries; i ++) {
-        HbaDevs[i].Flags = NODE_FILE_VALID_HBA_B | NODE_FILE_I2O_HBA_B;
-        HbaDevs[i].IoAddress = UINTPTR_MAX;
--       strcpy(HbaDevs[i].NodeName, "/dev/i2o/ctl");
-+       strcpy(HbaDevs[i].NodeName, "/dev/i2octl");
-      }
-    }
- #  endif
diff --git a/sys-apps/raidutils/files/raidutils-0.0.6-gcc41x-compilefix.patch b/sys-apps/raidutils/files/raidutils-0.0.6-gcc41x-compilefix.patch
deleted file mode 100644
index 89137bd21178..000000000000
--- a/sys-apps/raidutils/files/raidutils-0.0.6-gcc41x-compilefix.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-diff -uNr raidutils-0.0.6/include/device.hh raidutils-0.0.6.new/include/device.hh
---- raidutils-0.0.6/include/device.hh	2005-01-24 10:41:03.000000000 +0100
-+++ raidutils-0.0.6.new/include/device.hh	2006-09-16 14:17:05.000000000 +0200
-@@ -29,7 +29,7 @@
- // Data unique to every engine device
- #undef PACK
- #if (defined(__GNUC__))
--# define PACK __attribute__ ((packed))
-+#define PACK
- #else
- #define PACK
- #endif
-diff -uNr raidutils-0.0.6/include/get_info.h raidutils-0.0.6.new/include/get_info.h
---- raidutils-0.0.6/include/get_info.h	2005-01-24 10:41:03.000000000 +0100
-+++ raidutils-0.0.6.new/include/get_info.h	2006-09-16 14:17:43.000000000 +0200
-@@ -366,7 +366,7 @@
- 
- #undef PACK
- #if (defined(__GNUC__))
--# define PACK __attribute__ ((packed))
-+#define PACK
- #else
- #define PACK
- #endif
-diff -uNr raidutils-0.0.6/include/hba.hh raidutils-0.0.6.new/include/hba.hh
---- raidutils-0.0.6/include/hba.hh	2005-01-24 10:41:03.000000000 +0100
-+++ raidutils-0.0.6.new/include/hba.hh	2006-09-16 14:18:39.000000000 +0200
-@@ -29,7 +29,7 @@
- // Data unique to every engine HBA
- #undef PACK
- #if (defined(__GNUC__))
--# define PACK __attribute__ ((packed))
-+#define PACK
- #else
- #define PACK
- #endif
-diff -uNr raidutils-0.0.6/include/mgr.hh raidutils-0.0.6.new/include/mgr.hh
---- raidutils-0.0.6/include/mgr.hh	2005-01-24 10:41:03.000000000 +0100
-+++ raidutils-0.0.6.new/include/mgr.hh	2006-09-16 14:18:17.000000000 +0200
-@@ -29,7 +29,7 @@
- // Data unique to every engine manager
- #undef PACK
- #if (defined(__GNUC__))
--# define PACK __attribute__ ((packed))
-+#define PACK
- #else
- #define PACK
- #endif
-diff -uNr raidutils-0.0.6/raideng/connect.hpp raidutils-0.0.6.new/raideng/connect.hpp
---- raidutils-0.0.6/raideng/connect.hpp	2005-01-24 10:41:05.000000000 +0100
-+++ raidutils-0.0.6.new/raideng/connect.hpp	2006-09-16 14:40:05.000000000 +0200
-@@ -189,7 +189,7 @@
- 
- // Constructor/Destructor.............................
- 
--			dptSCSIcon_C::dptSCSIcon_C();
-+			dptSCSIcon_C();
- 
- // Message Handlers...................................
- 
-diff -uNr raidutils-0.0.6/raideng/raid.h raidutils-0.0.6.new/raideng/raid.h
---- raidutils-0.0.6/raideng/raid.h	2005-01-24 10:41:04.000000000 +0100
-+++ raidutils-0.0.6.new/raideng/raid.h	2006-09-16 14:40:37.000000000 +0200
-@@ -271,7 +271,7 @@
- 
- // Constructor/Destructor.............................
- 
--			raidDef_S::raidDef_S();
-+			raidDef_S();
- 
- };
- #endif  // c++
-diff -uNr raidutils-0.0.6/raidutil/alarm.hpp raidutils-0.0.6.new/raidutil/alarm.hpp
---- raidutils-0.0.6/raidutil/alarm.hpp	2005-01-24 10:41:07.000000000 +0100
-+++ raidutils-0.0.6.new/raidutil/alarm.hpp	2006-09-16 14:29:40.000000000 +0200
-@@ -58,7 +58,7 @@
- class AlarmStatus:public Command
- 	{
- 	public:
--		AlarmStatus::AlarmStatus( int hba, AlarmCommand cmd );							
-+		AlarmStatus( int hba, AlarmCommand cmd );							
- 		AlarmStatus( const AlarmStatus &new_AlarmStatus );
- 		virtual	~AlarmStatus();
- 		AlarmStatus	&operator = ( AlarmStatus &right );
-diff -uNr raidutils-0.0.6/raidutil/eventlog.hpp raidutils-0.0.6.new/raidutil/eventlog.hpp
---- raidutils-0.0.6/raidutil/eventlog.hpp	2005-01-24 10:41:07.000000000 +0100
-+++ raidutils-0.0.6.new/raidutil/eventlog.hpp	2006-09-16 14:30:34.000000000 +0200
-@@ -77,7 +77,7 @@
- 	{
- 
- 	public:
--		EventLog::EventLog(SCSI_Addr_List *deviceList, 
-+		EventLog(SCSI_Addr_List *deviceList, 
-             EventLogOptions cmd);
- 		EventLog(const EventLog &new_EventLog);
- 		virtual	~EventLog();
-diff -uNr raidutils-0.0.6/raidutil/expand.hpp raidutils-0.0.6.new/raidutil/expand.hpp
---- raidutils-0.0.6/raidutil/expand.hpp	2005-01-24 10:41:07.000000000 +0100
-+++ raidutils-0.0.6.new/raidutil/expand.hpp	2006-09-16 14:31:11.000000000 +0200
-@@ -55,7 +55,7 @@
- class Expand:public Command
- {
-    public:
--      Expand::Expand (SCSI_Address raid, SCSI_Addr_List *list);
-+      Expand (SCSI_Address raid, SCSI_Addr_List *list);
- 		Expand (const Expand &new_Expand);
- 		virtual ~Expand();
- 		Expand &operator = (Expand &right);
-diff -uNr raidutils-0.0.6/raidutil/forcest.hpp raidutils-0.0.6.new/raidutil/forcest.hpp
---- raidutils-0.0.6/raidutil/forcest.hpp	2005-01-24 10:41:07.000000000 +0100
-+++ raidutils-0.0.6.new/raidutil/forcest.hpp	2006-09-16 14:31:54.000000000 +0200
-@@ -65,7 +65,7 @@
- class ForceState:public Command
- 	{
- 	public:
--		ForceState::ForceState(SCSI_Addr_List *deviceList, ForceStateOptions cmd);
-+		ForceState(SCSI_Addr_List *deviceList, ForceStateOptions cmd);
- 		ForceState(const ForceState &new_ForceState);
- 		virtual	~ForceState();
- 
-diff -uNr raidutils-0.0.6/raidutil/namarray.hpp raidutils-0.0.6.new/raidutil/namarray.hpp
---- raidutils-0.0.6/raidutil/namarray.hpp	2005-01-24 10:41:06.000000000 +0100
-+++ raidutils-0.0.6.new/raidutil/namarray.hpp	2006-09-16 14:32:35.000000000 +0200
-@@ -58,7 +58,7 @@
- {
- 
- 	public:
--		NameArray::NameArray(SCSI_Address arrayToName, char *arrayName);
-+		NameArray(SCSI_Address arrayToName, char *arrayName);
- 		NameArray(const NameArray &new_NameArray);
- 		virtual	~NameArray();
- 
-diff -uNr raidutils-0.0.6/raidutil/rmwflash.hpp raidutils-0.0.6.new/raidutil/rmwflash.hpp
---- raidutils-0.0.6/raidutil/rmwflash.hpp	2005-01-24 10:41:06.000000000 +0100
-+++ raidutils-0.0.6.new/raidutil/rmwflash.hpp	2006-09-16 14:38:09.000000000 +0200
-@@ -59,7 +59,7 @@
- {
- 
-         public:
--                RMWFlash::RMWFlash(int hbaNo, char *Data, int Region, unsigned long Offset, unsigned Size);
-+                RMWFlash(int hbaNo, char *Data, int Region, unsigned long Offset, unsigned Size);
-                 RMWFlash(const RMWFlash &new_RMWFlash);
-                 virtual ~RMWFlash();
- 
-diff -uNr raidutils-0.0.6/raidutil/segment.hpp raidutils-0.0.6.new/raidutil/segment.hpp
---- raidutils-0.0.6/raidutil/segment.hpp	2005-01-24 10:41:07.000000000 +0100
-+++ raidutils-0.0.6.new/raidutil/segment.hpp	2006-09-16 14:39:12.000000000 +0200
-@@ -51,7 +51,7 @@
- {
- 
- 	public:
--		arraySegment::arraySegment(SCSI_Address raidToSeg, uLONG segSize[8], uLONG segOffset[8], bool showSeg);
-+		arraySegment(SCSI_Address raidToSeg, uLONG segSize[8], uLONG segOffset[8], bool showSeg);
- 		arraySegment(const arraySegment &new_arraySegment);
- 		virtual	~arraySegment();
- 
-diff -uNr raidutils-0.0.6/raidutil/setcache.hpp raidutils-0.0.6.new/raidutil/setcache.hpp
---- raidutils-0.0.6/raidutil/setcache.hpp	2005-01-24 10:41:07.000000000 +0100
-+++ raidutils-0.0.6.new/raidutil/setcache.hpp	2006-09-16 14:35:41.000000000 +0200
-@@ -55,7 +55,7 @@
- class SetCache:public Command
- 	{
- 	public:
--		SetCache::SetCache(
-+		SetCache(
- 				SCSI_Addr_List	*addresses,		// a list of addresses
- 				int				on,				// Whether to enable or disable
- 				int				rw				// Read or write cacheing.
-diff -uNr raidutils-0.0.6/raidutil/setrate.hpp raidutils-0.0.6.new/raidutil/setrate.hpp
---- raidutils-0.0.6/raidutil/setrate.hpp	2005-01-24 10:41:06.000000000 +0100
-+++ raidutils-0.0.6.new/raidutil/setrate.hpp	2006-09-16 14:33:22.000000000 +0200
-@@ -59,8 +59,8 @@
- 	public:
- 
- 		// Set the (global) rebuild rate
--        SetRate::SetRate(int rate, SCSI_Addr_List *objs);
--        SetRate::SetRate(const SetRate &right);
-+        SetRate(int rate, SCSI_Addr_List *objs);
-+        SetRate(const SetRate &right);
- 		virtual	~SetRate();
- 
- 		Dpt_Error execute(String_List **output);
-diff -uNr raidutils-0.0.6/raidutil/setscfg.hpp raidutils-0.0.6.new/raidutil/setscfg.hpp
---- raidutils-0.0.6/raidutil/setscfg.hpp	2005-01-24 10:41:06.000000000 +0100
-+++ raidutils-0.0.6.new/raidutil/setscfg.hpp	2006-09-16 14:38:38.000000000 +0200
-@@ -59,7 +59,7 @@
- {
- 
- 	public:
--		setscfg::setscfg();
-+		setscfg();
- 		virtual	~setscfg();
- 
- 		Dpt_Error execute(String_List **output);
-diff -uNr raidutils-0.0.6/raidutil/taskctrl.hpp raidutils-0.0.6.new/raidutil/taskctrl.hpp
---- raidutils-0.0.6/raidutil/taskctrl.hpp	2005-01-24 10:41:06.000000000 +0100
-+++ raidutils-0.0.6.new/raidutil/taskctrl.hpp	2006-09-16 14:36:42.000000000 +0200
-@@ -59,7 +59,7 @@
- class TaskControl:public Command
- 	{
- 	public:
--		TaskControl::TaskControl(SCSI_Addr_List *deviceList, TaskCommandOptions cmd);
-+		TaskControl(SCSI_Addr_List *deviceList, TaskCommandOptions cmd);
- 		TaskControl(const TaskControl &new_TaskControl);
- 		virtual	~TaskControl();
- 
-diff -uNr raidutils-0.0.6/raidutil/uartdmp.hpp raidutils-0.0.6.new/raidutil/uartdmp.hpp
---- raidutils-0.0.6/raidutil/uartdmp.hpp	2005-01-24 10:41:06.000000000 +0100
-+++ raidutils-0.0.6.new/raidutil/uartdmp.hpp	2006-09-16 14:37:39.000000000 +0200
-@@ -59,7 +59,7 @@
- {
- 
- 	public:
--		UartDmp::UartDmp(int hbaNo, char *fileName);
-+		UartDmp(int hbaNo, char *fileName);
- 		UartDmp(const UartDmp &new_UartDmp);
- 		virtual	~UartDmp();
- 
-diff -uNr raidutils-0.0.6/raidutil/zap.hpp raidutils-0.0.6.new/raidutil/zap.hpp
---- raidutils-0.0.6/raidutil/zap.hpp	2005-01-24 10:41:06.000000000 +0100
-+++ raidutils-0.0.6.new/raidutil/zap.hpp	2006-09-16 14:34:52.000000000 +0200
-@@ -55,7 +55,7 @@
- class Zap:public Command
- 	{
- 	public:
--		Zap::Zap(
-+		Zap(
- 				SCSI_Addr_List	*addresses,  // a list of addresses
-             int resync = 0            // (send reset to hba or not)
-       );								         // to delete raid tables on
diff --git a/sys-apps/raidutils/files/raidutils-0.0.6-misc-fixes.patch b/sys-apps/raidutils/files/raidutils-0.0.6-misc-fixes.patch
new file mode 100644
index 000000000000..63fcd99684cb
--- /dev/null
+++ b/sys-apps/raidutils/files/raidutils-0.0.6-misc-fixes.patch
@@ -0,0 +1,358 @@
+diff -uNr raidutils-0.0.6.orig/lib/engcalls.cpp raidutils-0.0.6/lib/engcalls.cpp
+--- raidutils-0.0.6.orig/lib/engcalls.cpp	2005-01-24 10:41:04.000000000 +0100
++++ raidutils-0.0.6/lib/engcalls.cpp	2007-02-28 23:43:58.000000000 +0100
+@@ -987,7 +987,7 @@
+ 
+   /* The Attach Failed, So DeAllocate The Shared Memory */
+ 
+-        if((int)SharedMemoryPtr == -1)
++        if((long)SharedMemoryPtr == -1)
+           {
+             shmctl(BufferID,IPC_RMID,&shm_buff);
+             SharedMemoryPtr = NULL;
+diff -uNr raidutils-0.0.6.orig/raideng/connect.hpp raidutils-0.0.6/raideng/connect.hpp
+--- raidutils-0.0.6.orig/raideng/connect.hpp	2005-01-24 10:41:05.000000000 +0100
++++ raidutils-0.0.6/raideng/connect.hpp	2007-02-28 23:43:58.000000000 +0100
+@@ -189,7 +189,7 @@
+ 
+ // Constructor/Destructor.............................
+ 
+-			dptSCSIcon_C::dptSCSIcon_C();
++			dptSCSIcon_C();
+ 
+ // Message Handlers...................................
+ 
+diff -uNr raidutils-0.0.6.orig/raideng/eng_unix.cpp raidutils-0.0.6/raideng/eng_unix.cpp
+--- raidutils-0.0.6.orig/raideng/eng_unix.cpp	2005-01-24 10:41:04.000000000 +0100
++++ raidutils-0.0.6/raideng/eng_unix.cpp	2007-02-28 23:43:58.000000000 +0100
+@@ -491,7 +491,7 @@
+ 
+   /* Make Sure That We Could Attach */
+ 
+-            if((int)toEng_P != -1)
++            if((long)toEng_P != -1)
+               {
+                  fromEng_P = toEng_P + HdrBuff.FromEngBuffOffset;
+ 
+@@ -909,7 +909,7 @@
+ #else
+ void DisplayHelp(void)
+   {
+-    printf("The Pramaters For This Program Are :\n");
++    printf("The Parameters For This Program Are :\n");
+     printf(
+ "  /VERBOSE            :  Display All Connection And Message Information\n");
+     printf(
+diff -uNr raidutils-0.0.6.orig/raideng/i2odep.h raidutils-0.0.6/raideng/i2odep.h
+--- raidutils-0.0.6.orig/raideng/i2odep.h	2005-01-24 10:41:05.000000000 +0100
++++ raidutils-0.0.6/raideng/i2odep.h	2007-02-28 23:43:58.000000000 +0100
+@@ -203,7 +203,7 @@
+ # define _F_set12bit4(w,x,y,z,u) ((w)->z = (u))
+ # define _F_get16bit(w,x,y,z)    ((U16)((w)->z))
+ # define _F_set16bit(w,x,y,z,u)  ((w)->z = (u))
+-#elif (defined(_DPT_BIG_ENDIAN))
++#elif (defined(_DPT_BIG_ENDIAN) || defined(sparc))
+ /* First 12 bits */
+ # define _F_getTID(w,x,y)     getL12bit(w,x,0)
+ # define _F_setTID(w,x,y,z)   setL12bit(w,x,0,z)
+diff -uNr raidutils-0.0.6.orig/raideng/osd_unix.cpp raidutils-0.0.6/raideng/osd_unix.cpp
+--- raidutils-0.0.6.orig/raideng/osd_unix.cpp	2005-01-24 10:41:05.000000000 +0100
++++ raidutils-0.0.6/raideng/osd_unix.cpp	2007-02-28 23:43:58.000000000 +0100
+@@ -164,6 +164,10 @@
+ #define TO_LOGGER_BUFFER_SIZE    0x1000
+ #define FROM_LOGGER_BUFFER_SIZE  0x10000
+ 
++/* Definitions - Device names -----------------------------------------------*/
++
++char *DEV_CTL = "/dev/i2octl";	// formerly /dev/i2o/ctl
++
+ /* Function Prototypes ------------------------------------------------------*/
+ 
+ DPT_RTN_T osdIOrequest(uSHORT ioMethod);
+@@ -1232,7 +1236,7 @@
+ #elif defined (_DPT_SCO) || defined (SNI_MIPS) || defined(_DPT_SOLARIS) || defined(_DPT_BSDI) || defined(_DPT_FREE_BSD) || defined(_DPT_LINUX)
+ 
+ #if defined(_DPT_LINUX_I2O)
+-		     if(strcmp(HbaDevs[HbaNum].NodeName, "/dev/i2o/ctl"))
++		     if(strcmp(HbaDevs[HbaNum].NodeName, DEV_CTL))
+                         i = ioctl(FileID,I2OUSRCMD,IoctlBuffer_P);
+ 		     else {
+                         struct i2o_cmd_passthru pt;
+@@ -2144,7 +2148,7 @@
+                        i = 0;
+                 }
+ #elif defined(_DPT_LINUX_I2O)
+-                if(strcmp(HbaDevs[Count].NodeName, "/dev/i2o/ctl"))
++                if(strcmp(HbaDevs[Count].NodeName, DEV_CTL))
+                    i = osdSendIoctl(&HbaDevs[Count],DPT_CTRLINFO,DataBuff,&pkt);
+ 		else {
+ 		   /*
+@@ -2367,7 +2371,7 @@
+        SysInfo_P->busType = SI_PCI_BUS;
+        SysInfo_P->processorFamily = PROC_INTEL;
+        buffer_size = sysinfo(SI_ARCHITECTURE, buffer_ptr, 0);
+-       buffer_ptr = (char *)malloc((int)buffer_size);
++       buffer_ptr = (char *)malloc((size_t)buffer_size);
+        status = sysinfo(SI_ARCHITECTURE, buffer_ptr, buffer_size);
+        if (status != -1)
+         {
+@@ -2647,7 +2651,7 @@
+ 
+   /* The Attach Failed, So DeAllocate The Shared Memory */
+ 
+-            if((int)SharedMemoryPtr == -1)
++            if((long)SharedMemoryPtr == -1)
+               {
+                 Rtnval = 1;
+                 shmctl(BufferID,IPC_RMID,&shm_buff);
+@@ -2782,7 +2786,7 @@
+         toLoggerTotalSize = toLoggerSize + sizeof(dptBuffer_S);
+         fromLoggerTotalSize = fromEngSize + sizeof(dptBuffer_S);
+         FromLoggerBuffOffset = toLoggerTotalSize;
+-        Ptr = (char *)malloc((uINT)(toLoggerTotalSize + fromLoggerTotalSize));
++        Ptr = (char *)malloc((size_t)(toLoggerTotalSize + fromLoggerTotalSize));
+         if(Ptr != NULL)
+           {
+             *toLogger_P_P = Ptr;
+@@ -3421,7 +3425,7 @@
+  {
+    void *Rtnval;
+ 
+-   Rtnval = (void *)malloc((uINT)size);
++   Rtnval = (void *)malloc((size_t)size);
+    if(Verbose)
+      {
+        FormatTimeString(TimeString,time(0));
+@@ -3745,13 +3749,13 @@
+ #  if (defined(_DPT_LINUX_I2O))
+    memset(&pkt, 0, sizeof(EATA_CP));
+    HbaDevs[NumEntries].Flags = 0;
+-   strcpy(HbaDevs[NumEntries].NodeName, "/dev/i2o/ctl");
++   strcpy(HbaDevs[NumEntries].NodeName, DEV_CTL);
+    IoctlRtn = osdSendIoctl(&HbaDevs[NumEntries], I2OGETIOPS, (uCHAR *)&NumEntries, &pkt);
+    if(!IoctlRtn) {
+      for(i = 0; i < NumEntries; i ++) {
+        HbaDevs[i].Flags = NODE_FILE_VALID_HBA_B | NODE_FILE_I2O_HBA_B;
+        HbaDevs[i].IoAddress = UINTPTR_MAX;
+-       strcpy(HbaDevs[i].NodeName, "/dev/i2o/ctl");
++       strcpy(HbaDevs[i].NodeName, DEV_CTL);
+      }
+    }
+ #  endif
+diff -uNr raidutils-0.0.6.orig/raideng/raid.h raidutils-0.0.6/raideng/raid.h
+--- raidutils-0.0.6.orig/raideng/raid.h	2005-01-24 10:41:04.000000000 +0100
++++ raidutils-0.0.6/raideng/raid.h	2007-02-28 23:43:58.000000000 +0100
+@@ -271,7 +271,7 @@
+ 
+ // Constructor/Destructor.............................
+ 
+-			raidDef_S::raidDef_S();
++			raidDef_S();
+ 
+ };
+ #endif  // c++
+diff -uNr raidutils-0.0.6.orig/raideng/unreslvd.cpp raidutils-0.0.6/raideng/unreslvd.cpp
+--- raidutils-0.0.6.orig/raideng/unreslvd.cpp	2005-01-24 10:41:05.000000000 +0100
++++ raidutils-0.0.6/raideng/unreslvd.cpp	2007-02-28 23:43:58.000000000 +0100
+@@ -34,7 +34,7 @@
+    char *__nw__FUi(int size)
+    {
+         char *p;
+-        p = (char *)malloc(size);          
++	p = (char *)malloc((size_t)size);
+         return(p);
+    }
+ 
+diff -uNr raidutils-0.0.6.orig/raidutil/alarm.hpp raidutils-0.0.6/raidutil/alarm.hpp
+--- raidutils-0.0.6.orig/raidutil/alarm.hpp	2005-01-24 10:41:07.000000000 +0100
++++ raidutils-0.0.6/raidutil/alarm.hpp	2007-02-28 23:43:58.000000000 +0100
+@@ -58,7 +58,7 @@
+ class AlarmStatus:public Command
+ 	{
+ 	public:
+-		AlarmStatus::AlarmStatus( int hba, AlarmCommand cmd );							
++		AlarmStatus( int hba, AlarmCommand cmd );							
+ 		AlarmStatus( const AlarmStatus &new_AlarmStatus );
+ 		virtual	~AlarmStatus();
+ 		AlarmStatus	&operator = ( AlarmStatus &right );
+diff -uNr raidutils-0.0.6.orig/raidutil/command.cpp raidutils-0.0.6/raidutil/command.cpp
+--- raidutils-0.0.6.orig/raidutil/command.cpp	2005-01-24 10:41:07.000000000 +0100
++++ raidutils-0.0.6/raidutil/command.cpp	2007-02-28 23:43:58.000000000 +0100
+@@ -2237,13 +2237,14 @@
+ }
+ 
+ 
+-#ifdef sparc
+-# define VOLATILE volatile
+-#else
+-# define VOLATILE
+-#endif
+-
+-extern "C" { VOLATILE void exit (int);}
++//// Comment out this stuff, for Debian.
++// #ifdef sparc
++// # define VOLATILE volatile
++// #else
++// # define VOLATILE
++// #endif
++//
++// extern "C" { VOLATILE void exit (int);}
+ 
+ void Command::Init_Engine(int scanHbasOnly)
+ {
+diff -uNr raidutils-0.0.6.orig/raidutil/eventlog.hpp raidutils-0.0.6/raidutil/eventlog.hpp
+--- raidutils-0.0.6.orig/raidutil/eventlog.hpp	2005-01-24 10:41:07.000000000 +0100
++++ raidutils-0.0.6/raidutil/eventlog.hpp	2007-02-28 23:43:58.000000000 +0100
+@@ -77,7 +77,7 @@
+ 	{
+ 
+ 	public:
+-		EventLog::EventLog(SCSI_Addr_List *deviceList, 
++		EventLog(SCSI_Addr_List *deviceList, 
+             EventLogOptions cmd);
+ 		EventLog(const EventLog &new_EventLog);
+ 		virtual	~EventLog();
+diff -uNr raidutils-0.0.6.orig/raidutil/expand.hpp raidutils-0.0.6/raidutil/expand.hpp
+--- raidutils-0.0.6.orig/raidutil/expand.hpp	2005-01-24 10:41:07.000000000 +0100
++++ raidutils-0.0.6/raidutil/expand.hpp	2007-02-28 23:43:58.000000000 +0100
+@@ -55,7 +55,7 @@
+ class Expand:public Command
+ {
+    public:
+-      Expand::Expand (SCSI_Address raid, SCSI_Addr_List *list);
++                Expand (SCSI_Address raid, SCSI_Addr_List *list);
+ 		Expand (const Expand &new_Expand);
+ 		virtual ~Expand();
+ 		Expand &operator = (Expand &right);
+diff -uNr raidutils-0.0.6.orig/raidutil/forcest.hpp raidutils-0.0.6/raidutil/forcest.hpp
+--- raidutils-0.0.6.orig/raidutil/forcest.hpp	2005-01-24 10:41:07.000000000 +0100
++++ raidutils-0.0.6/raidutil/forcest.hpp	2007-02-28 23:43:58.000000000 +0100
+@@ -65,7 +65,7 @@
+ class ForceState:public Command
+ 	{
+ 	public:
+-		ForceState::ForceState(SCSI_Addr_List *deviceList, ForceStateOptions cmd);
++		ForceState(SCSI_Addr_List *deviceList, ForceStateOptions cmd);
+ 		ForceState(const ForceState &new_ForceState);
+ 		virtual	~ForceState();
+ 
+diff -uNr raidutils-0.0.6.orig/raidutil/namarray.hpp raidutils-0.0.6/raidutil/namarray.hpp
+--- raidutils-0.0.6.orig/raidutil/namarray.hpp	2005-01-24 10:41:06.000000000 +0100
++++ raidutils-0.0.6/raidutil/namarray.hpp	2007-02-28 23:43:58.000000000 +0100
+@@ -58,7 +58,7 @@
+ {
+ 
+ 	public:
+-		NameArray::NameArray(SCSI_Address arrayToName, char *arrayName);
++		NameArray(SCSI_Address arrayToName, char *arrayName);
+ 		NameArray(const NameArray &new_NameArray);
+ 		virtual	~NameArray();
+ 
+diff -uNr raidutils-0.0.6.orig/raidutil/rmwflash.hpp raidutils-0.0.6/raidutil/rmwflash.hpp
+--- raidutils-0.0.6.orig/raidutil/rmwflash.hpp	2005-01-24 10:41:06.000000000 +0100
++++ raidutils-0.0.6/raidutil/rmwflash.hpp	2007-02-28 23:43:58.000000000 +0100
+@@ -59,7 +59,7 @@
+ {
+ 
+         public:
+-                RMWFlash::RMWFlash(int hbaNo, char *Data, int Region, unsigned long Offset, unsigned Size);
++                RMWFlash(int hbaNo, char *Data, int Region, unsigned long Offset, unsigned Size);
+                 RMWFlash(const RMWFlash &new_RMWFlash);
+                 virtual ~RMWFlash();
+ 
+diff -uNr raidutils-0.0.6.orig/raidutil/segment.hpp raidutils-0.0.6/raidutil/segment.hpp
+--- raidutils-0.0.6.orig/raidutil/segment.hpp	2005-01-24 10:41:07.000000000 +0100
++++ raidutils-0.0.6/raidutil/segment.hpp	2007-02-28 23:43:58.000000000 +0100
+@@ -51,7 +51,7 @@
+ {
+ 
+ 	public:
+-		arraySegment::arraySegment(SCSI_Address raidToSeg, uLONG segSize[8], uLONG segOffset[8], bool showSeg);
++		arraySegment(SCSI_Address raidToSeg, uLONG segSize[8], uLONG segOffset[8], bool showSeg);
+ 		arraySegment(const arraySegment &new_arraySegment);
+ 		virtual	~arraySegment();
+ 
+diff -uNr raidutils-0.0.6.orig/raidutil/setcache.hpp raidutils-0.0.6/raidutil/setcache.hpp
+--- raidutils-0.0.6.orig/raidutil/setcache.hpp	2005-01-24 10:41:07.000000000 +0100
++++ raidutils-0.0.6/raidutil/setcache.hpp	2007-02-28 23:44:46.000000000 +0100
+@@ -55,7 +55,7 @@
+ class SetCache:public Command
+ 	{
+ 	public:
+-		SetCache::SetCache(
++		SetCache(
+ 				SCSI_Addr_List	*addresses,		// a list of addresses
+ 				int				on,				// Whether to enable or disable
+ 				int				rw				// Read or write cacheing.
+diff -uNr raidutils-0.0.6.orig/raidutil/setrate.hpp raidutils-0.0.6/raidutil/setrate.hpp
+--- raidutils-0.0.6.orig/raidutil/setrate.hpp	2005-01-24 10:41:06.000000000 +0100
++++ raidutils-0.0.6/raidutil/setrate.hpp	2007-02-28 23:43:58.000000000 +0100
+@@ -59,8 +59,8 @@
+ 	public:
+ 
+ 		// Set the (global) rebuild rate
+-        SetRate::SetRate(int rate, SCSI_Addr_List *objs);
+-        SetRate::SetRate(const SetRate &right);
++                SetRate(int rate, SCSI_Addr_List *objs);
++                SetRate(const SetRate &right);
+ 		virtual	~SetRate();
+ 
+ 		Dpt_Error execute(String_List **output);
+diff -uNr raidutils-0.0.6.orig/raidutil/setscfg.cpp raidutils-0.0.6/raidutil/setscfg.cpp
+--- raidutils-0.0.6.orig/raidutil/setscfg.cpp	2005-01-24 10:41:07.000000000 +0100
++++ raidutils-0.0.6/raidutil/setscfg.cpp	2007-02-28 23:43:58.000000000 +0100
+@@ -95,4 +95,4 @@
+         ENTER("Command &setscfg::Clone() const");
+         EXIT();
+         return(*new setscfg(*this));
+-}
+\ No newline at end of file
++}
+diff -uNr raidutils-0.0.6.orig/raidutil/setscfg.hpp raidutils-0.0.6/raidutil/setscfg.hpp
+--- raidutils-0.0.6.orig/raidutil/setscfg.hpp	2005-01-24 10:41:06.000000000 +0100
++++ raidutils-0.0.6/raidutil/setscfg.hpp	2007-02-28 23:43:58.000000000 +0100
+@@ -59,7 +59,7 @@
+ {
+ 
+ 	public:
+-		setscfg::setscfg();
++		setscfg();
+ 		virtual	~setscfg();
+ 
+ 		Dpt_Error execute(String_List **output);
+diff -uNr raidutils-0.0.6.orig/raidutil/taskctrl.hpp raidutils-0.0.6/raidutil/taskctrl.hpp
+--- raidutils-0.0.6.orig/raidutil/taskctrl.hpp	2005-01-24 10:41:06.000000000 +0100
++++ raidutils-0.0.6/raidutil/taskctrl.hpp	2007-02-28 23:43:58.000000000 +0100
+@@ -59,7 +59,7 @@
+ class TaskControl:public Command
+ 	{
+ 	public:
+-		TaskControl::TaskControl(SCSI_Addr_List *deviceList, TaskCommandOptions cmd);
++		TaskControl(SCSI_Addr_List *deviceList, TaskCommandOptions cmd);
+ 		TaskControl(const TaskControl &new_TaskControl);
+ 		virtual	~TaskControl();
+ 
+diff -uNr raidutils-0.0.6.orig/raidutil/uartdmp.hpp raidutils-0.0.6/raidutil/uartdmp.hpp
+--- raidutils-0.0.6.orig/raidutil/uartdmp.hpp	2005-01-24 10:41:06.000000000 +0100
++++ raidutils-0.0.6/raidutil/uartdmp.hpp	2007-02-28 23:43:58.000000000 +0100
+@@ -59,7 +59,7 @@
+ {
+ 
+ 	public:
+-		UartDmp::UartDmp(int hbaNo, char *fileName);
++		UartDmp(int hbaNo, char *fileName);
+ 		UartDmp(const UartDmp &new_UartDmp);
+ 		virtual	~UartDmp();
+ 
+diff -uNr raidutils-0.0.6.orig/raidutil/zap.hpp raidutils-0.0.6/raidutil/zap.hpp
+--- raidutils-0.0.6.orig/raidutil/zap.hpp	2005-01-24 10:41:06.000000000 +0100
++++ raidutils-0.0.6/raidutil/zap.hpp	2007-02-28 23:43:58.000000000 +0100
+@@ -55,7 +55,7 @@
+ class Zap:public Command
+ 	{
+ 	public:
+-		Zap::Zap(
++		Zap(
+ 				SCSI_Addr_List	*addresses,  // a list of addresses
+             int resync = 0            // (send reset to hba or not)
+       );								         // to delete raid tables on
diff --git a/sys-apps/raidutils/raidutils-0.0.5.ebuild b/sys-apps/raidutils/raidutils-0.0.5.ebuild
deleted file mode 100644
index f5f5d53e4bb0..000000000000
--- a/sys-apps/raidutils/raidutils-0.0.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/raidutils/raidutils-0.0.5.ebuild,v 1.5 2005/06/01 08:49:59 xmerlin Exp $
-
-inherit eutils
-
-DESCRIPTION="Utilities to manage i2o/dtp RAID controllers."
-SRC_URI="http://i2o.shadowconnect.com/raidutils/${P}.tar.bz2"
-HOMEPAGE="http://i2o.shadowconnect.com/"
-
-KEYWORDS="x86"
-IUSE=""
-
-SLOT="0"
-LICENSE="Adaptec"
-
-DEPEND=">=sys-kernel/linux-headers-2.6"
-RDEPEND=""
-
-src_unpack () {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/raidutils-0.0.5-i2octl-fixpath.patch || die
-}
-
-src_compile() {
-	econf || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc NEWS INSTALL AUTHORS COPYING ChangeLog
-}
diff --git a/sys-apps/raidutils/raidutils-0.0.6.ebuild b/sys-apps/raidutils/raidutils-0.0.6-r1.ebuild
index 5acf347c8b20..56a3e41fa198 100644
--- a/sys-apps/raidutils/raidutils-0.0.6.ebuild
+++ b/sys-apps/raidutils/raidutils-0.0.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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.ebuild,v 1.4 2006/09/16 12:03:20 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/raidutils/raidutils-0.0.6-r1.ebuild,v 1.1 2007/02/28 22:59:11 xmerlin Exp $
 
 inherit eutils
 
@@ -20,13 +20,15 @@ RDEPEND=""
 src_unpack () {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/raidutils-0.0.5-i2octl-fixpath.patch || die
-	epatch ${FILESDIR}/raidutils-0.0.6-gcc41x-compilefix.patch || die
+	#epatch ${FILESDIR}/raidutils-0.0.5-i2octl-fixpath.patch || die
+	#epatch ${FILESDIR}/raidutils-0.0.6-gcc41x-compilefix.patch || die
+	epatch ${FILESDIR}/${P}-misc-fixes.patch || die
+	#rm -f include/linux/i2o-dev.h
 }
 
 src_compile() {
 	econf || die
-	emake || die
+	emake -j1 || die
 }
 
 src_install() {