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

Package-Manager: portage-2.1_rc1-r4

4 files changed, 122 insertions, 11 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/Manifest b/gnome-extra/gdesklets-core/Manifest
index a9bf20356129..37022a7e1a52 100644
--- a/gnome-extra/gdesklets-core/Manifest
+++ b/gnome-extra/gdesklets-core/Manifest
@@ -6,6 +6,10 @@ AUX gdesklets-control-getid 1146 RMD160 e2a770486e996067c1484f24d73692ce4c34582b
 MD5 71bc511d49da32bc50a59ba5f51d7e24 files/gdesklets-control-getid 1146
 RMD160 e2a770486e996067c1484f24d73692ce4c34582b files/gdesklets-control-getid 1146
 SHA256 a3d793c625b5205fd07fdc61d665a6720a2714b403139f5de6cd18fee1c20899 files/gdesklets-control-getid 1146
+AUX gdesklets-core-0.35.3-alpha.patch 2928 RMD160 8ab4ca3715f38805e00cd53c9d58b8a02da732c0 SHA1 eca66be05a0e444e562c3470ec5fbe78e1bab6e3 SHA256 525d0d4603aeec94767d731e4a42b9335be1eb37f610681313f286f6a837a6c0
+MD5 90cd600248c5e104e941b032c7dc4d3f files/gdesklets-core-0.35.3-alpha.patch 2928
+RMD160 8ab4ca3715f38805e00cd53c9d58b8a02da732c0 files/gdesklets-core-0.35.3-alpha.patch 2928
+SHA256 525d0d4603aeec94767d731e4a42b9335be1eb37f610681313f286f6a837a6c0 files/gdesklets-core-0.35.3-alpha.patch 2928
 AUX gdesklets-displays.desktop 230 RMD160 379976fed75e7d22b97604476d949ad044c7a542 SHA1 dc3231bea820f7ba710eece67d03baa8bd1d4d5b SHA256 ede33a1ff77c38f4afb4e748de235e23722745f476e5065a4724cfb8afaf1e5a
 MD5 01751d3aa9192793a33c02d2126192c1 files/gdesklets-displays.desktop 230
 RMD160 379976fed75e7d22b97604476d949ad044c7a542 files/gdesklets-displays.desktop 230
@@ -38,14 +42,14 @@ EBUILD gdesklets-core-0.35.2-r1.ebuild 2514 RMD160 90734b8788a791172dda277c8da3c
 MD5 954f08423833fd244eedc966f77775c1 gdesklets-core-0.35.2-r1.ebuild 2514
 RMD160 90734b8788a791172dda277c8da3c7532a1f29d7 gdesklets-core-0.35.2-r1.ebuild 2514
 SHA256 8c62480b6a8d6e6a170a7d49d0d61583903acabfe19b716a697e3c50398eb615 gdesklets-core-0.35.2-r1.ebuild 2514
-EBUILD gdesklets-core-0.35.3.ebuild 2568 RMD160 2378535adff09a7085fa3da474cab278bbdcfbf4 SHA1 cb02c9c24b469d43b89c6356e91e72d18521507e SHA256 afd5b5c958041f29b9892c72d1b9e10d79a4825a857658738f92d701bffc6e3c
-MD5 048ca7bd2a912f23d29101917c588eb7 gdesklets-core-0.35.3.ebuild 2568
-RMD160 2378535adff09a7085fa3da474cab278bbdcfbf4 gdesklets-core-0.35.3.ebuild 2568
-SHA256 afd5b5c958041f29b9892c72d1b9e10d79a4825a857658738f92d701bffc6e3c gdesklets-core-0.35.3.ebuild 2568
-MISC ChangeLog 10556 RMD160 68b28a6ac084d8617b8bd950f1e6e346be4ed708 SHA1 a3ce50a8a6d29bf0046ba177d8b4d71cc3e71bf6 SHA256 178540f97266d77161c6e67fecf5109a63eb6fbcc20a9eb4f28b7cd6d6cc8f1d
-MD5 0f90ee81f1e788d3bbe2aa181b90c0cd ChangeLog 10556
-RMD160 68b28a6ac084d8617b8bd950f1e6e346be4ed708 ChangeLog 10556
-SHA256 178540f97266d77161c6e67fecf5109a63eb6fbcc20a9eb4f28b7cd6d6cc8f1d ChangeLog 10556
+EBUILD gdesklets-core-0.35.3.ebuild 2698 RMD160 6ddb6bea9f25231c829ab0c97290af343434a578 SHA1 766493af337e20c8e5981f62dc2378ecbf4ff819 SHA256 5110d3563032cd7a598186420ab0023559717bc2789010727edc20425323357a
+MD5 a9521f149613e3ca49a249169efdd314 gdesklets-core-0.35.3.ebuild 2698
+RMD160 6ddb6bea9f25231c829ab0c97290af343434a578 gdesklets-core-0.35.3.ebuild 2698
+SHA256 5110d3563032cd7a598186420ab0023559717bc2789010727edc20425323357a gdesklets-core-0.35.3.ebuild 2698
+MISC ChangeLog 10760 RMD160 4d564df249fec33a05bcc36d75119008fa67e3ec SHA1 882f5e9e31b6397ca659a677e4df251b313d0d8a SHA256 260b8e9446e1d2c279ff089a2002fe0dd39fef27f8e938465c431ca0fe61d219
+MD5 fc94ae544f11283767958847f068a233 ChangeLog 10760
+RMD160 4d564df249fec33a05bcc36d75119008fa67e3ec ChangeLog 10760
+SHA256 260b8e9446e1d2c279ff089a2002fe0dd39fef27f8e938465c431ca0fe61d219 ChangeLog 10760
 MISC metadata.xml 281 RMD160 c2bd0b9406d9647ead7e3bdfc11bfe887e355330 SHA1 7d9bd51c4b4df79ab0ad715395c86c42cbd72bb5 SHA256 9d4bf715ca56bbd8b396f14fdcf85cc266f4c3e64889f0737f8b70022541d458
 MD5 29674f36cd2d889e4e21fec9a2cee59b metadata.xml 281
 RMD160 c2bd0b9406d9647ead7e3bdfc11bfe887e355330 metadata.xml 281
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