Add patch to compile mbmon support on x86_64 platforms - bug #137082

Package-Manager: portage-2.1

5 files changed, 103 insertions, 12 deletions

diff --git a/app-admin/gkrellm/ChangeLog b/app-admin/gkrellm/ChangeLog
index eaf20d1963a2..3cc761b39ed0 100644
--- a/app-admin/gkrellm/ChangeLog
+++ b/app-admin/gkrellm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/gkrellm
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.121 2006/05/02 12:41:31 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.122 2006/06/18 14:32:21 malc Exp $
+
+  18 Jun 2006; <malc@gentoo.org> +files/gkrellm-mbmon-amd64.patch,
+  gkrellm-2.2.9.ebuild:
+  Add patch to compile mbmon support on x86_64 platforms - bug #137082
 
 *gkrellm-2.2.9 (17 Apr 2006)
 
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index f446b667b737..c4af9a845fc1 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -1,23 +1,96 @@
-MD5 cc30a8e6e92dabbf70aa6440795388ef ChangeLog 16290
-MD5 6e41c75396a6b0df361a04657fd45ac3 files/digest-gkrellm-1.2.13 67
-MD5 1f1f72757719eee0c20cbd1c1bf1bc60 files/digest-gkrellm-2.1.25 67
-MD5 7b7db1942a721f41ecf37f40c996da9c files/digest-gkrellm-2.1.28-r1 67
-MD5 306e201300b226a8ddd6ef90dd3ad087 files/digest-gkrellm-2.2.4 66
-MD5 7aee38c8548f2dd99532a9fd5fbf7640 files/digest-gkrellm-2.2.5 66
-MD5 7b97a277c3b5730f36562120235fef3b files/digest-gkrellm-2.2.6 66
-MD5 4226fe84fc32754c660e30473ecf9f09 files/digest-gkrellm-2.2.7 66
-MD5 3a56852895e1d937446e9a80e6be74ad files/digest-gkrellm-2.2.9 66
+AUX gkrellm-2.1.24-mail.patch 894 RMD160 c14745970c72dd0791b21722c3f240fd35d33739 SHA1 70d57a6c735dc9243e06b6dc1a2ba39a0f2f25ce SHA256 a9a937217477f09f3594fe83fc2fd5dc41f73a8588a3b9b69eb4a901f3c86143
 MD5 38b2fdbc8121ab565b5069fc0df2a143 files/gkrellm-2.1.24-mail.patch 894
+RMD160 c14745970c72dd0791b21722c3f240fd35d33739 files/gkrellm-2.1.24-mail.patch 894
+SHA256 a9a937217477f09f3594fe83fc2fd5dc41f73a8588a3b9b69eb4a901f3c86143 files/gkrellm-2.1.24-mail.patch 894
+AUX gkrellm-2.2.9-gnutls.patch 415 RMD160 0804d5db018c259930c6abcbe4d78c9908687268 SHA1 03065e5dcf5a9a01f9790652b9a11910456fd589 SHA256 a35810288c9ca46bd3f2e44936a5e73d726ccb28a36cdb330b1352d805a984e8
 MD5 1cb00c2f14fb053c5ded6831f04aa03c files/gkrellm-2.2.9-gnutls.patch 415
+RMD160 0804d5db018c259930c6abcbe4d78c9908687268 files/gkrellm-2.2.9-gnutls.patch 415
+SHA256 a35810288c9ca46bd3f2e44936a5e73d726ccb28a36cdb330b1352d805a984e8 files/gkrellm-2.2.9-gnutls.patch 415
+AUX gkrellm-dotkeep.patch 423 RMD160 b66d5c2a8ae2fdd9428371ce365f8123afef41f4 SHA1 f55585c0c7ec97c7de58b2ddab4342e0b34bd382 SHA256 ab34461fa4ed90187d87ea5bcfbc6ec1c9514fbf1f0d795f9df0ddee5b69bcd0
 MD5 b6f665a21b9065a69375dbf57b7acc28 files/gkrellm-dotkeep.patch 423
