Version bump with new homepage, ebuild cleanup

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

diff --git a/x11-plugins/wmload/ChangeLog b/x11-plugins/wmload/ChangeLog
index 0358bc9a273b36097dbb54671c3e45f862a020b6..aef0e8a9ff4f71141822f727f6ce4c6240d02a93 100644 (file)
--- a/x11-plugins/wmload/ChangeLog
+++ b/x11-plugins/wmload/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/wmload
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmload/ChangeLog,v 1.14 2015/03/20 08:01:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmload/ChangeLog,v 1.15 2015/04/17 12:52:59 voyageur Exp $
+
+*wmload-0.9.6 (17 Apr 2015)
+
+  17 Apr 2015; Bernard Cafarelli <voyageur@gentoo.org> +wmload-0.9.6.ebuild,
+  +files/wmload-0.9.6-solaris.patch:
+  Version bump with new homepage, ebuild cleanup
 
   20 Mar 2015; Justin Lecher <jlec@gentoo.org> files/wmload.desktop:
   Fix desktop file

diff --git a/x11-plugins/wmload/Manifest b/x11-plugins/wmload/Manifest
index 1307964e4b4470d743709e0b763c5ef0fb1b7965..0e07e5fd8b23e8187705039a000cc3cab5783ed3 100644 (file)
--- a/x11-plugins/wmload/Manifest
+++ b/x11-plugins/wmload/Manifest
@@ -1,30 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX wmload-0.9.2-prefix.patch 222 SHA256 3b5db5473bbb38a8e91fbac19d94eb2d8be913cdbe58bfcc6c8679595fa3c31a SHA512 c92f3782728ccca5440cac7b750f5312c4e9c3942230974a6ea88e72388764f08add2a03bf382a8855a56e683f98531281e37423d39eafab2eef82aac49995aa WHIRLPOOL 29472968b75d9edab0dae7578c68cd4c6161b69693d51ab398bac566497126609e344db9d461550f7ba05eab7d919ff652cecdc304a8defcead8efdc624ca848
+AUX wmload-0.9.6-solaris.patch 3036 SHA256 87393c5e12c983c10a6b629dc06d59a8548d67b4129cbbd4b1f20afc94770e8c SHA512 8884d0f742cfa6536f436bc4656d1e6d44eb6f4de076a9f68c0d8bb6ab66bc93a8e972094593e367347a580f53d56697e2dbe98810257532e08f99111597f07c WHIRLPOOL 0552bb9c4a749245eb493b8b223028aadc85942c8bf0004faa5b4f652667b5d168a6ec111946362e8db79325968b60dc6d0967027716b459ff8428b53df3eedc
 AUX wmload-ComplexProgramTargetNoMan.patch 224 SHA256 96b7e8cec9ac03362cbb2f0fb11da35db034ef5b1421bc508a6379779cac06c9 SHA512 41753993f6cce969284c0093506d125d7b6b7508968a98a248e8c06cc0941fcd9daf2e1d31782aa58e21ce18a3ed8a03131fddee9f048c93c3b4d97560625cd5 WHIRLPOOL 7768a911036c7e5a63e5e10649419c581874a9ad51328d4cf55b6ccc6cd5a567426025147a4f9c1692caaec8494a47519380a2314d0951b0ad9cd3577bb0e129
 AUX wmload.desktop 155 SHA256 709f112e911ea854ee6dfe03a5fc1aa3104bfc5466f337fa7f9702c9db2a6be0 SHA512 260b0370bbd730ce89f7452e1c8d8ccdacee047aa025ea4e832405534e9a0418983e1724fa01ab143e7d978906708697ea338d1f831a8de5c3a790f0f238395b WHIRLPOOL 1bc2b6b36e82ada9a73a1bff9b6ce322e02d2e40c77c1918e2cacd1edf13d4a1a440151a773b43c9084de4178c7599cab74c4d94780fe6d895d1861cfa846703
 AUX wmload.solaris.patch 3494 SHA256 326a2939c2914ea2c544d0b730763d6babfe44109dcd305fb720ca9ef5b25fef SHA512 9b65b4578168f3bc3b0e3bccff94097fb301e6763fecae712b58b3d21a994ceb8fbc8f39d640959374e19e2cfa71e3eab38d4eaf18c421bdf28c7113db1212f0 WHIRLPOOL cdf1c58de85a6602593d8d8c89dafe916a159de8bbdbee1c900123cf54366f6ec00f6a3b70f15d72c1649f03e994b3a1ec1083955269357782b5f95cda4abad8
 DIST wmload-0.9.2.tgz 8499 SHA256 5c4c99ad683b58f22efecf3e780011ec6dc3211d8fca7ffb5b9fd0b661a56176 SHA512 fd3875d8da5bb309f0d49eb6ebe0903832d021a244b90ad70821e90aa85e835ef727d84957fb0cdb0290075ba1c0bb11cd4756a5a933cfebb35682f0b8e0dbca WHIRLPOOL e37d0cdff1cdbbcc1f548de9aa1575b86035840b8405bdadda37580c65039e9d4124cd6ae92ef806590807093e67265dc5b14bc09109140d73dacafdb076a585
