Bump to EAPI=5; add missing dependency on x11-libs/pango, #382235; fix for format...

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

diff --git a/app-admin/gkrellm/ChangeLog b/app-admin/gkrellm/ChangeLog
index a8f852292846ad93c1d9d1425014989149fc340b..1b368e5888009e8c612394a052eb12c3e958e8fe 100644 (file)
--- a/app-admin/gkrellm/ChangeLog
+++ b/app-admin/gkrellm/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-admin/gkrellm
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.204 2013/12/23 00:43:05 tomwij Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.205 2015/03/24 20:01:43 jlec Exp $
+
+*gkrellm-2.3.5-r3 (24 Mar 2015)
+
+  24 Mar 2015; Justin Lecher <jlec@gentoo.org>
+  +files/gkrellm-2.3.5-binding.patch, +files/gkrellm-2.3.5-config.patch,
+  +files/gkrellm-2.3.5-format-security.patch,
+  +files/gkrellm-2.3.5-sansfont.patch, +files/gkrellm-2.3.5-width.patch,
+  +gkrellm-2.3.5-r3.ebuild, metadata.xml:
+  Bump to EAPI=5; add missing dependency on x11-libs/pango, #382235; fix for
+  format-security, #520556; import various patches from fedora
 
   23 Dec 2013; Tom Wijsman <TomWij@gentoo.org>
   -files/gkrellm-2.3.2-getline-fix.patch:

diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index b3ab49e10aeb6df3bcf253043b3d067fbb7b3319..b66aa3ec0c73b95b36761416ac7f52f96c13368d 100644 (file)
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -1,26 +1,40 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX gkrellm-2.3.5-autofs.patch 363 SHA256 9d655df4251bf58f2c160949e00d89c1b95be6b472c3c110e4a39a30e817fb1e SHA512 a7684223bd02c9bc0c77f33c618b1b58f639e83935b2e728234af5e364a1573d7a3d8448ace541eeaaaf3236384dd2f042cacb295eb8fdcb850cc2eac3bd614a WHIRLPOOL 1720705d6f174a77b4ffa18eae0bfc3102b4f24b4bc60f24e02fc15004874909704b784081a7eba526321599edea5cb141d1a5a9be4e0a6ec6e46a1d77641804
+AUX gkrellm-2.3.5-binding.patch 707 SHA256 f2602869d98c51910f22022b64b9ebf8f4c99caed3fbfafbc2ec47a977994463 SHA512 c5f52a9e5359244ef5a330f25320e4c2adad3d11d9b5ae443e73e78dba52c88a2b6ce89130547c63727c95f40464d88f42f175cc12a0d0ec97f67717ef611ff0 WHIRLPOOL 6d280db703568db10a6c7cad578d961fecf428c578821ed8d3965bea9137f6227bf86115c23f34d1fcba5a7a399f4378ece49e93a33744464ab841182e35642f
 AUX gkrellm-2.3.5-cifs.patch 496 SHA256 3b669243b900753f0b913cd8764b0f4389c684680ade75c60eaca2820b8caedc SHA512 feffaf5a561bbc47d42061ae3b2acc9d6cb6fc93d43448a2ac9ede89051c34bbec4b1ff0d77e1a2dd634fa78742a105ba66131a1cdb7a59ceb21abaa32f558d5 WHIRLPOOL 3436e2a9b2494059e68b008d426fd284ea0bf9c097149cc48bc92638a38ab6564c40204260b7e648b1e7d153f2ee396a060f2d1f21483d96d6bccb65c0e12372
+AUX gkrellm-2.3.5-config.patch 1530 SHA256 a329336946d581aff46559035d933697beaa132d312d6d9c9be6c325713f324b SHA512 c8259770dd088a119c349d2f19728f4874a24c407273edbf7129a531589e908ef37fbdf7bdbaaaf51ae6fa527d88601749a9e358746bff514082535b355d2ad0 WHIRLPOOL 2df9ef7d6c7f2e381940d1e8f81795a0f284168876a2a0c9e5a5b024650f7c6dc19714b0c48c11643645bc9bd2e8e4bba9ddb423022db180b428b8fbe6cb8501
 AUX gkrellm-2.3.5-dso.patch 1113 SHA256 b33527bc3c4c27167d8259892e82f08ab99b21790e2884b5e33b1dc110560e74 SHA512 b186140e7fefcf3aee38c51e55c2d7c8cc39e2fa65f724e237e92f686aa8106f03bb195409090b355bb5b3af08e6be6f2317a63c00a54e0f89ff7218ee3629bf WHIRLPOOL 50f3695f67515f94608c4a9333c5505be87ba5c00b632982a75344f19309ccf30f517ded93dd90dae9d25c774f2e525cf32f734390f447c370c188931d20d357
