Fixed bug #146105.

(Portage version: 2.1-r1)

4 files changed, 241 insertions, 4 deletions

diff --git a/sys-apps/raidutils/ChangeLog b/sys-apps/raidutils/ChangeLog
index 92c0249af081..a4d7bdb319b3 100644
--- a/sys-apps/raidutils/ChangeLog
+++ b/sys-apps/raidutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/raidutils
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/raidutils/ChangeLog,v 1.6 2005/06/01 08:49:59 xmerlin Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/raidutils/ChangeLog,v 1.7 2006/09/16 12:03:20 xmerlin Exp $
+
+  16 Sep 2006; Christian Zoffoli <xmerlin@gentoo.org>
+  +files/raidutils-0.0.6-gcc41x-compilefix.patch, raidutils-0.0.6.ebuild:
+  Fixed bug #146105.
 
   01 Jun 2005; Christian Zoffoli <xmerlin@gentoo.org> raidutils-0.0.5.ebuild,
   raidutils-0.0.6.ebuild:
diff --git a/sys-apps/raidutils/files/digest-raidutils-0.0.6 b/sys-apps/raidutils/files/digest-raidutils-0.0.6
index 011dcc138af0..38acee772319 100644
--- a/sys-apps/raidutils/files/digest-raidutils-0.0.6
+++ b/sys-apps/raidutils/files/digest-raidutils-0.0.6
@@ -1 +1,3 @@
 MD5 d32ed6789a11dca51cbc6d4428e26d8b raidutils-0.0.6.tar.bz2 968898
+RMD160 9b5490d44d2a264ef0e5fa9f9290203069b135f1 raidutils-0.0.6.tar.bz2 968898
+SHA256 ac350f60b9635d952a7a5664effa59e418ada9ad3deba66d46e6e0a094966d65 raidutils-0.0.6.tar.bz2 968898
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
new file mode 100644
index 000000000000..89137bd21178
--- /dev/null
+++ b/sys-apps/raidutils/files/raidutils-0.0.6-gcc41x-compilefix.patch
@@ -0,0 +1,230 @@
+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/raidutils-0.0.6.ebuild b/sys-apps/raidutils/raidutils-0.0.6.ebuild
index 7d049cf20b71..5acf347c8b20 100644
--- a/sys-apps/raidutils/raidutils-0.0.6.ebuild
+++ b/sys-apps/raidutils/raidutils-0.0.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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.3 2005/06/01 08:49:59 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/raidutils/raidutils-0.0.6.ebuild,v 1.4 2006/09/16 12:03:20 xmerlin Exp $
 
 inherit eutils
 
@@ -21,6 +21,7 @@ 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
 }
 
 src_compile() {