+DIST wmload-0.9.6.tar.gz 17143 SHA256 1919566199b6e376e1c7acad119a9bbe765aedb2f2e5da2cb7b7f880af7e8f62 SHA512 989dfce6f6bbc32403702e06b47c873af45b6196ff20572290e88022ced1817cc0d29bae79f20fb289cf37ec2bd532e1b6e7c975a9b1e6e6059c9307a4d7e63d WHIRLPOOL d8c933be200d2abd778ecb23770895401401be396293642d3e4316aa81332ad21e6f11754e35cf9102379fb339f2d7cacad2647e82e063158ec2ce25720e71b4
 EBUILD wmload-0.9.2.ebuild 1304 SHA256 571352d56a48a9e463bcb16232b85d7a4683b3fef6f43b3805663a17ac92c041 SHA512 3e57a619063d4fcbf17559e49164e3989d1ce9c0145f19d994e605b7ca111e781b77e517296a80c40eea8aab3900ce140747df036d29ed98379f32c15345a46f WHIRLPOOL 78cc1f1ab9f1664bae4111ea233e4fcdfb4b82f20fae9f3b06e754e678bc53880c7549a25936674b57a8f01e01422a198027c6cc4c54f3313cf0e89d47ac88d1
-MISC ChangeLog 1905 SHA256 2a7e0895e6c8c5f975e93aa44b1ba347619aa7d09e8c60bbc4e116cb88dfa6c5 SHA512 6c5ebb9a86351fa95322b54343833c388ff3bcbefd8a52bee729c252cd55740a9275a9ccab3a213bd43d513e0e134fef064d8816cc68aac9c57c6396582cc06a WHIRLPOOL 5ba1330bf926463add253e76fe47b4d072b96828a313da4a9d6f86321c5c7ad7c965942da8b96d3bc68855fc58ebe0755e5c7c0014c3c4346816d906cad9fb8a
+EBUILD wmload-0.9.6.ebuild 1003 SHA256 4c31ae0c0651686fd78c633d9488c0e99f8321db9d7a3097f478007b62e16251 SHA512 c450408e95e17142bb9a054e433c3af1e47f11af22fc4ab52b59b338861a429574cafeefac2e4d2a3a609b6e7cc2661354c75ee45c7da228c152a222cd280a77 WHIRLPOOL ee53ddb72b4dea386e95e9555274be1302804044d8110cffff488a2fe827f093c032e69508d47490624581b961bba7965a59f6161cae86ee186875d24cc49e5f
+MISC ChangeLog 2102 SHA256 2ae2239e2a0abb5718919abe07673764712a4b403a66af73f5364f79fcfb1152 SHA512 8d135d1e75a5bf4591d6a7537a69538ef9634c9a13c996a0707cc31cec569948ad9be82afd7cd86933524462965970cb822a787970d181e1b5050ce52c4fa89f WHIRLPOOL 9ca372c8dfea3e1cab8a32db099b3a1e2290922c62b682d179f472df4377f2a87e0698c5952e20b679fc42e4822abc2b12e796f0e08a0f0902f553f50b08bcdc
 MISC metadata.xml 165 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b SHA512 dd0c867c49224060269f229cdd6cfe3c2b8a1f9ebb94d26605878d5b050d10cedb229a64ffd4c13e5c119bce3e236b14f5a9f6dac36a6ace50965f0887e5362a WHIRLPOOL 5f4139a044e2f8bc197f5d21ee51f21b8a5131b2eb145d88bda1dc3b04cf7d21ed89da77dc9b43496071d8098d5eee2b19da0fbc810ac15d379cec0420d99950
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQJ8BAEBCgBmBQJVC9PiXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirNWwP/0t6nCqJT61VFemk1N73IRAX
-lmNuvUnxw5T7Fzb8AdCwB02U+5qeqWQSJDIjw0Tf1KFeaLc1QQm5gp3mHpOzOQWJ
-c1Dz3VGx3o5rIjAMPf2xaSda1Mp6WRNnTDW4f94w9+3DuBZwMswgIvePs6j1RrfI
-TuHU+fQnBx0k94KUDOj6eeNvvQJsqXQXHKxNauJj3jv2PKj7RL65/KaFha/3RTh/
-INgiifM3d2lRQpSczcJjJmao/2tVerAnQ0hohPVs+Z0k74ppemzP/4RsxqlX8+Fe
-MAOuMemj1MTpr3fTqGydzyl0G7JqpKfzzeJxee0pj0AD0mEfYns2HC1pqYpaytPf
-ZYYwxm8ITB7BqiAag0DCFoJWYmwxFQiftTEYfablqBsQz2NgWODoCAuFSNRnuTfP
-svKvNBrV7n39B/B8uVmGluf7N5bp2E+q1UZ7Cb4hBUCgc/EECxRALCbJvX3IyIiN
-8XLsjBkdEj+avq9PyUvx2R0/IuPaf1ZO+OhGP8p1WS8atAIkK3AgAqXrVDv+aLmX
-dYR9kpzoWDpa+lyD55RBt/mMwmXCV96PysEbbKtw+tboKtIoNeZyjADEUmzg4VoY
-Ru9nTTa/sGrkN7+6nK6/cXPDd9eXsZWgknJXh+TIv1C++1MiegFZJO2KwKgewxME
-XHbMjAG1yVLlIwxph7S9
-=eSTq
+iQJ8BAEBCABmBQJVMQIsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREMzFDRDFGNEQwRTAyNjc2QzRDNjRFQzAw
+MEY3QUIzMzFCMEYwOTdGAAoJEAD3qzMbDwl/mhIP/3m+0nmS2EpU0/tr8L7GnYOW
+xNxKF8bpv/M35smbqSoVuO4/vuLlgB/Xgh7NM+5pBzI5SayKePfAVoH55OILfSk5
+nMXUy/lhxsbrdn6MaAPDEzeC1cuXoU9nucLJi5ryPr1cderoN0GKrWCWFj6BXN3G
+rJpl8DZNvYdKYX1xfRu/OcJs3660AmGlF6OEZIu9Bc81BPHFx/AzaAtlYGgXF228
+Td3m6UJ6AVlWtzOEby7zyo2OHJW6V59UaXZvPOUNN2ceHlRKwMz+9aIAZcg+Ptvn
+Zf9Eak4euCtrOn6PhuKJOO+uNs4Vat8G9uJoxBm9JYJ3e9eSN3MykHWBss6MRg4O
+Beqi5TFSdZKU+eUtxBBPtSvaEYJfAMXwrdZgaKerRGWx0iemhNXZi/ASECiNxcM9
+8P6O5wJ/2fnavdULsYCVlPk4VUwLxEcm2tH490O7ElP5DFbJnFgST61oAnwJoT4v
++mkmxQlWnlG0EIx6iEXqy8WaPpnJZc6tAHQYgk8OqJXbtk27nvmUfhERDt3lNkY8
+JnAsHn+2jY+i3GfK2cEnvbZuZH+1IlLZrk4MVw+IgHTlmzWz+302ZLVStXjTdyhp
+HP9+nuw2z1hZIjhX14uvbehRZ7CQbI7qtPcbJwXPYHxiep2fEvBD5wfTrJ3lAkLh
++PsIAT5mIa8L+d8rN9lZ
+=xKCa
 -----END PGP SIGNATURE-----

