Stable on hppa, ppc and remove old versions, bug 140955.

(Portage version: 2.1.2_pre3-r5)
 (Unsigned Manifest commit)

16 files changed, 12 insertions, 661 deletions

diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index affafa38f5fd..5b62a16dbb23 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -1,7 +1,3 @@
-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-build.patch 2803 RMD160 8a13f1484577949f767e26b88667d7fd57903f34 SHA1 9ad0a7db14ffff6b42331a2316f09c6f3eddbcfa SHA256 77c3f36dbc705f89d5e96b737227c58212ba87fd6863e9fdd00d252111f0b5f3
 MD5 0741a3bebe8324730aaa6c37d07a4578 files/gkrellm-2.2.9-build.patch 2803
 RMD160 8a13f1484577949f767e26b88667d7fd57903f34 files/gkrellm-2.2.9-build.patch 2803
@@ -10,10 +6,6 @@ AUX gkrellm-2.2.9-gnutls.patch 415 RMD160 0804d5db018c259930c6abcbe4d78c99086872
 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
@@ -22,58 +14,25 @@ AUX gkrellmd 608 RMD160 37d0a5e6f7793e40b260ee80d64183009019d7a1 SHA1 4bf324634c
 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.5.tar.bz2 668581 RMD160 7755fa7bbf88dfd53185e76604981b2a5c81d74d SHA1 4cbdf75828b3d8b216694c2e6978c29a4920595a SHA256 03be5a470eb13f29e53ae18515f7291ef4f1c94b1f362a168cb8ed2bde754c55
 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
-RMD160 eddbfc154e0f17853730a2bb0b47751fefd98001 gkrellm-2.2.7.ebuild 1986
-SHA256 cf638157f6e9fa068821853e41fef16a89681bb4669b7f1ca06e1d32eb20f6e0 gkrellm-2.2.7.ebuild 1986
-EBUILD gkrellm-2.2.9-r1.ebuild 2295 RMD160 fabafaba6b8c41acebb0ed2d003c36793d996bb6 SHA1 6912f4349157ecdf2b02fe61815681d908a08678 SHA256 e8e32d33ad443975f8c293654d3a5263c797723afb2b8589d476fdcdb9044249
-MD5 230d36474d0710e741f1769f672a778a gkrellm-2.2.9-r1.ebuild 2295
-RMD160 fabafaba6b8c41acebb0ed2d003c36793d996bb6 gkrellm-2.2.9-r1.ebuild 2295
-SHA256 e8e32d33ad443975f8c293654d3a5263c797723afb2b8589d476fdcdb9044249 gkrellm-2.2.9-r1.ebuild 2295
-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 16786 RMD160 c22a38db3b3e1ca2d99189d8bb561813f36ce719 SHA1 3dd0ff58c8198e8f514846fa6151f4d265d32f2c SHA256 957cd67d580b0639eaf9e3cefac27ea57648aec9fec7b881c2ecdfa9cf9df335
-MD5 a20ba3aade106fd14886d50c7dc5f681 ChangeLog 16786
-RMD160 c22a38db3b3e1ca2d99189d8bb561813f36ce719 ChangeLog 16786
-SHA256 957cd67d580b0639eaf9e3cefac27ea57648aec9fec7b881c2ecdfa9cf9df335 ChangeLog 16786
+EBUILD gkrellm-2.2.9-r1.ebuild 2292 RMD160 42188ecac30df7d6f57d393cad549ebe1f99cd68 SHA1 a4d10bd2376e087b1e9a1dfd7b4957be685dd75a SHA256 019da6761102994413812b1e9b44b87b5b94b07273dc0a21b88a5f5fd5e6c5a7
+MD5 fd7698f1da9f4a9075e77bf249a2c896 gkrellm-2.2.9-r1.ebuild 2292
+RMD160 42188ecac30df7d6f57d393cad549ebe1f99cd68 gkrellm-2.2.9-r1.ebuild 2292
+SHA256 019da6761102994413812b1e9b44b87b5b94b07273dc0a21b88a5f5fd5e6c5a7 gkrellm-2.2.9-r1.ebuild 2292
+MISC ChangeLog 17169 RMD160 988a16d467a28bd1670eda22c16c1967983ab52d SHA1 78be0bd0a339caa1f1fd94494d61d88235238c50 SHA256 57ce49b6b11d4476ff26dd887221bf72927abf1291c1fe4c14de7a1ad0c1a4d3
+MD5 a2de13a48e591b0016b19bdf32ffb36b ChangeLog 17169
+RMD160 988a16d467a28bd1670eda22c16c1967983ab52d ChangeLog 17169
+SHA256 57ce49b6b11d4476ff26dd887221bf72927abf1291c1fe4c14de7a1ad0c1a4d3 ChangeLog 17169
 MISC metadata.xml 223 RMD160 13df98db6609a9a7ddffa345a64e3f08222ce1f9 SHA1 041466a94004d9e3c5aeeb568c77748745bcc35b SHA256 dbb0b5bf8c3292e19f54df0cca95ed2297622fa5abf48c6e835ee8ac2fcfdf70
 MD5 de35d8f600d3d75d8075a8d848787013 metadata.xml 223
 RMD160 13df98db6609a9a7ddffa345a64e3f08222ce1f9 metadata.xml 223