+AUX gkrellm-2.3.5-format-security.patch 503 SHA256 2b9cc038550d3ea4132f6d6cc489582f6019f132c9315d9254820f7cb8408297 SHA512 87ce3d0351ab3dcfb6e57b9c763ecb335ea75abc156d4f70a177f7c13958e343bbc60a4f59bdd52097b5f6cae1f5cfd21bfadff7f26f2366f76c7c75d4483af8 WHIRLPOOL 6ad4fdf0bd0083785783e2c0a276defe6a3afa37d8725b64a2d15e3291efae5ee66b369366c428573da40a84b6db47d9ddb50135d25150943ea32fdb40bbabc3
+AUX gkrellm-2.3.5-sansfont.patch 688 SHA256 17e714489a004661950d75d12a873ff628dec34e7bb6ac39fe674327226b12a1 SHA512 7f404c8f57091f00e66435b0cd311611b40fc6e3f3e953476a40e9a4521e91f7bbd3b19094d88a74b9d8cef20b00c1b5289197df5219455a84ab68e5271ce11f WHIRLPOOL 53a075790b24300d03dd90c9c5f96a3146ae00a3b1876e96c57b385a732fbb7144a2ea9a997037683916838b1b662cdd133d95f7ef1fb398266c900127f553c2
+AUX gkrellm-2.3.5-width.patch 350 SHA256 0a637aabdedb087b032256d9438ef000ef5c44a7be143d4a4a5584bd97fc8729 SHA512 4324fad0b59b482b8a2bea489373a280bc6a5a647f0863f9b1c5929454f7786b94f8293731c3de94ddbef0e8cfbe6018b721fc223dade3d23feb598e4569f3ed WHIRLPOOL 0a3179f93165cea69677d7133d8a9e3c86ea460ce5a17b8ecfbfcc0b0cb9ad2082b773573c8947f8afea194426d2743e8fd38e23e93882783e2049f14afce40e
 AUX gkrellmd 640 SHA256 68eafd11f1c1ff7080a2117facd62d8a3124993fc513c050387f6f32b02dd9f1 SHA512 12cbd14414580291a1d85d2e645ab20bce833acc59ce756d9da208c02e0561e441c2442867d50c44723944bf6d91d072d0ec2c1632cd1674b8c1a66d9178cb50 WHIRLPOOL 1453af832ee0937395302ef4bb058b136711a6823d8bdf88ead8e1eba981b5559a130b28db1e625b7629f46336432a5b0c4736dc00c269aa8d56b26a1351fd16
 AUX gkrellmd.conf 250 SHA256 66ba64c7a3ce2d97ba2feebf3c38e75b278bbbe152c71472e363d720b198b935 SHA512 257e13405bc5ce7b61b7a18e7456d1ae22d6fc2052e0e65e3b53c352a43aad2bedb4660dfd7cb95709b51f54b8949f6ff114de310be1ce49d70b074b3b8f8ef5 WHIRLPOOL 2662e208c7919cbe2e5a162ddcd3966149e59bf4c2172cb519349a983bac914fc2469ff0176043ecf5c43babf6a08ec2cdcb831dcc67ba503f231477cb183e06
 AUX gkrellmd.service 174 SHA256 0a296ef43139b46b4a1d1afb0eda68350ecbdca216bd1f9f74dff040de4a30c7 SHA512 254125456c6541a946a82d0b6727135b59b8371e012eca35c20b4242b0c405a01b2f822a7099105a8e4cab1342ada4abcbc86683584048bb4e2500924904e7d8 WHIRLPOOL bd038f1e752c677ddbd67733dad2eb80a38cc8d65f242e29c255ec95c269e356caafea6b43eb6a7f5225cc5a749fca84a5333b1112aed324cdb031d90f7dbd32
 DIST gkrellm-2.3.5.tar.bz2 765011 SHA256 702b5b0e9c040eb3af8e157453f38dd6f53e1dcd8b1272d20266cda3d4372c8b SHA512 9681ec5978b6be9f56a71726df36671829a4427f45caf90c8c3460e8c59004ff4083de1692cad16e3724ed37418bb3e4589d1961c140f3becfa3efd210b7a5dc WHIRLPOOL 3dceb20b9da49fb9b287e1faca88b3fdb7ae7af6dde5e675ee1e5c718467b131e34f740cb38719e5026ce0478146264fa4eaa060120e71f2c442ec5504e6dfb4
 EBUILD gkrellm-2.3.5-r1.ebuild 3156 SHA256 d200b9ecb2f3e5c6a374bacd7ca0e9c4f2d8db8b5dd4f2571bb0fb2becc041d8 SHA512 51f6f1560c487066a7fb4866bab5a274e7ff6554dd61bc26cb6ee699fcefbb80e66320cc6e4601ee215f2d828fe43e196a82e388a3da15ae849cc6f9fbd64938 WHIRLPOOL 196128179f5986d8dd296e1982e5c3dd36a428a57fc31edcbfc193898d44fdb15c24d57862c0f7fe5297c46b3d90a1dc298814d2c6a3edfd662bf367ded92c23
 EBUILD gkrellm-2.3.5-r2.ebuild 3349 SHA256 c1df05adb544d319ae2e79289da3d642810c94e913ee919259cf865e93fd5bcf SHA512 289545765fddc4426aca45bcdcf164d143d71cbf8051353c5c744511d8a24d8223bb2c060d22df71c70b049457c5ba2ce8c12937f6c65f1c78ec86ed76f39357 WHIRLPOOL 63e8cc8eacf3071ed486944f7f261f4478ce55eb60f926231c80620d6afeb2c8dcf902dbdd5ea08a12f0a2a365336672cd85645ec0381cb5d5e9a671e489a91c