diff --git a/x11-plugins/wmload/files/wmload-0.9.6-solaris.patch b/x11-plugins/wmload/files/wmload-0.9.6-solaris.patch
new file mode 100644 (file)
index 0000000..210b284
--- /dev/null
+++ b/x11-plugins/wmload/files/wmload-0.9.6-solaris.patch
@@ -0,0 +1,132 @@
+* original: http://www.rampant.org/~dp/software/wmload.solaris.patch
+
+--- wmload.c
++++ wmload.c
+@@ -6,6 +6,11 @@
+ #include <math.h>
+ #include <fcntl.h>
+ #include <X11/Xatom.h>
++#ifdef sun
++#include <sys/types.h>
++#include <sys/sysinfo.h>
++#include <kstat.h>
++#endif
+ 
+ #include "back.xpm"
+ #include "mask2.xbm"
+@@ -410,6 +415,107 @@
+     return (char *)p;
+ }
+ 
++#ifdef sun
++
++static kstat_ctl_t *kc;
++static kstat_t **cpu_ksp_list;
++static int ncpus;
++
++void
++cpu_stats_init()
++{
++      int i = 0;
++      kstat_t *ksp;
++      static int kstats_ready = 0;
++
++      if (!kstats_ready) {
++              if ((kc = kstat_open()) == NULL) {
++                    fprintf(stderr,"wmload: can't open /dev/kstat\n");
++                    exit (1);
++              }
++              kstats_ready = 1;
++      }
++
++      for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
++                if (strcmp(ksp->ks_module, "cpu_stat") == 0)
++                      i++;
++      }
++
++      if (cpu_ksp_list) {
++              free(cpu_ksp_list);
++      }
++      cpu_ksp_list = (kstat_t **) calloc(i * sizeof (kstat_t *), 1); 
++      ncpus = i;
++
++      /*
++       * stash the ksp for each CPU.
++       */
++      i = 0;
++      for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next) {
++                if (strcmp(ksp->ks_module, "cpu_stat") == 0) {
++                      cpu_ksp_list[i] = ksp;
++                      i++;
++              }
++      }
++}
++
++int
++get_cpu_stats()
++{
++      int i;
++      cpu_stat_t stat;
++      static int firsttime = 1;
++
++      if (firsttime) {
++              firsttime = 0;
++              return (1);     /* force code to go initialize kstat stuff */
++      }
++
++      /*
++       * Read each cpu's data.  If the chain has changed (a state change
++       * has happened, maybe a new cpu was added to the system), then
++       * return 1.  This will cause the code to reinitialize the cpu_ksp_list
++       * array.  word.
++       */
++      cp_time[0] = cp_time[1] = cp_time[2] = cp_time[3] = 0;
++      for (i = 0; i < ncpus; i++) {
++              if (kstat_read(kc, cpu_ksp_list[i], (void *) &stat) == -1)
++                      return (1);
++              cp_time[0] += stat.cpu_sysinfo.cpu[CPU_USER]; /* user */
++              cp_time[1] += stat.cpu_sysinfo.cpu[CPU_WAIT]; /* "nice" */
++              cp_time[2] += stat.cpu_sysinfo.cpu[CPU_KERNEL]; /* sys */
++              cp_time[3] += stat.cpu_sysinfo.cpu[CPU_IDLE]; /* idle ("free")*/
++      }
++      return (0);
++}
++
++void GetLoad(int Maximum, int *usr, int *nice, int *sys, int *free)
++{
++  int total;
++
++  while (get_cpu_stats() != 0) {
++        cpu_stats_init();
++  }
++
++  *usr  = cp_time[0] - last[0];
++  *nice = cp_time[1] - last[1];
++  *sys  = cp_time[2] - last[2];
++  *free = cp_time[3] - last[3];
++
++  /* printf("[%d %d %d %d]\n", *usr, *nice, *sys, *free); */
++
++  total = *usr + *nice + *sys + *free;
++  last[0] = cp_time[0];
++  last[1] = cp_time[1];
++  last[2] = cp_time[2];
++  last[3] = cp_time[3];
++
++  *usr = rint(Maximum * (float)(*usr)   /total);
++  *nice =rint(Maximum * (float)(*nice)  /total);
++  *sys = rint(Maximum * (float)(*sys)   /total);
++  *free = rint(Maximum * (float)(*free) /total);
++}
++#else /* sun */
+ void GetLoad(int Maximum, int *usr, int *nice, int *sys, int *free)
+ { 
+   char buffer[100];/*[4096+1];*/
+@@ -445,6 +551,7 @@
+   *sys = rint(Maximum * (float)(*sys)   /total);
+   *free = rint(Maximum * (float)(*free) /total);
+ }
++#endif
+ 
+ void InsertLoad()
+ {

diff --git a/x11-plugins/wmload/wmload-0.9.6.ebuild b/x11-plugins/wmload/wmload-0.9.6.ebuild
new file mode 100644 (file)
index 0000000..562b98f
--- /dev/null
+++ b/x11-plugins/wmload/wmload-0.9.6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmload/wmload-0.9.6.ebuild,v 1.1 2015/04/17 12:52:59 voyageur Exp $
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="yet another dock application showing a system load gauge"
+HOMEPAGE="http://windowmaker.org/dockapps/?name=wmload"
+# Grab from http://windowmaker.org/dockapps/?download=${P}.tar.gz
+SRC_URI="http://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+       x11-libs/libXext
+       x11-libs/libXpm"
+DEPEND="${RDEPEND}
+       x11-proto/xproto"
+
+S=${WORKDIR}/dockapps
+
+src_prepare() {
+       epatch "${FILESDIR}"/${P}-solaris.patch
+}
+
+src_compile() {
+       emake CC="$(tc-getCC)"
+}
+
+src_install() {
+       emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+
+       dodoc README
+       domenu "${FILESDIR}"/${PN}.desktop
+}