@@ -81,27 +40,9 @@ SHA256 dbb0b5bf8c3292e19f54df0cca95ed2297622fa5abf48c6e835ee8ac2fcfdf70 metadata
 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
+MD5 fda84afc6f1fb1474817a6f9c9826873 files/digest-gkrellm-2.2.5 244
+RMD160 70ea679e771014e6d6add5a91588edc1a6f0142e files/digest-gkrellm-2.2.5 244
+SHA256 e53a807c12857de04783a817f5344d96b3315d200770e066691b66336dcb13ca files/digest-gkrellm-2.2.5 244
 MD5 ce818367f079fe7a038297c801251667 files/digest-gkrellm-2.2.9-r1 244
 RMD160 0dd16f13d550b601d9085fb84c004d94ee244ef6 files/digest-gkrellm-2.2.9-r1 244
 SHA256 3d76715749813c484cdb2f7902ad804fcb1f7d9fe78df7ef936c46742fd0fddc files/digest-gkrellm-2.2.9-r1 244
diff --git a/app-admin/gkrellm/files/digest-gkrellm-2.1.25 b/app-admin/gkrellm/files/digest-gkrellm-2.1.25
deleted file mode 100644
index e75108ee1a30..000000000000
--- a/app-admin/gkrellm/files/digest-gkrellm-2.1.25
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1241d0a7c17650ded440f21463ce0403 gkrellm-2.1.25.tar.bz2 633685
diff --git a/app-admin/gkrellm/files/digest-gkrellm-2.1.28-r1 b/app-admin/gkrellm/files/digest-gkrellm-2.1.28-r1
deleted file mode 100644
index 1ad6f3f76e90..000000000000
--- a/app-admin/gkrellm/files/digest-gkrellm-2.1.28-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a3f0d0c8a7e8eda345ab9a0aa0038f8b gkrellm-2.1.28.tar.bz2 633487
diff --git a/app-admin/gkrellm/files/digest-gkrellm-2.2.4 b/app-admin/gkrellm/files/digest-gkrellm-2.2.4
deleted file mode 100644
index 39ec08d92e43..000000000000
--- a/app-admin/gkrellm/files/digest-gkrellm-2.2.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7f8662d7f5b6e59f499799b6655c4267 gkrellm-2.2.4.tar.bz2 647916
diff --git a/app-admin/gkrellm/files/digest-gkrellm-2.2.6 b/app-admin/gkrellm/files/digest-gkrellm-2.2.6
deleted file mode 100644
index a38808ce8278..000000000000
--- a/app-admin/gkrellm/files/digest-gkrellm-2.2.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eda0bd5e71e9e09d58043f47cfdab566 gkrellm-2.2.6.tar.bz2 672074
diff --git a/app-admin/gkrellm/files/digest-gkrellm-2.2.7 b/app-admin/gkrellm/files/digest-gkrellm-2.2.7
deleted file mode 100644
index b1c3df4847bf..000000000000
--- a/app-admin/gkrellm/files/digest-gkrellm-2.2.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6ff47bc8e66ba88f42932365a947f9f3 gkrellm-2.2.7.tar.bz2 673728
diff --git a/app-admin/gkrellm/files/digest-gkrellm-2.2.9 b/app-admin/gkrellm/files/digest-gkrellm-2.2.9
deleted file mode 100644
index 04921d477d84..000000000000
--- a/app-admin/gkrellm/files/digest-gkrellm-2.2.9
+++ /dev/null
@@ -1,3 +0,0 @@
-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-2.1.24-mail.patch b/app-admin/gkrellm/files/gkrellm-2.1.24-mail.patch
deleted file mode 100644
index 835c14128eb0..000000000000
--- a/app-admin/gkrellm/files/gkrellm-2.1.24-mail.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur src/mail.c.org src/mail.c
---- src/mail.c.org	2003-12-19 05:57:01.000000000 +0100
-+++ src/mail.c	2004-01-20 16:47:09.000000000 +0100
-@@ -1376,7 +1378,15 @@
- 		mbox->old_mail_count = 0;
- 		while(fgets(buf, sizeof(buf), f))
- 			{
--			if (is_multipart && !in_header)
-+		
-+			if (is_From_line(mbox, buf))
-+				{
-+				mbox->mail_count += 1;
-+				in_header = TRUE;
-+				marked_read = FALSE;
-+				is_multipart = FALSE;
-+				}
-+			else if (is_multipart && !in_header)
- 				{
- 				/* Skip to last line of multipart mail */
- 				if (strncmp(buf,mpart_sep,strlen(mpart_sep))==0)
-@@ -1387,12 +1397,6 @@
- 				in_header = FALSE;
- 				mbox->is_internal = FALSE;
- 				}
--			else if (is_From_line(mbox, buf))
--				{
--				mbox->mail_count += 1;
--				in_header = TRUE;
--				marked_read = FALSE;
--				}
- 			else if (in_header && status_is_old(buf) && !marked_read)
- 				{
- 				mbox->old_mail_count += 1;
diff --git a/app-admin/gkrellm/files/gkrellm-dotkeep.patch b/app-admin/gkrellm/files/gkrellm-dotkeep.patch
deleted file mode 100644
index c370d31e1498..000000000000
--- a/app-admin/gkrellm/files/gkrellm-dotkeep.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur src/plugins.c.org src/plugins.c
---- src/plugins.c.org	2003-12-14 02:22:50.000000000 +0100
-+++ src/plugins.c	2004-01-20 15:59:42.625278072 +0100
-@@ -1057,6 +1057,11 @@
- 		return;
- 	while ((name = (gchar *) g_dir_read_name(dir)) != NULL)
- 		{
-+
-+		if (strcmp(name, ".keep") == 0) {
-+			continue;
-+		}
-+
- 		/* If there's a libtool .la archive, won't want to load this .so
- 		*/
- 		if (   !string_suffix(name, "la")
diff --git a/app-admin/gkrellm/files/slit_gtk+-2.4.0.patch b/app-admin/gkrellm/files/slit_gtk+-2.4.0.patch
deleted file mode 100644
index ebf4ace01fb8..000000000000
--- a/app-admin/gkrellm/files/slit_gtk+-2.4.0.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur src/main.c.org src/main.c
---- src/main.c.org	2004-04-11 07:34:37.631188496 +0200
-+++ src/main.c	2004-04-11 07:34:24.247223168 +0200
-@@ -2214,8 +2214,8 @@
- 
- 	if (_GK.sticky_state)
- 		gtk_window_stick(GTK_WINDOW(top_window));
--	gkrellm_winop_options(argc, argv);
- 	gtk_widget_show(gtree.window);
-+	gkrellm_winop_options(argc, argv);
- 
- 	if (geometry || _GK.save_position)
- 		configure_position_lock = TRUE;		/* see cb_configure_notify */
diff --git a/app-admin/gkrellm/gkrellm-2.1.25.ebuild b/app-admin/gkrellm/gkrellm-2.1.25.ebuild
deleted file mode 100644
index e151bf090137..000000000000
--- a/app-admin/gkrellm/gkrellm-2.1.25.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.1.25.ebuild,v 1.12 2005/01/01 11:01:50 eradicator Exp $
-
-inherit eutils
-
-S=${WORKDIR}/${P/a/}
-DESCRIPTION="Single process stack of various system monitors"
-HOMEPAGE="http://www.gkrellm.net/"
-SRC_URI="http://web.wt.net/~billw/gkrellm/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="x86 ppc alpha sparc hppa amd64 ia64"
-IUSE="X nls ssl"
-
-DEPEND=">=sys-apps/sed-4
-	ssl? ( dev-libs/openssl )
-	X? (  >=x11-libs/gtk+-2.0.5 )"
-RDEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-dotkeep.patch
-}
-
-src_compile() {
-	local myconf
-	if ! use nls ; then
-		sed -i "s:enable_nls=1:enable_nls=0:" Makefile
-	fi
-
-	sed -i 's:INSTALLROOT ?= /usr/local:INSTALLROOT ?= ${D}/usr:' Makefile
-
-	if use X ; then
-		use ssl || myconf="without-ssl=yes"
-		PREFIX=/usr emake ${myconf} || die
-	else
-		cd ${S}/server
-		emake glib12=1 || die
-	fi
-}
-
-src_install() {
-	dodir /usr/{bin,include,share/man}
-
-	if use X
-	then
-		keepdir /usr/share/gkrellm2/themes
-		keepdir /usr/lib/gkrellm2/plugins
-
-		make DESTDIR=${D} install \
-			INSTALLDIR=${D}/usr/bin \
-			MANDIR=${D}/usr/share/man/man1 \
-			INCLUDEDIR=${D}/usr/include \
-			LOCALEDIR=${D}/usr/share/locale \
-			PKGCONFIGDIR=${D}/usr/lib/pkgconfig
-
-		cd ${S}
-		mv gkrellm.1 gkrellm2.1
-
-		mv src/gkrellm src/gkrellm2
-		dobin src/gkrellm2
-		rm -f ${D}/usr/bin/gkrellm
-	else
-		cd ${S}/server
-		dobin gkrellmd
-		cd ${S}
-		rm gkrellm.1
-	fi
-
-	rm -f ${D}/usr/share/man/man1/*
-	doman *.1
-
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/gkrellmd
-
-	insinto /etc
-	doins server/gkrellmd.conf
-
-	dodoc CREDITS INSTALL README Changelog
-	dohtml *.html
-}
diff --git a/app-admin/gkrellm/gkrellm-2.1.28-r1.ebuild b/app-admin/gkrellm/gkrellm-2.1.28-r1.ebuild
deleted file mode 100644
index 7d700db91680..000000000000
--- a/app-admin/gkrellm/gkrellm-2.1.28-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.1.28-r1.ebuild,v 1.11 2005/05/18 21:48:57 mholzer Exp $
-
-inherit eutils
-
-S=${WORKDIR}/${P/a/}
-DESCRIPTION="Single process stack of various system monitors"
-HOMEPAGE="http://www.gkrellm.net/"
-SRC_URI="http://web.wt.net/~billw/gkrellm/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="x86 ppc alpha sparc hppa amd64 ~ia64"
-IUSE="X nls ssl"
-
-DEPEND=">=sys-apps/sed-4
-	ssl? ( dev-libs/openssl )
-	X? (  >=x11-libs/gtk+-2.0.5 )
-	!X? ( =dev-libs/glib-1* )"
-RDEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-	local myconf
-	if ! use nls; then
-		sed -i "s:enable_nls=1:enable_nls=0:" Makefile
-	fi
-
-	sed -i 's:INSTALLROOT ?= /usr/local:INSTALLROOT ?= ${D}/usr:' Makefile
-
-	epatch ${FILESDIR}/slit_gtk+-2.4.0.patch
-
-	if use X
-	then
-	use ssl || myconf="without-ssl=yes"
-		PREFIX=/usr emake ${myconf} || die
-	else
-		cd ${S}/server
-		emake glib12=1 || die
-	fi
-}
-
-src_install() {
-	dodir /usr/{bin,include,share/man}
-
-	if use X
-	then
-		keepdir /usr/share/gkrellm2/themes
-		keepdir /usr/lib/gkrellm2/plugins
-
-		make DESTDIR=${D} install \
-			INSTALLDIR=${D}/usr/bin \
-			MANDIR=${D}/usr/share/man/man1 \
-			INCLUDEDIR=${D}/usr/include \
-			LOCALEDIR=${D}/usr/share/locale \
-			PKGCONFIGDIR=${D}/usr/lib/pkgconfig
-
-		cd ${S}
-		mv gkrellm.1 gkrellm2.1
-
-		mv src/gkrellm src/gkrellm2
-		dobin src/gkrellm2
-		rm -f ${D}/usr/bin/gkrellm
-	else
-		cd ${S}/server
-		dobin gkrellmd
-		cd ${S}
-		rm gkrellm.1
-	fi
-
-	rm -f ${D}/usr/share/man/man1/*
-	doman *.1
-
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/gkrellmd
-
-	insinto /etc
-	doins server/gkrellmd.conf
-
-	dodoc COPYRIGHT CREDITS INSTALL README Changelog
-	dohtml *.html
-}
diff --git a/app-admin/gkrellm/gkrellm-2.2.4.ebuild b/app-admin/gkrellm/gkrellm-2.2.4.ebuild
deleted file mode 100644
index 277628baae22..000000000000
--- a/app-admin/gkrellm/gkrellm-2.2.4.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.2.4.ebuild,v 1.12 2005/04/01 22:53:30 vapier Exp $
-
-inherit eutils
-
-DESCRIPTION="Single process stack of various system monitors"
-HOMEPAGE="http://www.gkrellm.net/"
-SRC_URI="http://web.wt.net/~billw/gkrellm/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="X nls ssl"
-
-DEPEND="=dev-libs/glib-1*
-	ssl? ( dev-libs/openssl )
-	X? ( >=x11-libs/gtk+-2.0.5
-		>=x11-libs/pango-1.4.0 )"
-RDEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${P/a/}
-
-src_compile() {
-	local myconf
-	if ! use nls; then
-		sed -i "s:enable_nls=1:enable_nls=0:" Makefile
-	fi
-
-	sed -i 's:INSTALLROOT ?= /usr/local:INSTALLROOT ?= ${D}/usr:' Makefile
-
-	if use X
-	then
-	use ssl || myconf="without-ssl=yes"
-		PREFIX=/usr emake ${myconf} || die
-	else
-		cd ${S}/server
-		emake glib12=1 || die
-	fi
-}
-
-src_install() {
-	dodir /usr/{bin,include,share/man}
-
-	if use X
-	then
-		keepdir /usr/share/gkrellm2/themes
-		keepdir /usr/lib/gkrellm2/plugins
-
-		make DESTDIR=${D} install \
-			INSTALLDIR=${D}/usr/bin \
-			MANDIR=${D}/usr/share/man/man1 \
-			INCLUDEDIR=${D}/usr/include \
-			LOCALEDIR=${D}/usr/share/locale \
-			PKGCONFIGDIR=${D}/usr/lib/pkgconfig
-
-		cd ${S}
-		mv gkrellm.1 gkrellm2.1
-
-		mv src/gkrellm src/gkrellm2
-		dobin src/gkrellm2
-		rm -f ${D}/usr/bin/gkrellm
-	else
-		cd ${S}/server
-		dobin gkrellmd
-		cd ${S}
-		rm gkrellm.1
-	fi
-
-	rm -f ${D}/usr/share/man/man1/*
-	doman *.1
-
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/gkrellmd
-
-	insinto /etc
-	doins server/gkrellmd.conf
-
-	dodoc COPYRIGHT CREDITS INSTALL README Changelog
-	dohtml *.html
-}
diff --git a/app-admin/gkrellm/gkrellm-2.2.6.ebuild b/app-admin/gkrellm/gkrellm-2.2.6.ebuild
deleted file mode 100644
index 86f04abb4bc8..000000000000
--- a/app-admin/gkrellm/gkrellm-2.2.6.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.2.6.ebuild,v 1.1 2005/05/18 21:45:46 mholzer Exp $
-
-inherit eutils
-
-DESCRIPTION="Single process stack of various system monitors"
-HOMEPAGE="http://www.gkrellm.net/"
-SRC_URI="http://members.dslextreme.com/users/billw/gkrellm/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="X nls ssl"
-
-DEPEND="=dev-libs/glib-1*
-	ssl? ( dev-libs/openssl )
-	X? ( >=x11-libs/gtk+-2.0.5
-		>=x11-libs/pango-1.4.0 )"
-RDEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${P/a/}
-
-src_compile() {
-	local myconf
-	if ! use nls; then
-		sed -i "s:enable_nls=1:enable_nls=0:" Makefile || die
-	fi
-
-	sed -i -e 's:INSTALLROOT ?= /usr/local:INSTALLROOT ?= ${D}/usr:' \
-		-e "s:\(PKGCONFIGDIR ?= \$(INSTALLROOT)/\)lib:\1$(get_libdir):" \
-		Makefile || die
-
-	sed -i -e "s:/usr/lib:/usr/$(get_libdir):" \
-		-e "s:/usr/local/lib:/usr/local/$(get_libdir):" \
-		src/gkrellm.h || die
-
-	if use X
-	then
-	use ssl || myconf="without-ssl=yes"
-		PREFIX=/usr emake ${myconf} || die
-	else
-		cd ${S}/server
-		emake glib12=1 || die
-	fi
-}
-
-src_install() {
-	dodir /usr/{bin,include,share/man}
-
-	if use X
-	then
-		keepdir /usr/share/gkrellm2/themes
-		keepdir /usr/$(get_libdir)/gkrellm2/plugins
-
-		make DESTDIR=${D} install \
-			INSTALLDIR=${D}/usr/bin \
-			MANDIR=${D}/usr/share/man/man1 \
-			INCLUDEDIR=${D}/usr/include \
-			LOCALEDIR=${D}/usr/share/locale \
-			PKGCONFIGDIR=${D}/usr/$(get_libdir)/pkgconfig
-
-		cd ${S}
-		mv gkrellm.1 gkrellm2.1
-
-		mv src/gkrellm src/gkrellm2
-		dobin src/gkrellm2
-		rm -f ${D}/usr/bin/gkrellm
-	else
-		cd ${S}/server
-		dobin gkrellmd
-		cd ${S}
-		rm gkrellm.1
-	fi
-
-	rm -f ${D}/usr/share/man/man1/*
-	doman *.1
-
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/gkrellmd
-
-	insinto /etc
-	doins server/gkrellmd.conf
-
-	dodoc CREDITS INSTALL README Changelog
-	dohtml *.html
-}
diff --git a/app-admin/gkrellm/gkrellm-2.2.7.ebuild b/app-admin/gkrellm/gkrellm-2.2.7.ebuild
deleted file mode 100644
index bfe1070543f6..000000000000
--- a/app-admin/gkrellm/gkrellm-2.2.7.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.2.7.ebuild,v 1.1 2005/07/17 23:12:30 mholzer Exp $
-
-inherit eutils
-
-DESCRIPTION="Single process stack of various system monitors"
-HOMEPAGE="http://www.gkrellm.net/"
-SRC_URI="http://members.dslextreme.com/users/billw/gkrellm/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="X nls ssl"
-
-DEPEND="=dev-libs/glib-1*
-	ssl? ( dev-libs/openssl )
-	X? ( >=x11-libs/gtk+-2.0.5
-		>=x11-libs/pango-1.4.0 )"
-RDEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${P/a/}
-
-src_compile() {
-	local myconf
-	if ! use nls; then
-		sed -i "s:enable_nls=1:enable_nls=0:" Makefile || die
-	fi
-
-	sed -i -e 's:INSTALLROOT ?= /usr/local:INSTALLROOT ?= ${D}/usr:' \
-		-e "s:\(PKGCONFIGDIR ?= \$(INSTALLROOT)/\)lib:\1$(get_libdir):" \
-		Makefile || die
-
-	sed -i -e "s:/usr/lib:/usr/$(get_libdir):" \
-		-e "s:/usr/local/lib:/usr/local/$(get_libdir):" \
-		src/gkrellm.h || die
-
-	if use X
-	then
-	use ssl || myconf="without-ssl=yes"
-		PREFIX=/usr emake ${myconf} || die
-	else
-		cd ${S}/server
-		emake glib12=1 || die
-	fi
-}
-
-src_install() {
-	dodir /usr/{bin,include,share/man}
-
-	if use X
-	then
-		keepdir /usr/share/gkrellm2/themes
-		keepdir /usr/$(get_libdir)/gkrellm2/plugins
-
-		make DESTDIR=${D} install \
-			INSTALLDIR=${D}/usr/bin \
-			MANDIR=${D}/usr/share/man/man1 \
-			INCLUDEDIR=${D}/usr/include \
-			LOCALEDIR=${D}/usr/share/locale \
-			PKGCONFIGDIR=${D}/usr/$(get_libdir)/pkgconfig
-
-		cd ${S}
-		mv gkrellm.1 gkrellm2.1
-
-		mv src/gkrellm src/gkrellm2
-		dobin src/gkrellm2
-		rm -f ${D}/usr/bin/gkrellm
-	else
-		cd ${S}/server
-		dobin gkrellmd
-		cd ${S}
-		rm gkrellm.1
-	fi
-
-	rm -f ${D}/usr/share/man/man1/*
-	doman *.1
-
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/gkrellmd
-
-	insinto /etc
-	doins server/gkrellmd.conf
-
-	dodoc CREDITS INSTALL README Changelog
-	dohtml *.html
-}
diff --git a/app-admin/gkrellm/gkrellm-2.2.9.ebuild b/app-admin/gkrellm/gkrellm-2.2.9.ebuild
deleted file mode 100644
index b1fbfda863b8..000000000000
--- a/app-admin/gkrellm/gkrellm-2.2.9.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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.2 2006/06/18 14:32:21 malc Exp $
-
-inherit eutils
-
-DESCRIPTION="Single process stack of various system monitors"
-HOMEPAGE="http://www.gkrellm.net/"
-SRC_URI="http://members.dslextreme.com/users/billw/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gnutls nls ssl X"
-
-RDEPEND="dev-libs/glib
-	gnutls? ( net-libs/gnutls )
-	nls? ( virtual/libintl )
-	ssl? ( dev-libs/openssl )
-	X? ( >=x11-libs/gtk+-2 )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	enewgroup gkrellmd
-	enewuser gkrellmd -1 -1 -1 gkrellmd
-}
-
-src_unpack() {
-	unpack ${A}
-	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:' \
-		-i server/gkrellmd.conf || die "sed gkrellmd.conf failed"
-
-	sed -e "s:/usr/lib:/usr/$(get_libdir):" \
-		-e "s:/usr/local/lib:/usr/local/$(get_libdir):" \
-		-i src/${PN}.h || die "sed ${PN}.h failed"
-}
-
-src_compile() {
-	if use X ; then
-		emake \
-			INSTALLROOT=/usr \
-			INCLUDEDIR=/usr/include/gkrellm2 \
-			LINK_FLAGS="${LDFLAGS}" \
-			$(use nls || echo enable_nls=0) \
-			$(use gnutls || echo without_gnutls=yes) \
-			$(use ssl || echo without_ssl=yes) \
-			|| die "emake failed"
-	else
-		cd server
-		emake LINK_FLAGS="${LDFLAGS}" \
-			|| die "emake failed"
-	fi
-}
-
-src_install() {
-	if use X ; then
-		make install \
-			$(use nls || echo enable_nls=0) \
-			INSTALLDIR="${D}"/usr/bin \
-			MANDIR="${T}" \
-			INCLUDEDIR="${D}"/usr/include \
-			LOCALEDIR="${D}"/usr/share/locale \
-			PKGCONFIGDIR="${D}"/usr/$(get_libdir)/pkgconfig \
-			|| die "make install failed"
-
-		mv "${D}"/usr/bin/{${PN},gkrellm2}
-
-		dohtml *.html
-		newman ${PN}.1 gkrellm2.1
-
-		newicon src/icon.xpm ${PN}.xpm
-		make_desktop_entry gkrellm2 GKrellM ${PN}.xpm
-	else
-		dobin server/gkrellmd || die "dobin failed"
-
-		insinto /usr/include/gkrellm2
-		doins server/gkrellmd.h
-	fi
-
-	doinitd "${FILESDIR}"/gkrellmd \
-		|| die "doinitd failed"
-
-	insinto /etc
-	doins server/gkrellmd.conf
-
-	doman gkrellmd.1
-	dodoc Changelog CREDITS README
-}