+RMD160 b66d5c2a8ae2fdd9428371ce365f8123afef41f4 files/gkrellm-dotkeep.patch 423
+SHA256 ab34461fa4ed90187d87ea5bcfbc6ec1c9514fbf1f0d795f9df0ddee5b69bcd0 files/gkrellm-dotkeep.patch 423
+AUX gkrellm-mbmon-amd64.patch 357 RMD160 540d9628ab6354fb0b1f6445dd6ad53ec27545a0 SHA1 b2da04a505da8e88ff49d474372ef9c4e1d6418e SHA256 6767c2f78ee8c8363777383b60fa9b7083a0d0f95b8e4c23bf909c2638664f6d
+MD5 45d902b9f40713505d1b588176b2dfb4 files/gkrellm-mbmon-amd64.patch 357
+RMD160 540d9628ab6354fb0b1f6445dd6ad53ec27545a0 files/gkrellm-mbmon-amd64.patch 357
+SHA256 6767c2f78ee8c8363777383b60fa9b7083a0d0f95b8e4c23bf909c2638664f6d files/gkrellm-mbmon-amd64.patch 357
+AUX gkrellmd 608 RMD160 37d0a5e6f7793e40b260ee80d64183009019d7a1 SHA1 4bf324634c1d48d21323e83c43c1a0f31e046eba SHA256 30fdf6078a5f6e66bdc81849a0c8bcd583d13858425a9b0be26bd14f7798b78c
 MD5 df04844dd1fc7e6d46e27a18bcd30ae9 files/gkrellmd 608
+RMD160 37d0a5e6f7793e40b260ee80d64183009019d7a1 files/gkrellmd 608
+SHA256 30fdf6078a5f6e66bdc81849a0c8bcd583d13858425a9b0be26bd14f7798b78c files/gkrellmd 608
+AUX slit_gtk+-2.4.0.patch 448 RMD160 40e172058cde914f2ee35c359a175cfeb6655909 SHA1 870526b862a76d080f5b7e339c7bd5dbfa28f430 SHA256 440ebd5fcf5ae4c6579ebc4073047756ce8495390a85c998ade00099f3a36af9
 MD5 5d126e706c3eccd634e22ccfb007eede files/slit_gtk+-2.4.0.patch 448
+RMD160 40e172058cde914f2ee35c359a175cfeb6655909 files/slit_gtk+-2.4.0.patch 448
+SHA256 440ebd5fcf5ae4c6579ebc4073047756ce8495390a85c998ade00099f3a36af9 files/slit_gtk+-2.4.0.patch 448
+DIST gkrellm-1.2.13.tar.bz2 438917
+DIST gkrellm-2.1.25.tar.bz2 633685
+DIST gkrellm-2.1.28.tar.bz2 633487
+DIST gkrellm-2.2.4.tar.bz2 647916
+DIST gkrellm-2.2.5.tar.bz2 668581
+DIST gkrellm-2.2.6.tar.bz2 672074
+DIST gkrellm-2.2.7.tar.bz2 673728
+DIST gkrellm-2.2.9.tar.bz2 691133 RMD160 e6de12774ec85c51dce18e3208340d1a080a6398 SHA1 114c09c78ae27bbb1b2f4c2edb346800831f2cef SHA256 5f243958342fe0e27432c1d4b01900c5e593b49f00a8bdd29200433b17059de9
+EBUILD gkrellm-1.2.13.ebuild 913 RMD160 cce44278bbc5387ddb0005bc7d400416c99f191f SHA1 baf7ca4e7a302603daa474d4d11c632274a79e10 SHA256 c6eb4d77130dc90c0638194967c8d7c6ecebaec724ea95682bc02b1614517a32
 MD5 0a083390da73e5e82d4f18e1528b7790 gkrellm-1.2.13.ebuild 913
+RMD160 cce44278bbc5387ddb0005bc7d400416c99f191f gkrellm-1.2.13.ebuild 913
+SHA256 c6eb4d77130dc90c0638194967c8d7c6ecebaec724ea95682bc02b1614517a32 gkrellm-1.2.13.ebuild 913
+EBUILD gkrellm-2.1.25.ebuild 1775 RMD160 70abc555670d5aad2de428076e1d3fa84dfaa13c SHA1 8885d7ed2a5fb602a1c7524da0f1b77b21faf2df SHA256 d359430dc7461d76242fc01280e832af72c9ecea218541d80f90eec88821acd1
 MD5 58b241c787b77b848e94e744dbfacdec gkrellm-2.1.25.ebuild 1775
