Added patch to fix CPU detection on alpha, thanks to tcort (see bug 103966#c16)

(Portage version: 2.1_rc1-r4)

3 files changed, 110 insertions, 3 deletions

diff --git a/gnome-extra/gdesklets-core/ChangeLog b/gnome-extra/gdesklets-core/ChangeLog
index 1f868ca6fbfd..8834fc3eec98 100644
--- a/gnome-extra/gdesklets-core/ChangeLog
+++ b/gnome-extra/gdesklets-core/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gdesklets-core
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.60 2006/04/30 21:08:53 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.61 2006/05/27 16:59:33 nixphoeni Exp $
+
+  27 May 2006; Joe Sapp <nixphoeni@gentoo.org>
+  +files/gdesklets-core-0.35.3-alpha.patch, gdesklets-core-0.35.3.ebuild:
+  Added patch to fix CPU detection on alpha, thanks to tcort (see bug 103966#c16)
 
   30 Apr 2006; Joe Sapp <nixphoeni@gentoo.org>
   gdesklets-core-0.34.3-r1.ebuild, gdesklets-core-0.35.2-r1.ebuild,
diff --git a/gnome-extra/gdesklets-core/files/gdesklets-core-0.35.3-alpha.patch b/gnome-extra/gdesklets-core/files/gdesklets-core-0.35.3-alpha.patch
new file mode 100644
index 000000000000..89866ec46c36
--- /dev/null
+++ b/gnome-extra/gdesklets-core/files/gdesklets-core-0.35.3-alpha.patch
@@ -0,0 +1,89 @@
+diff -urN gDesklets-0.35.3.orig/libdesklets/system/ArchFactory.py gDesklets-0.35.3/libdesklets/system/ArchFactory.py
+--- gDesklets-0.35.3.orig/libdesklets/system/ArchFactory.py	2005-01-22 15:33:31.000000000 +0000
++++ gDesklets-0.35.3/libdesklets/system/ArchFactory.py	2006-04-30 12:58:04.000000000 +0000
+@@ -27,6 +27,9 @@
+         if (uname[-1] in ('ppc', 'ppc64')):
+             return Linux.PPC()
+ 
++        if (uname[-1] in ('alpha')):
++            return Linux.Alpha()
++
+         return Linux.Generic()
+ 
+ 
+diff -urN gDesklets-0.35.3.orig/libdesklets/system/Linux/Alpha.py gDesklets-0.35.3/libdesklets/system/Linux/Alpha.py
+--- gDesklets-0.35.3.orig/libdesklets/system/Linux/Alpha.py	1970-01-01 00:00:00.000000000 +0000
++++ gDesklets-0.35.3/libdesklets/system/Linux/Alpha.py	2006-04-30 16:06:54.000000000 +0000
+@@ -0,0 +1,52 @@
++from Generic import Generic
++
++import re
++
++class Alpha(Generic):
++
++    def __init__(self):
++
++        Generic.__init__(self)
++
++        def _get_model():
++            r = re.compile('^system type\s+:\s+(.+)$', re.M)
++            m = r.search( self._read_cpuinfo() )
++            return m.group(1)
++
++        def _get_speed():
++            r = re.compile('^cycle frequency \[Hz\]\s+:\s+(\d+)\s+est\.$', re.M);
++            m = r.search( self._read_cpuinfo() )
++            return float(int(m.group(1))/1000000.0)
++
++        self.__model_name = _get_model()
++        self.__speed      = _get_speed()
++
++        # set cache size to 0, since size is not present in /proc/cpuinfo
++        self.__cache_size = int(0)
++
++
++    def cpu_cache(self):
++        """
++        @return : 2nd level cache of installed processor
++        @rtype  : int
++        """
++
++        return self.__cache_size
++
++    def cpu_model(self):
++        """
++        @return : model/type of installed processor
++        @rtype  : str
++        """
++
++        return self.__model_name
++
++
++
++    def cpu_speed(self):
++        """
++        @return : current clock of installed processor
++        @rtype  : float
++        """
++
++        return self.__speed
+diff -urN gDesklets-0.35.3.orig/libdesklets/system/Linux/Makefile.am gDesklets-0.35.3/libdesklets/system/Linux/Makefile.am
+--- gDesklets-0.35.3.orig/libdesklets/system/Linux/Makefile.am	2004-11-22 19:42:53.000000000 +0000
++++ gDesklets-0.35.3/libdesklets/system/Linux/Makefile.am	2006-04-30 12:58:43.000000000 +0000
+@@ -2,6 +2,7 @@
+ 
+ install_DATA = \
+ 	__init__.py	\
++	Alpha.py	\
+ 	Generic.py \
+ 	PPC.py \
+ 	Sparc.py \
+diff -urN gDesklets-0.35.3.orig/libdesklets/system/Linux/__init__.py gDesklets-0.35.3/libdesklets/system/Linux/__init__.py
+--- gDesklets-0.35.3.orig/libdesklets/system/Linux/__init__.py	2004-04-19 18:24:26.000000000 +0000
++++ gDesklets-0.35.3/libdesklets/system/Linux/__init__.py	2006-04-30 13:14:47.000000000 +0000
+@@ -1,4 +1,5 @@
+ from X86 import X86
+ from Sparc import Sparc
+ from PPC import PPC
++from Alpha import Alpha
+ from Generic import Generic
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.35.3.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.35.3.ebuild
index c29f966252e7..ec6cb6efb3c9 100644
--- a/gnome-extra/gdesklets-core/gdesklets-core-0.35.3.ebuild
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.35.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.35.3.ebuild,v 1.2 2006/04/30 21:08:53 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.35.3.ebuild,v 1.3 2006/05/27 16:59:33 nixphoeni Exp $
 
-inherit gnome2 eutils multilib
+inherit gnome2 eutils autotools multilib
 
 MY_PN="gDesklets"
 MY_P="${MY_PN}-${PV/_/}"
@@ -35,6 +35,20 @@ DEPEND="${RDEPEND}
 USE_DESTDIR="1"
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 
+src_unpack() {
+
+	gnome2_src_unpack
+
+	if use alpha ; then
+
+		epatch ${FILESDIR}/${P}-alpha.patch
+
+		eautoreconf
+
+	fi
+
+}
+
 src_install() {
 
 	gnome2_src_install