+EBUILD gkrellm-2.3.5-r3.ebuild 3207 SHA256 35d8fb91af2e3d4ec37db9e1689e9afa8b96cad7c1ac59b68f01f4f0751b647f SHA512 7cc5022ee119b9d9be63d8791f8fb4bea31adb83b5de3f6f9d7b4936b91f093783d9b5571a90fc95e628ec52c03ea7a19a962765fcc3f137d944201c01692601 WHIRLPOOL 0873dc75916f7247a1d9b026581da825397ff6aa58c96bb2badc3695c3b3520912e67578e642dd62100dae86552bf4b56b13ad78ad123efb1b79df166e381432
 EBUILD gkrellm-2.3.5.ebuild 3206 SHA256 c8c7cf7593dc4f15370ef25e0095fc173ddb31a9fda5eeb8592a61c19a11909a SHA512 20057e64c6a6a2a41f4eec2661a7f1e0907d69719bf8a7baf79970c94365c259f22814c8710e5a2b07c7c045241ee54b3bed0bf9f0baa642ed1ef0c1898bf27d WHIRLPOOL 66a9b25b7820fb227e7d9518148e5d87a28b115668a77193b5534c6d72c2727e5c87ee13102623534b4dedc01fa6e32ca1eaff4f0e14c610f4e912eb66f4bb7b