+RMD160 70abc555670d5aad2de428076e1d3fa84dfaa13c gkrellm-2.1.25.ebuild 1775
+SHA256 d359430dc7461d76242fc01280e832af72c9ecea218541d80f90eec88821acd1 gkrellm-2.1.25.ebuild 1775
+EBUILD gkrellm-2.1.28-r1.ebuild 1773 RMD160 7bcbaa28c348758509616c425606900d80303f91 SHA1 61a7dd1920216ec4eb21b01fb6cfb92ba10f10d0 SHA256 04434aa249a31758738c0fef29115f98bb27d3ef76d5cd6ad71538124d700eff
 MD5 cfa07110f8fcc9408165913fa2532baf gkrellm-2.1.28-r1.ebuild 1773
+RMD160 7bcbaa28c348758509616c425606900d80303f91 gkrellm-2.1.28-r1.ebuild 1773
+SHA256 04434aa249a31758738c0fef29115f98bb27d3ef76d5cd6ad71538124d700eff gkrellm-2.1.28-r1.ebuild 1773
+EBUILD gkrellm-2.2.4.ebuild 1739 RMD160 4eeaca95ae8b85571e80831c8cf9fe0070ac9e32 SHA1 d13c71ebbf6fc50a36d8c9588cbad5a422fc4ce3 SHA256 b18067758c2ebf437b2c0c506a89850410ca49e60781989e984328f88342dd33
 MD5 55c4bc6db4f85a560079579542c1dd86 gkrellm-2.2.4.ebuild 1739
+RMD160 4eeaca95ae8b85571e80831c8cf9fe0070ac9e32 gkrellm-2.2.4.ebuild 1739
+SHA256 b18067758c2ebf437b2c0c506a89850410ca49e60781989e984328f88342dd33 gkrellm-2.2.4.ebuild 1739
+EBUILD gkrellm-2.2.5.ebuild 1977 RMD160 be9c387c1d43743ad8b30fbced69a40ba0f4c477 SHA1 5c0c3c1cbab11f8c7b325b4a08c20ced2e819f6e SHA256 40e25c3fec2f722634d5184121c57c000636a13ada10fc9b7d57602165d905fe
 MD5 7fe67aecd9de8ed7a2deaf5a35c4f58f gkrellm-2.2.5.ebuild 1977
+RMD160 be9c387c1d43743ad8b30fbced69a40ba0f4c477 gkrellm-2.2.5.ebuild 1977
+SHA256 40e25c3fec2f722634d5184121c57c000636a13ada10fc9b7d57602165d905fe gkrellm-2.2.5.ebuild 1977
+EBUILD gkrellm-2.2.6.ebuild 1986 RMD160 aa7114e2d9fdb0307d77b01929b35aac41fa48a7 SHA1 ed9517836a74277c3b2bf5e062ddb09dd6601965 SHA256 07fe2182c505fe8023665537c415b28d1024200a8564d0f6685c4ac4473327ec
 MD5 ea47c8b1e327a6638022fafc0f6d1b4d gkrellm-2.2.6.ebuild 1986
+RMD160 aa7114e2d9fdb0307d77b01929b35aac41fa48a7 gkrellm-2.2.6.ebuild 1986
+SHA256 07fe2182c505fe8023665537c415b28d1024200a8564d0f6685c4ac4473327ec gkrellm-2.2.6.ebuild 1986
+EBUILD gkrellm-2.2.7.ebuild 1986 RMD160 eddbfc154e0f17853730a2bb0b47751fefd98001 SHA1 b6f028d41aa2a80b09b5c4d632f889fd7aace30f SHA256 cf638157f6e9fa068821853e41fef16a89681bb4669b7f1ca06e1d32eb20f6e0
 MD5 9e65fffbb4e24034bc27316a609753e0 gkrellm-2.2.7.ebuild 1986
-MD5 942021d6591bca2cdef22f7f6c6fe9a7 gkrellm-2.2.9.ebuild 2251
+RMD160 eddbfc154e0f17853730a2bb0b47751fefd98001 gkrellm-2.2.7.ebuild 1986
+SHA256 cf638157f6e9fa068821853e41fef16a89681bb4669b7f1ca06e1d32eb20f6e0 gkrellm-2.2.7.ebuild 1986
+EBUILD gkrellm-2.2.9.ebuild 2296 RMD160 58f8a29af355a30f4b78a5c7072fc9cce737cadf SHA1 ca06b42567b6ab0e8eea9c98cada745b0b469fc8 SHA256 f5d0eac1fd333a0f7320fde38221aba26f94a4c86b68336337902f4c5a128cf4
+MD5 c6f78c71bc360c0272f004fb2f44f1aa gkrellm-2.2.9.ebuild 2296
+RMD160 58f8a29af355a30f4b78a5c7072fc9cce737cadf gkrellm-2.2.9.ebuild 2296
+SHA256 f5d0eac1fd333a0f7320fde38221aba26f94a4c86b68336337902f4c5a128cf4 gkrellm-2.2.9.ebuild 2296
+MISC ChangeLog 16450 RMD160 2ac7f71cdf296a4777f6dc08c79956e3b25519c5 SHA1 fea2cfcdc0a131ed5c073b8420b43ac717cebee1 SHA256 20d2f65a9c82620b555033bd4c26b3955f1f01d39622e6ff2397fe3a22041cfc
+MD5 6087f4be7fdee83cae79a21808baa26f ChangeLog 16450
+RMD160 2ac7f71cdf296a4777f6dc08c79956e3b25519c5 ChangeLog 16450
+SHA256 20d2f65a9c82620b555033bd4c26b3955f1f01d39622e6ff2397fe3a22041cfc ChangeLog 16450
+MISC metadata.xml 223 RMD160 13df98db6609a9a7ddffa345a64e3f08222ce1f9 SHA1 041466a94004d9e3c5aeeb568c77748745bcc35b SHA256 dbb0b5bf8c3292e19f54df0cca95ed2297622fa5abf48c6e835ee8ac2fcfdf70
 MD5 de35d8f600d3d75d8075a8d848787013 metadata.xml 223