-MISC ChangeLog 27888 SHA256 6d651f077362f597333d97f31b14ece3ecdc7ed76713be3e96b0b1e7d5962d3b SHA512 0dc1a2a033eb7894dfec7893401230d432d5e166f19a164bbc74e865817cef0eb4180f2c37c194db3888f8ee621dd2d459ec7dc699e584e10e8cf7b30568d5d2 WHIRLPOOL 98a67be4a9628226a53ce869bd4e9375f2306867623470247e41fda82e0b15c3589af224089bb3c1b8dd437b8d0c6a701e1e90da70b2f9da0c61f4e4ad8c2a0c
-MISC metadata.xml 852 SHA256 86d8b32a24999d7e57ffe90aec839992d4c10f3386a956a7d9ab563ca61014cc SHA512 ba63f7d60a1fd12fa52432b253fcc1c3e39acc9ff9fbdb45af99ee396f89281166f165270dda294bb59afa61e969361fba3516f3c9eb465f896034aa504cf9cf WHIRLPOOL 56c067ed38e947e314d4438391daf7d53964877b0f3d0939b5b761c7f3df013f701ed44ac8c83df599dde388d18b71e39e57d583901848d3a01fe12c8757de13
+MISC ChangeLog 28341 SHA256 5b4912abbe06badf002e0955bbf3353a55b853b732cff60b4d937e01fc792823 SHA512 278cc26e2bef6b75c2b51bc36b576dacd50657dd255665dc38266624cfa6cc286f23222d99155270cc285ca65eafa88e3d59ad67ee82aa48d3db74c75131eabb WHIRLPOOL e8a81ea6e377370915cc3892745b9b3f8942d4135dcc5adfc8107fcbcc3e5f8e39a64b3bb15a03ccdc00cbeaefef523f6e46b8064d3a4aa8aac4adb49eaa89b4
+MISC metadata.xml 867 SHA256 6371505a90b0dc373b167cc05e078f4c5b018d0d350b6b0c59e90a33a0ef4725 SHA512 e90a4ffe3eba5affd444512c8b12ce5f559c97ba8c9730bc384235b1845fc9f08db23ec3b967d4df8ce2ea2daedcf920d0b9c9967e20602803c5fb68f091edcd WHIRLPOOL cdfa4d7ebc3226d43009aa837ab4724772e9f9e3dd79c2bb1f4a90ce8d9ba2114f4b4a1986dd100af82f7e6d07e8533bed2065fa1942087bd85873f26673945b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJSt4cVAAoJEJWyH81tNOV9sW4H/3nfFUCvn2LqPj4LusRT/GpR
-SNh3DcSCW+60RrMQ166LHmRazPEqQdvB4cO781Qz2vGYoXplhAYiwYN5nPfP1uwW
-eW1E3sIgvhrJpdjeFj+ERORAcFX370R7ms2r2RmN4P7qCyxsCY/jCR5NCEatoF1y
-YftHzGlIkzayKb/wpPe6NOtyxsT2gC+PQ3r0zVJP1qOO2NE0FVB/WbXrsIxQX5b/
-7TN+68+9mC0LkfeKQUsSu2iWVGiEQWg0a7P2RdAVQZWsvynL2ogYW5HhL9az8+3w
-DWu1g+OKGH8j9xTxoPbhUR/5jn4eR7GeO1nBPrrnf9iN840e3cMTx0qy9GNDbWg=
-=rHaa
+iQJ8BAEBCgBmBQJVEcKsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir3K4P/j/j3HhLDLVTS+nqdhrYYVtk
+JuWat9kWK4rNMRKYvW3pRsMqksGN7h3GOWj28g2R2k0sIBOnFdTN4AaBNf7pMk6c
+xcLK3fM6jjLPJFy8l9y3OkjxtqwrkGQuaaj3HYvyrzeGGU23LrZ1zOu8D1KB14Oe
+WlQeu9XCs5ECMBKdNil1tObnUgjkXqybADdp6jj9EHbtev2Eb7YdKiczaZ/QQBew
+80/SBtnnqKNcMGZlKi21ClpZiqDaLUVwsg2FCf0u7jjCPYWwDLT3EAN5CZWRpbHd
+Nn1PFz1YqN2qCyjTMPqcX2lic98ykfUSep9eE1xO7ovDOWCYZQpr/RvFu5DLEJhH
+EQqQ5NVKcKFn8AW9BKFR/pM2vf+3MR+rh4DGYn+BxdLMjZIc+0to9mrIXeG4hbcJ
+6njAnjTWR1ZugJkyRw9yeFUyG1FiqhMF4/g8mXmPd7WHHwiM5Uyz9HRtBM7R/B8d
+OS6yCPoaaRvEjF7/dwGUJXk7LTFLBS83DD6k6n6WPtUlZSTj7jPj/yY++octtqDr
+aiPEc1GLFpeLSBKqQgExt3mrwOLMirNcowk5u1x77V4cR/kDc/n2zA0IKjMJ3FAD
+VN7iBhwKUru5tBsNAs8In/dY3J3lpI0mFBTaIBr5CnStiUVqwQCuD8cqFLm1V3o4
+mK2d5eqTIkO9rgMkF5RV
+=2GMx
 -----END PGP SIGNATURE-----

diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-binding.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-binding.patch
new file mode 100644 (file)
index 0000000..83bf0b0
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.5-binding.patch
@@ -0,0 +1,30 @@
+From a6983649c997dffd71d365792fa665cc135e696a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
+Date: Fri, 10 Jan 2014 09:34:59 +0200
+Subject: [PATCH] Allow binding to a listen address that doesn't exist yet
+
+---
+ server/main.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/server/main.c b/server/main.c
+index a5a9e4e..b2f460b 100644
+--- a/server/main.c
++++ b/server/main.c
+@@ -1003,6 +1003,13 @@ socksetup(int af)
+ #endif
+                               continue;
+                               }
++
++#ifdef IP_FREEBIND
++                      if (setsockopt(*s, SOL_IP, IP_FREEBIND, &on, sizeof(on)) < 0)
++                              {
++                              g_warning("gkrellmd: setsockopt (IP_FREEBIND) failed\n");
++                              }
++#endif
+                       }
+ 
+ #ifdef IPV6_V6ONLY
+-- 
+1.8.3.1
+

diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-config.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-config.patch
new file mode 100644 (file)
index 0000000..c623059
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.5-config.patch
@@ -0,0 +1,43 @@
+diff -up gkrellm-2.3.5/server/gkrellmd.conf.config gkrellm-2.3.5/server/gkrellmd.conf
+--- gkrellm-2.3.5/server/gkrellmd.conf.config  2010-09-14 17:26:19.000000000 +0300
++++ gkrellm-2.3.5/server/gkrellmd.conf 2011-06-19 19:17:56.398591498 +0300
+@@ -22,16 +22,17 @@
+ # List of hosts allowed to connect.  If no hosts are specified in a
+ # gkrellmd.conf file or on the command line, all hosts will be allowed.
+ #
+-#allow-host   localhost
+-#allow-host   127.0.0.1
++allow-host    localhost
++allow-host    127.0.0.1
++allow-host    ::ffff:127.0.0.1
+ #allow-host   ::1
+ #allow-host   192.168.0.*
+ 
+ # Drop privileges after startup (you must start gkrellmd as root to do it).
+ # NOTE: Option ignored on Windows
+ #
+-#user nobody
+-#group        proc
++user  gkrellmd
++group gkrellmd
+ 
+ # Create a PID file for the running gkrellmd.  Default is no PID file.
+ # NOTE: Option ignored on Windows
+@@ -76,7 +77,7 @@
+ # Minimum is 2 (less than 2 for no I/O disconnecting and is the default).
+ # Requires at least 2.1.8 versions of both gkrellmd and gkrellm.
+ #
+-#io-timeout 5
++io-timeout 5
+ 
+ # Configure gkrellm clients to attempt automatic reconnects to a
+ # gkrellmd server every reconnect-timeout seconds after a disconnected
+@@ -85,7 +86,7 @@
+ # Minimum is 2 (less than 2 for no automatic reconnecting and is the default).
+ # Requires at least 2.1.8 versions of both gkrellmd and gkrellm.
+ #
+-#reconnect-timeout 5
++reconnect-timeout 5
+ 
+ # Server side local mailbox counts can be sent to gkrellm clients.  List here
+ # paths to mbox, MH mail, or Maildir style mailboxes.

diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-format-security.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-format-security.patch
new file mode 100644 (file)
index 0000000..3e0265a
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.5-format-security.patch
@@ -0,0 +1,12 @@
+diff -up gkrellm-2.3.5/server/main.c~ gkrellm-2.3.5/server/main.c
+--- gkrellm-2.3.5/server/main.c~       2010-10-02 19:13:29.000000000 +0300
++++ gkrellm-2.3.5/server/main.c        2013-12-06 22:56:38.690534043 +0200
+@@ -187,7 +187,7 @@ static void gkrellmd_syslog_log(GLogLeve
+       if (log_level & G_LOG_LEVEL_CRITICAL)
+               facility_priority = LOG_MAKEPRI(LOG_DAEMON, LOG_CRIT);
+ 
+-      syslog(facility_priority, message);
++      syslog(facility_priority, "%s", message);
+ #endif // defined(WIN32)
+       } // gkrellmd_syslog_log()
+ 

diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-sansfont.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-sansfont.patch
new file mode 100644 (file)
index 0000000..460eb5e
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.5-sansfont.patch
@@ -0,0 +1,17 @@
+--- gkrellm-2.2.4/src/gui.c.font       2005-05-17 15:37:16.000000000 +0200
++++ gkrellm-2.2.4/src/gui.c    2005-05-17 15:37:46.000000000 +0200
+@@ -1575,11 +1575,11 @@
+       if (!_GK.theme_path || !g_file_test(_GK.theme_path, G_FILE_TEST_IS_DIR))
+               gkrellm_dup_string(&_GK.theme_path, "");
+       if (!large_font.string)
+-              gkrellm_dup_string(&large_font.string, "Serif 11");
++              gkrellm_dup_string(&large_font.string, "Sans 11");
+       if (!normal_font.string)
+-              gkrellm_dup_string(&normal_font.string, "Serif 9");
++              gkrellm_dup_string(&normal_font.string, "Sans 9");
+       if (!small_font.string)
+-              gkrellm_dup_string(&small_font.string, "Serif 8");
++              gkrellm_dup_string(&small_font.string, "Sans 8");
+       }
+ 
+ 

diff --git a/app-admin/gkrellm/files/gkrellm-2.3.5-width.patch b/app-admin/gkrellm/files/gkrellm-2.3.5-width.patch
new file mode 100644 (file)
index 0000000..c7fc220
--- /dev/null
+++ b/app-admin/gkrellm/files/gkrellm-2.3.5-width.patch
@@ -0,0 +1,11 @@
+--- gkrellm-2.2.7/src/gkrellm.h.width  2005-06-09 12:48:34.000000000 +0200
++++ gkrellm-2.2.7/src/gkrellm.h        2005-06-09 12:48:37.000000000 +0200
+@@ -518,7 +518,7 @@
+       GkrellmCallback;
+ 
+ 
+-#define CHART_WIDTH_MAX       1000
++#define CHART_WIDTH_MAX       1600
+ #define CHART_WIDTH_MIN       25
+ 
+   /* Each chart must have a GkrellmChartconfig struct associated with it.

diff --git a/app-admin/gkrellm/gkrellm-2.3.5-r3.ebuild b/app-admin/gkrellm/gkrellm-2.3.5-r3.ebuild
new file mode 100644 (file)
index 0000000..f1013a7
--- /dev/null
+++ b/app-admin/gkrellm/gkrellm-2.3.5-r3.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.5-r3.ebuild,v 1.1 2015/03/24 20:01:43 jlec Exp $
+
+EAPI=5
+
+inherit eutils multilib user systemd toolchain-funcs
+
+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-3"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="gnutls hddtemp lm_sensors nls ntlm ssl kernel_FreeBSD X"
+
+RDEPEND="
+       dev-libs/glib:2
+       x11-libs/pango
+       hddtemp? ( app-admin/hddtemp )
+       gnutls? ( net-libs/gnutls )
+       !gnutls? ( ssl? ( dev-libs/openssl:0= ) )
+       lm_sensors? ( sys-apps/lm_sensors )
+       nls? ( virtual/libintl )
+       ntlm? ( net-libs/libntlm )
+       X? ( x11-libs/gtk+:2 )"
+DEPEND="${RDEPEND}
+       virtual/pkgconfig
+       nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+       enewgroup gkrellmd
+       enewuser gkrellmd -1 -1 -1 gkrellmd
+       TARGET=
+       use kernel_FreeBSD && TARGET="freebsd"
+}
+
+src_prepare() {
+       sed -e 's:-O2 ::' \
+               -e 's:override CC:CFLAGS:' \
+               -e 's:-L/usr/X11R6/lib::' \
+               -i */Makefile || die "sed Makefile(s) failed"
+
+       sed -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" \
+               -e "s:/usr/local/lib:${EPREFIX}/usr/local/$(get_libdir):" \
+               -i src/${PN}.h || die "sed ${PN}.h failed"
+
+       epatch \
+               "${FILESDIR}"/${P}-autofs.patch \
+               "${FILESDIR}"/${P}-cifs.patch \
+               "${FILESDIR}"/${P}-dso.patch \
+               "${FILESDIR}"/${P}-format-security.patch \
+               "${FILESDIR}"/${P}-config.patch \
+               "${FILESDIR}"/${P}-width.patch \
+               "${FILESDIR}"/${P}-binding.patch \
+               "${FILESDIR}"/${P}-sansfont.patch
+}
+
+src_compile() {
+       if use X ; then
+               local sslopt=""
+               if use gnutls; then
+                       sslopt="without-ssl=yes"
+               elif use ssl; then
+                       sslopt="without-gnutls=yes"
+               else
+                       sslopt="without-ssl=yes without-gnutls=yes"
+               fi
+
+               emake \
+                       ${TARGET} \
+                       CC="$(tc-getCC)" \
+                       STRIP="" \
+                       INSTALLROOT="${EPREFIX}/usr" \
+                       INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
+                       LOCALEDIR="${EPREFIX}/usr/share/locale" \
+                       $(usex nls "" "enable_nls=0") \
+                       $(usex lm_sensors "" "without-libsensors=yes") \
+                       $(usex ntlm "" "without-ntlm=yes") \
+                       ${sslopt}
+       else
+               cd server || die
+               emake \
+                       ${TARGET} \
+                       CC="$(tc-getCC)" \
+                       LINK_FLAGS="$LDFLAGS -Wl,-E" \
+                       STRIP="" \
+                       $(usex nls "" "enable_nls=0") \
+                       $(usex lm_sensors "" "without-libsensors=yes")
+       fi
+}
+
+src_install() {
+       if use X ; then
+               emake \
+                       install${TARGET:+_}${TARGET} \
+                       $(usex nls "" "enable_nls=0") \
+                       STRIP="" \
+                       INSTALLDIR="${ED}/usr/bin" \
+                       INCLUDEDIR="${ED}/usr/include" \
+                       LOCALEDIR="${ED}/usr/share/locale" \
+                       PKGCONFIGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
+                       MANDIR="${ED}/usr/share/man/man1"
+
+               dohtml *.html
+
+               newicon src/icon.xpm ${PN}.xpm
+               make_desktop_entry ${PN} GKrellM ${PN}
+       else
+               dobin server/gkrellmd
+
+               insinto /usr/include/gkrellm2
+               doins server/gkrellmd.h
+               doins shared/log.h
+       fi
+
+       doinitd "${FILESDIR}"/gkrellmd
+       newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd
+
+       systemd_dounit "${FILESDIR}"/gkrellmd.service
+
+       insinto /etc
+       doins server/gkrellmd.conf
+
+       dodoc Changelog CREDITS README
+}

diff --git a/app-admin/gkrellm/metadata.xml b/app-admin/gkrellm/metadata.xml
index 71c95500f92ab5c3d0d74f97d29a068780178871..8a2f86d9436d56d78b3b311a80bdce551fc39c3e 100644 (file)
--- a/app-admin/gkrellm/metadata.xml
+++ b/app-admin/gkrellm/metadata.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-       <herd>desktop-dock</herd>
-       <use>
-               <flag name="hddtemp">Enable monitoring harddrive temperatures via
+  <herd>desktop-dock</herd>
+  <use>
+    <flag name="hddtemp">Enable monitoring harddrive temperatures via
                        <pkg>app-admin/hddtemp</pkg></flag>
-               <flag name="gnutls">Enable SSL support for mail checking with
+    <flag name="gnutls">Enable SSL support for mail checking with
                        <pkg>net-libs/gnutls</pkg> (overrides 'ssl' USE flag)</flag>
-               <flag name="ssl">Enable SSL support for mail checking with
+    <flag name="ssl">Enable SSL support for mail checking with
                        <pkg>dev-libs/openssl</pkg></flag>
-               <flag name="lm_sensors">Enable monitoring sensors via
+    <flag name="lm_sensors">Enable monitoring sensors via
                        <pkg>sys-apps/lm_sensors</pkg></flag>
-               <flag name="X">Build both the X11 gui (gkrellm) and the server
+    <flag name="X">Build both the X11 gui (gkrellm) and the server
                        (gkrellmd).  Disabling this flag builds the server only.</flag>
-               <flag name="ntlm">Enable NTLM authentication for mail checking with
+    <flag name="ntlm">Enable NTLM authentication for mail checking with
                        <pkg>net-libs/libntlm</pkg></flag>
-       </use>
+  </use>
 </pkgmetadata>