+RMD160 13df98db6609a9a7ddffa345a64e3f08222ce1f9 metadata.xml 223
+SHA256 dbb0b5bf8c3292e19f54df0cca95ed2297622fa5abf48c6e835ee8ac2fcfdf70 metadata.xml 223
+MD5 6e41c75396a6b0df361a04657fd45ac3 files/digest-gkrellm-1.2.13 67
+RMD160 fc6f91c449f4ad1837bbbb05aab48c25cb6ed361 files/digest-gkrellm-1.2.13 67
+SHA256 4dc619bfa60ac264b978440b61a4828b89e0e6d6af2ebbf74cc6c203d23989d4 files/digest-gkrellm-1.2.13 67
+MD5 1f1f72757719eee0c20cbd1c1bf1bc60 files/digest-gkrellm-2.1.25 67
+RMD160 8e7bcdf19dfcc57f8d4c1f30e12f76428a76ce9e files/digest-gkrellm-2.1.25 67
+SHA256 4648f712bfc1b523f53af118be54061a30816ee489082fbde26f477e4e240972 files/digest-gkrellm-2.1.25 67
+MD5 7b7db1942a721f41ecf37f40c996da9c files/digest-gkrellm-2.1.28-r1 67
+RMD160 c9e38d90ef403854c3f291526c563f4771bcaa41 files/digest-gkrellm-2.1.28-r1 67
+SHA256 95e6e52c09cf0ae6d614ab7e913ae4918994a85f1d6e9c370f32aebc0eed485d files/digest-gkrellm-2.1.28-r1 67
+MD5 306e201300b226a8ddd6ef90dd3ad087 files/digest-gkrellm-2.2.4 66
+RMD160 717089d09569bfc2b85e41fc701f80d0fca7ed94 files/digest-gkrellm-2.2.4 66
+SHA256 f3aad51bf1ebc778e09e5946ca74661365ddbe1698a1d0fd082160f3b2eb806e files/digest-gkrellm-2.2.4 66
+MD5 7aee38c8548f2dd99532a9fd5fbf7640 files/digest-gkrellm-2.2.5 66
+RMD160 88e8c6ea41242fcaf0caaee4bf1c7ea2acc699ea files/digest-gkrellm-2.2.5 66
+SHA256 c6e70a868b95fcd9c817e58130c9b41f95b34ac3f4a8dbdd75e52f7f00b11621 files/digest-gkrellm-2.2.5 66
+MD5 7b97a277c3b5730f36562120235fef3b files/digest-gkrellm-2.2.6 66
+RMD160 5b4bd3dd8f3657d6672e4334288882e9a6559c81 files/digest-gkrellm-2.2.6 66
+SHA256 35a35706265178011b62a1c9a5d6f3470c66d34baf5da690260072620707abb0 files/digest-gkrellm-2.2.6 66
+MD5 4226fe84fc32754c660e30473ecf9f09 files/digest-gkrellm-2.2.7 66
+RMD160 1e4ac74586d160e8c568db0c6f55ad152e5bd683 files/digest-gkrellm-2.2.7 66
+SHA256 a382d69f26d5b25f48ac364c46461a94b2d70e7ac09a182c128cd5c4d9fadcbd files/digest-gkrellm-2.2.7 66
+MD5 ce818367f079fe7a038297c801251667 files/digest-gkrellm-2.2.9 244
+RMD160 0dd16f13d550b601d9085fb84c004d94ee244ef6 files/digest-gkrellm-2.2.9 244
+SHA256 3d76715749813c484cdb2f7902ad804fcb1f7d9fe78df7ef936c46742fd0fddc files/digest-gkrellm-2.2.9 244
diff --git a/app-admin/gkrellm/files/digest-gkrellm-2.2.9 b/app-admin/gkrellm/files/digest-gkrellm-2.2.9
index 6dc0679fd3f5..04921d477d84 100644
--- a/app-admin/gkrellm/files/digest-gkrellm-2.2.9
+++ b/app-admin/gkrellm/files/digest-gkrellm-2.2.9
@@ -1 +1,3 @@
 MD5 5334155797901724f4eb46a82ad72395 gkrellm-2.2.9.tar.bz2 691133
+RMD160 e6de12774ec85c51dce18e3208340d1a080a6398 gkrellm-2.2.9.tar.bz2 691133
+SHA256 5f243958342fe0e27432c1d4b01900c5e593b49f00a8bdd29200433b17059de9 gkrellm-2.2.9.tar.bz2 691133
diff --git a/app-admin/gkrellm/files/gkrellm-mbmon-amd64.patch b/app-admin/gkrellm/files/gkrellm-mbmon-amd64.patch
new file mode 100644
index 000000000000..4e5560ca504c
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-mbmon-amd64.patch
@@ -0,0 +1,11 @@
+--- src/sysdeps/sensors-common.orig	2006-06-18 14:57:44.000000000 +0100
++++ src/sysdeps/sensors-common.c	2006-06-18 14:57:58.000000000 +0100
+@@ -195,7 +195,7 @@
+ gboolean
+ gkrellm_sys_sensors_mbmon_check(gboolean force)
+ 	{
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__x86_64__)
+ 	GList			*list;
+ 	MbmonSensor		*mb;
+ 	gboolean		result = TRUE;
diff --git a/app-admin/gkrellm/gkrellm-2.2.9.ebuild b/app-admin/gkrellm/gkrellm-2.2.9.ebuild
index 8d4221d77068..b1fbfda863b8 100644
--- a/app-admin/gkrellm/gkrellm-2.2.9.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.2.9.ebuild,v 1.1 2006/05/02 12:41:31 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.2.9.ebuild,v 1.2 2006/06/18 14:32:21 malc Exp $
 
 inherit eutils
 
@@ -31,6 +31,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${P}-gnutls.patch
+	epatch "${FILESDIR}"/gkrellm-mbmon-amd64.patch
 
 	sed -e 's:#user\tnobody:user\tgkrellmd:' \
 		-e 's:#group\tproc:group\tgkrellmd:' \