[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmmon/

2024-04-14 Thread Arthur Zamarin
commit: be29851d206bab1a22f88375ea1f7df962ddbc4d
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Apr 14 13:46:54 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Apr 14 13:46:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be29851d

x11-plugins/wmmon: drop 1.4, EAPI6--

Closes: https://bugs.gentoo.org/929954
Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-plugins/wmmon/wmmon-1.4.ebuild | 19 ---
 1 file changed, 19 deletions(-)

diff --git a/x11-plugins/wmmon/wmmon-1.4.ebuild 
b/x11-plugins/wmmon/wmmon-1.4.ebuild
deleted file mode 100644
index b52135abe045..
--- a/x11-plugins/wmmon/wmmon-1.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Dockable system resources monitor applet for WindowMaker"
-HOMEPAGE="https://www.dockapps.net/wmmon;
-SRC_URI="https://www.dockapps.net/download/${P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/libdockapp-0.7:=
-   x11-libs/libX11
-   x11-libs/libXpm"
-DEPEND="${RDEPEND}
-   x11-base/xorg-proto"



[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmmon/

2024-04-13 Thread Arthur Zamarin
commit: 722abb4caab78c9ecbb2df6073d4be989daae046
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr 13 20:55:02 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr 13 20:55:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=722abb4c

x11-plugins/wmmon: Stabilize 1.4-r1 x86, #929954

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-plugins/wmmon/wmmon-1.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-plugins/wmmon/wmmon-1.4-r1.ebuild 
b/x11-plugins/wmmon/wmmon-1.4-r1.ebuild
index 21b0f9ab154e..9eab5de33cc9 100644
--- a/x11-plugins/wmmon/wmmon-1.4-r1.ebuild
+++ b/x11-plugins/wmmon/wmmon-1.4-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz;
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 
 RDEPEND=">=x11-libs/libdockapp-0.7:=
x11-libs/libX11



[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmmon/

2024-04-13 Thread Arthur Zamarin
commit: bf9baa732a3d276151b5297950030e0c629f4471
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr 13 20:55:01 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr 13 20:55:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf9baa73

x11-plugins/wmmon: Stabilize 1.4-r1 amd64, #929954

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-plugins/wmmon/wmmon-1.4-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-plugins/wmmon/wmmon-1.4-r1.ebuild 
b/x11-plugins/wmmon/wmmon-1.4-r1.ebuild
index 261751778159..21b0f9ab154e 100644
--- a/x11-plugins/wmmon/wmmon-1.4-r1.ebuild
+++ b/x11-plugins/wmmon/wmmon-1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz;
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
 
 RDEPEND=">=x11-libs/libdockapp-0.7:=
x11-libs/libX11



[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmmon/

2023-09-19 Thread Bernard Cafarelli
commit: 422e9b520c97996825af42b5539e75796b2b16dd
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Mon Sep 18 16:56:31 2023 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Tue Sep 19 20:37:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=422e9b52

x11-plugins/wmmon: EAPI8 bump

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Bernard Cafarelli  gentoo.org>

 x11-plugins/wmmon/wmmon-1.4-r1.ebuild | 18 ++
 1 file changed, 18 insertions(+)

diff --git a/x11-plugins/wmmon/wmmon-1.4-r1.ebuild 
b/x11-plugins/wmmon/wmmon-1.4-r1.ebuild
new file mode 100644
index ..261751778159
--- /dev/null
+++ b/x11-plugins/wmmon/wmmon-1.4-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Dockable system resources monitor applet for WindowMaker"
+HOMEPAGE="https://www.dockapps.net/wmmon;
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND=">=x11-libs/libdockapp-0.7:=
+   x11-libs/libX11
+   x11-libs/libXpm"
+DEPEND="${RDEPEND}
+   x11-base/xorg-proto"



[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmmon+smp/files/, x11-plugins/wmmon+smp/

2020-03-08 Thread Bernard Cafarelli
commit: 9869d748199f7fad1746a27248990e10436df568
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Sun Mar  8 11:22:00 2020 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Sun Mar  8 11:27:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9869d748

x11-plugins/wmmon+smp: fix build with -fno-common

Closes: https://bugs.gentoo.org/707216
Package-Manager: Portage-2.3.92, Repoman-2.3.20
Signed-off-by: Bernard Cafarelli  gentoo.org>

 .../wmmon+smp/files/wmmon+smp-1.0-fno-common.patch | 24 ++
 x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild  |  4 +++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/x11-plugins/wmmon+smp/files/wmmon+smp-1.0-fno-common.patch 
b/x11-plugins/wmmon+smp/files/wmmon+smp-1.0-fno-common.patch
new file mode 100644
index 000..6ec3ba03520
--- /dev/null
+++ b/x11-plugins/wmmon+smp/files/wmmon+smp-1.0-fno-common.patch
@@ -0,0 +1,24 @@
+diff -Naur wmmon.app.orig/wmgeneral/wmgeneral.h wmmon.app/wmgeneral/wmgeneral.h
+--- wmmon.app.orig/wmgeneral/wmgeneral.h   1999-06-07 03:09:36.0 
+0200
 wmmon.app/wmgeneral/wmgeneral.h2020-03-08 12:20:10.345121264 +0100
+@@ -36,7 +36,7 @@
+  /* Global variable */
+ /***/
+ 
+-Display   *display;
++extern Display*display;
+ 
+   /***/
+  /* Function Prototypes */
+diff -Naur wmmon.app.orig/wmmon/wmmon.c wmmon.app/wmmon/wmmon.c
+--- wmmon.app.orig/wmmon/wmmon.c   1999-06-07 05:49:45.0 +0200
 wmmon.app/wmmon/wmmon.c2020-03-08 12:20:18.657124944 +0100
+@@ -19,6 +19,8 @@
+ int   wmmon_mask_width = 64;
+ int   wmmon_mask_height = 64;
+ 
++Display   *display;
++
+ void usage(void);
+ void drawstat(int *, int, int, int, int);
+ void wmmon_routine(int, char **);

diff --git a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild 
b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild
index b1e2679d8c7..e16511eaf5b 100644
--- a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild
+++ b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild
@@ -22,7 +22,9 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/wmmon.app/wmmon"
 
-PATCHES=( "${FILESDIR}"/${P}-list.patch )
+PATCHES=( "${FILESDIR}"/${P}-list.patch
+   "${FILESDIR}"/${P}-fno-common.patch
+   )
 
 src_prepare() {
tc-export CC



[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmmon+smp/

2019-08-17 Thread David Seifert
commit: 19be8a9d3fa993de2bd24f57934691a054ce644e
Author: David Seifert  gentoo  org>
AuthorDate: Sat Aug 17 17:25:54 2019 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Aug 17 17:25:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19be8a9d

x11-plugins/wmmon+smp: [QA] Version the distfile

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: David Seifert  gentoo.org>

 x11-plugins/wmmon+smp/Manifest| 2 +-
 x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/x11-plugins/wmmon+smp/Manifest b/x11-plugins/wmmon+smp/Manifest
index fd5b8aef3eb..ef5b773998e 100644
--- a/x11-plugins/wmmon+smp/Manifest
+++ b/x11-plugins/wmmon+smp/Manifest
@@ -1 +1 @@
-DIST wmmon+smp.tar.gz 15807 BLAKE2B 
e58ad4a1a6f9deb33e031f20674cd6ad4d0a558e84906a470a2b2802df1736dfac4f6a9ae0bfc5f36192684f59374d5cd1d5186ef505f9b4da26082d31f9c728
 SHA512 
9565815c30642a3d12a23960bf6123eafa9379d24a69b2a75794757e89a3b056669fc47a898a5e756871a74502dcab8b76abe5508f2c5474a1fbfc8bdd4e6a94
+DIST wmmon+smp-1.0.tar.gz 15807 BLAKE2B 
e58ad4a1a6f9deb33e031f20674cd6ad4d0a558e84906a470a2b2802df1736dfac4f6a9ae0bfc5f36192684f59374d5cd1d5186ef505f9b4da26082d31f9c728
 SHA512 
9565815c30642a3d12a23960bf6123eafa9379d24a69b2a75794757e89a3b056669fc47a898a5e756871a74502dcab8b76abe5508f2c5474a1fbfc8bdd4e6a94

diff --git a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild 
b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild
index 45c4bc62777..8c90cc0ff0c 100644
--- a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild
+++ b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,10 +7,10 @@ inherit toolchain-funcs
 
 DESCRIPTION="Dockapp CPU monitor resembling Xosview, support for smp"
 HOMEPAGE="http://www.ne.jp/asahi/linux/timecop/;
-SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/wmmon+smp.tar.gz;
+SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/wmmon+smp.tar.gz -> 
${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="amd64 ppc64 x86"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmmon/, x11-plugins/wmmon/files/

2019-03-15 Thread Bernard Cafarelli
commit: a19ed32501367ec6b98476d873bf0f2683060ea5
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Fri Mar 15 13:43:22 2019 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Fri Mar 15 13:43:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a19ed325

x11-plugins/wmmon: drop old

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Bernard Cafarelli  gentoo.org>

 x11-plugins/wmmon/Manifest |   2 -
 .../wmmon/files/wmmon-1.2_beta1-Makefile.patch |  20 
 x11-plugins/wmmon/files/wmmon-1.2_beta1-list.patch | 127 -
 x11-plugins/wmmon/wmmon-1.2_beta1.ebuild   |  37 --
 x11-plugins/wmmon/wmmon-1.3.ebuild |  19 ---
 5 files changed, 205 deletions(-)

diff --git a/x11-plugins/wmmon/Manifest b/x11-plugins/wmmon/Manifest
index cb7b119b557..b4be83dc420 100644
--- a/x11-plugins/wmmon/Manifest
+++ b/x11-plugins/wmmon/Manifest
@@ -1,3 +1 @@
-DIST wmmon-1.2b1.tar.bz2 25610 BLAKE2B 
fcaf37c869e5cfc9c105c1924f66a03a726239ef5a6c473a312a8d8e4bd34203fa71d6ded607894b0feae1f4a352c365828dba284c629c81dea0973b05ad98b8
 SHA512 
359ff4024cdc606d3520445d31b9e59c79a957b081bf46dfabde7c970aecab8d640f789f34c1599e18e15e50a077248e06600151d7c1e66ef028215d6d88ff1f
-DIST wmmon-1.3.tar.gz 107622 BLAKE2B 
41eabaf506882f9e230ffd5bcb2c28325b49a1594423f9e950941b5f3a343ceee19bd22c91a29d62a4eaeee920fba19caf1fcb7656db646cb464a9ec6d1a1890
 SHA512 
2308bf5ef9aa9f93979e63ea7d405e304a1a7ea55b966affc200239829f3cd2b7039fe96e42fcf59b525a72b3f8f64d8397853c3847356733644045e5529
 DIST wmmon-1.4.tar.gz 107477 BLAKE2B 
973dedb994c0e688dbdcefde12d186e1d3712164adeb454e97367c6592e223dd61f01ddc7c5258bc387619ed185f049439b8692a18a1bd28bccafda986359e36
 SHA512 
ca5a0d8278d6fda4ae1be2e76e17ad7e550e91398dba1c5aa09b501c4e17b8d4f597bcaa0c9ea844d3a307a5c60d6d28e44cbffd54fe44c92be0386450f25951

diff --git a/x11-plugins/wmmon/files/wmmon-1.2_beta1-Makefile.patch 
b/x11-plugins/wmmon/files/wmmon-1.2_beta1-Makefile.patch
deleted file mode 100644
index c7633ad7388..000
--- a/x11-plugins/wmmon/files/wmmon-1.2_beta1-Makefile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
 wmmon/Makefile.orig2012-03-29 13:17:39.380764054 +0200
-+++ wmmon/Makefile 2012-03-29 13:18:06.623931767 +0200
-@@ -6,14 +6,14 @@
-   ../wmgeneral/list.o
- 
- CFLAGS = -O2
--CC = cc $(CFLAGS)
-+CC = cc
- 
- 
- .c.o:
--  $(CC) -c -Wall $< -o $*.o
-+  $(CC) $(CFLAGS) -c -Wall $< -o $*.o
- 
- wmmon: $(OBJS)
--  $(CC) -o wmmon $^ $(LIBDIR) $(LIBS)
-+  $(CC) $(LDFLAGS) -o wmmon $^ $(LIBDIR) $(LIBS)
- 
- debug: CFLAGS = -g3 
- debug: wmmon

diff --git a/x11-plugins/wmmon/files/wmmon-1.2_beta1-list.patch 
b/x11-plugins/wmmon/files/wmmon-1.2_beta1-list.patch
deleted file mode 100644
index 1b1ac317669..000
--- a/x11-plugins/wmmon/files/wmmon-1.2_beta1-list.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-diff -Naur wmgeneral.orig/list.c wmgeneral/list.c
 wmgeneral.orig/list.c  2016-01-04 13:28:36.583339716 +0100
-+++ wmgeneral/list.c   2016-01-04 13:28:48.694343645 +0100
-@@ -38,7 +38,7 @@
- 
- /* Return a cons cell produced from (head . tail)
- 
--INLINE LinkedList* 
-+LinkedList* 
- list_cons(void* head, LinkedList* tail)
- {
-   LinkedList* cell;
-@@ -51,7 +51,7 @@
- 
- /* Return the length of a list, list_length(NULL) returns zero
- 
--INLINE int
-+int
- list_length(LinkedList* list)
- {
-   int i = 0;
-@@ -66,7 +66,7 @@
- /* Return the Nth element of LIST, where N count from zero.  If N 
-larger than the list length, NULL is returned 
- 
--INLINE void*
-+void*
- list_nth(int index, LinkedList* list)
- {
-   while(index-- != 0)
-@@ -81,7 +81,7 @@
- 
- /* Remove the element at the head by replacing it by its successor
- 
--INLINE void
-+void
- list_remove_head(LinkedList** list)
- {
-   if (!*list) return;  
-@@ -101,7 +101,7 @@
- 
- /* Remove the element with `car' set to ELEMENT
- /*
--INLINE void
-+void
- list_remove_elem(LinkedList** list, void* elem)
- {
-   while (*list)
-@@ -112,7 +112,7 @@
- }
- 
- 
--INLINE LinkedList *
-+LinkedList *
- list_remove_elem(LinkedList* list, void* elem)
- {
- LinkedList *tmp;
-@@ -132,7 +132,7 @@
- 
- /* Return element that has ELEM as car
- 
--INLINE LinkedList*
-+LinkedList*
- list_find(LinkedList* list, void* elem)
- {
-   while(list)
-@@ -146,7 +146,7 @@
- 
- /* Free list (backwards recursive)
- 
--INLINE void
-+void
- list_free(LinkedList* list)
- {
-   if(list)
-@@ -158,7 +158,7 @@
- 
- /* Map FUNCTION over all elements in LIST
- 
--INLINE void
-+void
- list_mapcar(LinkedList* list, void(*function)(void*))
- {
-   while(list)
-diff -Naur wmgeneral.orig/list.h wmgeneral/list.h
 wmgeneral.orig/list.h  2016-01-04 13:28:36.583339716 +0100
-+++ wmgeneral/list.h   2016-01-04 13:28:39.471340654 +0100
-@@ -29,31 +29,25 @@
- #ifndef __LIST_H_
- #define __LIST_H_
- 
--#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
--# define INLINE inline
--#else
--# define INLINE

[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmmon/

2019-03-07 Thread Mikle Kolyada
commit: 8e9c381b5f8d6699c94106fcf964d901f72f1115
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Thu Mar  7 23:53:13 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu Mar  7 23:53:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e9c381b

x11-plugins/wmmon: amd64 stable wrt bug #678588

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 x11-plugins/wmmon/wmmon-1.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-plugins/wmmon/wmmon-1.4.ebuild 
b/x11-plugins/wmmon/wmmon-1.4.ebuild
index 36a6b74ce55..b52135abe04 100644
--- a/x11-plugins/wmmon/wmmon-1.4.ebuild
+++ b/x11-plugins/wmmon/wmmon-1.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/libdockapp-0.7:=



[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmmon/

2019-03-07 Thread Thomas Deutschmann
commit: e3325a3e8ebee06e13041cd9fe8bbfa31fc802ee
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Mar  7 21:45:17 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Mar  7 21:50:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3325a3e

x11-plugins/wmmon: x86 stable (bug #678588)

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

 x11-plugins/wmmon/wmmon-1.4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-plugins/wmmon/wmmon-1.4.ebuild 
b/x11-plugins/wmmon/wmmon-1.4.ebuild
index 921742857e8..36a6b74ce55 100644
--- a/x11-plugins/wmmon/wmmon-1.4.ebuild
+++ b/x11-plugins/wmmon/wmmon-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/libdockapp-0.7:=



[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmmon+smp/

2018-12-11 Thread Bernard Cafarelli
commit: 8a68b1f1bc03ee565fbff195c2c7ec6f533bfec4
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Fri Dec  7 14:09:36 2018 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Tue Dec 11 14:27:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a68b1f1

x11-plugins/wmmon+smp: drop old

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Bernard Cafarelli  gentoo.org>

 x11-plugins/wmmon+smp/wmmon+smp-1.0-r2.ebuild | 42 ---
 1 file changed, 42 deletions(-)

diff --git a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r2.ebuild 
b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r2.ebuild
deleted file mode 100644
index 3da3e885fae..000
--- a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Dockapp CPU monitor resembling Xosview, support for smp"
-SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/wmmon+smp.tar.gz;
-HOMEPAGE="http://www.ne.jp/asahi/linux/timecop/;
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-RDEPEND="
-   x11-libs/libX11
-   x11-libs/libXext
-   x11-libs/libXpm"
-DEPEND="${RDEPEND}
-   x11-base/xorg-proto"
-
-S=${WORKDIR}/wmmon.app/wmmon
-
-src_prepare() {
-   # Respect LDFLAGS, see bug #335047
-   sed \
-   -e 's/cc -o/${CC} ${LDFLAGS} -o/' \
-   -e 's/cc -c/${CC} ${CFLAGS} -c/' \
-   -i Makefile || die
-   tc-export CC
-
-   cd "${WORKDIR}"/wmmon.app || die
-   ls
-   epatch "${FILESDIR}"/${P}-list.patch
-}
-
-src_install () {
-   newbin wmmon wmmon+smp
-   dodoc ../README
-}



[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmmon+smp/

2018-10-21 Thread Mikle Kolyada
commit: ff59a7ad86b41d017318d600e1c72b8cb067de24
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Oct 21 08:10:41 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Oct 21 08:10:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff59a7ad

x11-plugins/wmmon+smp: amd64 stable wrt bug #666088

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild 
b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild
index 29fa6afe079..45c4bc62777 100644
--- a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild
+++ b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ 
SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/wmmon+smp.tar.gz;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 
 RDEPEND="
x11-libs/libX11



[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmmon+smp/

2018-09-22 Thread Sergei Trofimovich
commit: 08551ec77aee8416e362ef5f18b3f71d45eca097
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Sep 22 11:25:07 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Sep 22 11:28:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08551ec7

x11-plugins/wmmon+smp: stable 1.0-r3 for ppc64, bug #666088

Package-Manager: Portage-2.3.49, Repoman-2.3.10
RepoMan-Options: --include-arches="ppc64"

 x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild 
b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild
index 33b0bf2c739..29fa6afe079 100644
--- a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild
+++ b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/wmmon+smp.tar.gz;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ppc64 x86"
 
 RDEPEND="
x11-libs/libX11



[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmmon+smp/

2018-09-19 Thread Thomas Deutschmann
commit: 796db8cacd1ab8876d595c9688f18782591621ca
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Sep 19 18:16:02 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Sep 19 18:27:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=796db8ca

x11-plugins/wmmon+smp: x86 stable (bug #666088)

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild 
b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild
index 34299e08f1d..33b0bf2c739 100644
--- a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild
+++ b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/wmmon+smp.tar.gz;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 x86"
 
 RDEPEND="
x11-libs/libX11



[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmmon+smp/files/, x11-plugins/wmmon+smp/

2018-08-02 Thread Bernard Cafarelli
commit: b567e9b46c456afb8236de4c07982bce71d892a6
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sun Jul 22 17:42:31 2018 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Thu Aug  2 20:15:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b567e9b4

x11-plugins/wmmon+smp: EAPI7, improve ebuild

 .../wmmon+smp/files/wmmon+smp-1.0-list.patch   |  8 ++---
 x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild  | 42 ++
 2 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/x11-plugins/wmmon+smp/files/wmmon+smp-1.0-list.patch 
b/x11-plugins/wmmon+smp/files/wmmon+smp-1.0-list.patch
index 1b1ac317669..19756d5edf2 100644
--- a/x11-plugins/wmmon+smp/files/wmmon+smp-1.0-list.patch
+++ b/x11-plugins/wmmon+smp/files/wmmon+smp-1.0-list.patch
@@ -1,6 +1,6 @@
 diff -Naur wmgeneral.orig/list.c wmgeneral/list.c
 wmgeneral.orig/list.c  2016-01-04 13:28:36.583339716 +0100
-+++ wmgeneral/list.c   2016-01-04 13:28:48.694343645 +0100
+--- a/wmgeneral/list.c 2016-01-04 13:28:36.583339716 +0100
 b/wmgeneral/list.c 2016-01-04 13:28:48.694343645 +0100
 @@ -38,7 +38,7 @@
  
  /* Return a cons cell produced from (head . tail)
@@ -83,8 +83,8 @@ diff -Naur wmgeneral.orig/list.c wmgeneral/list.c
  {
while(list)
 diff -Naur wmgeneral.orig/list.h wmgeneral/list.h
 wmgeneral.orig/list.h  2016-01-04 13:28:36.583339716 +0100
-+++ wmgeneral/list.h   2016-01-04 13:28:39.471340654 +0100
+--- a/wmgeneral/list.h 2016-01-04 13:28:36.583339716 +0100
 b/wmgeneral/list.h 2016-01-04 13:28:39.471340654 +0100
 @@ -29,31 +29,25 @@
  #ifndef __LIST_H_
  #define __LIST_H_

diff --git a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild 
b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild
new file mode 100644
index 000..34299e08f1d
--- /dev/null
+++ b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Dockapp CPU monitor resembling Xosview, support for smp"
+HOMEPAGE="http://www.ne.jp/asahi/linux/timecop/;
+SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/wmmon+smp.tar.gz;
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND="
+   x11-libs/libX11
+   x11-libs/libXext
+   x11-libs/libXpm"
+DEPEND="${RDEPEND}
+   x11-base/xorg-proto"
+
+S="${WORKDIR}/wmmon.app/wmmon"
+
+PATCHES=( "${FILESDIR}"/${P}-list.patch )
+
+src_prepare() {
+   tc-export CC
+   # Respect LDFLAGS, see bug #335047
+   sed \
+   -e 's/cc -o/${CC} ${LDFLAGS} -o/' \
+   -e 's/cc -c/${CC} ${CFLAGS} -c/' \
+   -i Makefile || die
+
+   cd "${WORKDIR}"/wmmon.app || die
+   default
+}
+
+src_install () {
+   newbin wmmon wmmon+smp
+   dodoc ../README
+}



[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmmon/

2018-06-12 Thread Bernard Cafarelli
commit: 339a48c36ff7f98027a87653a2c042e4dbec310a
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Tue Jun 12 17:37:50 2018 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Tue Jun 12 21:37:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=339a48c3

x11-plugins/wmmon: use HTTPs, sync HOMEPAGE

 x11-plugins/wmmon/wmmon-1.2_beta1.ebuild | 2 +-
 x11-plugins/wmmon/wmmon-1.3.ebuild   | 4 ++--
 x11-plugins/wmmon/wmmon-1.4.ebuild   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/x11-plugins/wmmon/wmmon-1.2_beta1.ebuild 
b/x11-plugins/wmmon/wmmon-1.2_beta1.ebuild
index 94e8f0cbdbc..a0ba35afd5a 100644
--- a/x11-plugins/wmmon/wmmon-1.2_beta1.ebuild
+++ b/x11-plugins/wmmon/wmmon-1.2_beta1.ebuild
@@ -5,7 +5,7 @@ EAPI=4
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Dockable system resources monitor applet for WindowMaker"
-HOMEPAGE="http://repo.or.cz/w/dockapps.git;
+HOMEPAGE="https://www.dockapps.net/wmmon;
 SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P/_beta/b}.tar.bz2;
 
 LICENSE="GPL-2"

diff --git a/x11-plugins/wmmon/wmmon-1.3.ebuild 
b/x11-plugins/wmmon/wmmon-1.3.ebuild
index ed8ccc7f24b..921742857e8 100644
--- a/x11-plugins/wmmon/wmmon-1.3.ebuild
+++ b/x11-plugins/wmmon/wmmon-1.3.ebuild
@@ -4,8 +4,8 @@
 EAPI=6
 
 DESCRIPTION="Dockable system resources monitor applet for WindowMaker"
-HOMEPAGE="http://www.dockapps.net/wmmon;
-SRC_URI="http://www.dockapps.net/download/${P}.tar.gz;
+HOMEPAGE="https://www.dockapps.net/wmmon;
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"

diff --git a/x11-plugins/wmmon/wmmon-1.4.ebuild 
b/x11-plugins/wmmon/wmmon-1.4.ebuild
index ed8ccc7f24b..921742857e8 100644
--- a/x11-plugins/wmmon/wmmon-1.4.ebuild
+++ b/x11-plugins/wmmon/wmmon-1.4.ebuild
@@ -4,8 +4,8 @@
 EAPI=6
 
 DESCRIPTION="Dockable system resources monitor applet for WindowMaker"
-HOMEPAGE="http://www.dockapps.net/wmmon;
-SRC_URI="http://www.dockapps.net/download/${P}.tar.gz;
+HOMEPAGE="https://www.dockapps.net/wmmon;
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmmon/

2018-04-11 Thread Bernard Cafarelli
commit: c311be2a6c5c8390b864f713ba0aea81adb12a69
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Wed Apr 11 16:55:09 2018 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Wed Apr 11 16:55:28 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c311be2a

x11-plugins/wmmon: 1.4 bump

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 x11-plugins/wmmon/Manifest |  1 +
 x11-plugins/wmmon/wmmon-1.4.ebuild | 19 +++
 2 files changed, 20 insertions(+)

diff --git a/x11-plugins/wmmon/Manifest b/x11-plugins/wmmon/Manifest
index 2f1a974d71d..cb7b119b557 100644
--- a/x11-plugins/wmmon/Manifest
+++ b/x11-plugins/wmmon/Manifest
@@ -1,2 +1,3 @@
 DIST wmmon-1.2b1.tar.bz2 25610 BLAKE2B 
fcaf37c869e5cfc9c105c1924f66a03a726239ef5a6c473a312a8d8e4bd34203fa71d6ded607894b0feae1f4a352c365828dba284c629c81dea0973b05ad98b8
 SHA512 
359ff4024cdc606d3520445d31b9e59c79a957b081bf46dfabde7c970aecab8d640f789f34c1599e18e15e50a077248e06600151d7c1e66ef028215d6d88ff1f
 DIST wmmon-1.3.tar.gz 107622 BLAKE2B 
41eabaf506882f9e230ffd5bcb2c28325b49a1594423f9e950941b5f3a343ceee19bd22c91a29d62a4eaeee920fba19caf1fcb7656db646cb464a9ec6d1a1890
 SHA512 
2308bf5ef9aa9f93979e63ea7d405e304a1a7ea55b966affc200239829f3cd2b7039fe96e42fcf59b525a72b3f8f64d8397853c3847356733644045e5529
+DIST wmmon-1.4.tar.gz 107477 BLAKE2B 
973dedb994c0e688dbdcefde12d186e1d3712164adeb454e97367c6592e223dd61f01ddc7c5258bc387619ed185f049439b8692a18a1bd28bccafda986359e36
 SHA512 
ca5a0d8278d6fda4ae1be2e76e17ad7e550e91398dba1c5aa09b501c4e17b8d4f597bcaa0c9ea844d3a307a5c60d6d28e44cbffd54fe44c92be0386450f25951

diff --git a/x11-plugins/wmmon/wmmon-1.4.ebuild 
b/x11-plugins/wmmon/wmmon-1.4.ebuild
new file mode 100644
index 000..9b4d238fc25
--- /dev/null
+++ b/x11-plugins/wmmon/wmmon-1.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Dockable system resources monitor applet for WindowMaker"
+HOMEPAGE="http://www.dockapps.net/wmmon;
+SRC_URI="http://www.dockapps.net/download/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/libdockapp-0.7:=
+   x11-libs/libX11
+   x11-libs/libXpm"
+DEPEND="${RDEPEND}
+   x11-proto/xproto"



[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmmon+smp/

2017-12-05 Thread Bernard Cafarelli
commit: 0e5859f8d334ea1ad6c092e930a1d1f0686b10dc
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Tue Dec  5 15:08:40 2017 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Tue Dec  5 15:10:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e5859f8

x11-plugins/wmmon+smp: update SRC_URI

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 x11-plugins/wmmon+smp/wmmon+smp-1.0-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r2.ebuild 
b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r2.ebuild
index 5b540e83d26..9dc5da61324 100644
--- a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r2.ebuild
+++ b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Dockapp CPU monitor resembling Xosview, support for smp"
-SRC_URI="http://www.ne.jp/asahi/linux/timecop/wmmon+smp.tar.gz;
+SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/wmmon+smp.tar.gz;
 HOMEPAGE="http://www.ne.jp/asahi/linux/timecop/;
 
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmmon/files/, x11-plugins/wmmon/

2017-09-01 Thread Bernard Cafarelli
commit: ef0014a3a61a08f82d57fdd951282244d2268909
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Fri Sep  1 08:53:44 2017 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Fri Sep  1 11:06:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef0014a3

x11-plugins/wmmon: drop old

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 x11-plugins/wmmon/Manifest |   1 -
 .../wmmon/files/wmmon-1.0_beta2-kernel26-v2.patch  | 207 -
 x11-plugins/wmmon/wmmon-1.0_beta2-r3.ebuild|  39 
 3 files changed, 247 deletions(-)

diff --git a/x11-plugins/wmmon/Manifest b/x11-plugins/wmmon/Manifest
index 2f254388f72..0b275b9e8b8 100644
--- a/x11-plugins/wmmon/Manifest
+++ b/x11-plugins/wmmon/Manifest
@@ -1,2 +1 @@
 DIST wmmon-1.2b1.tar.bz2 25610 SHA256 
5b203ec46fe13d5fdee51ec878cf1856704bf650a8f5458416b9cf4585e7cac2 SHA512 
359ff4024cdc606d3520445d31b9e59c79a957b081bf46dfabde7c970aecab8d640f789f34c1599e18e15e50a077248e06600151d7c1e66ef028215d6d88ff1f
 WHIRLPOOL 
88ce15d0ca14b0f47cb23faa01372530ec3194678b04cb3e18516da0d50c014704003284cd21e1e4afa466aa806bf766eefa9cee296d60df478402240ea67999
-DIST wmmon-1_0b2.tar.gz 21589 SHA256 
0d34003747b36d47c1f6361675eee982d6eaf458b33f8cf4ecb157e87cdde9bf SHA512 
47d0924d03185241077a59df009ee47f1361e7cb8dac08e687583d32d64691c96f9308ade9979818fbf8434857439d38eb759a858298f8d2e44388f3c09ea978
 WHIRLPOOL 
0925e8c87868a689216768779ca611fa83803915283dd99c8cd7ce46304d506ef6243a1b19afe55b09a9300e9dc8283f3ad4c7c53ca2c3b7191ba8c4ec466add

diff --git a/x11-plugins/wmmon/files/wmmon-1.0_beta2-kernel26-v2.patch 
b/x11-plugins/wmmon/files/wmmon-1.0_beta2-kernel26-v2.patch
deleted file mode 100644
index 38182bb2a90..000
--- a/x11-plugins/wmmon/files/wmmon-1.0_beta2-kernel26-v2.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-*** wmmon.cTue May 19 14:13:16 1998
 wmmon.c.patchedTue May 10 12:31:40 2005
-***
-*** 101,107 
-  //
-  
-  char *ProgName;
-! int  stat_current = 0; /* now global */
-  FILE *fp_meminfo;
-  FILE *fp_stat;
-  FILE *fp_loadavg;
 101,108 
-  //
-  
-  char *ProgName;
-! int  stat_current  = 0; /* now global */
-! int  minus_buffers = 1; /* do we want to subtract buffers and cache from 
memory usage? */
-  FILE *fp_meminfo;
-  FILE *fp_stat;
-  FILE *fp_loadavg;
-*** void main(int argc, char *argv[]) {
-*** 146,151 
 147,155 
-   case 's' :
-   stat_current = 2;
-   break;
-+  case 'b' :
-+  minus_buffers = 0;
-+  break;
-   default:
-   usage();
-   exit(0);
-*** void DrawActive(char *);
-*** 188,194 
-  void update_stat_cpu(stat_dev *);
-  void update_stat_io(stat_dev *);
-  void update_stat_mem(stat_dev *st, stat_dev *st2);
-- void update_stat_swp(stat_dev *);
-  
-  void wmmon_routine(int argc, char **argv) {
-  
 192,197 
-*** void wmmon_routine(int argc, char **argv
-*** 298,304 
-  
-   if(stat_current == 2) {
-   update_stat_mem(_device[2], _device[3]);
-- //   update_stat_swp(_device[3]);
-   }
-  
-   if (stat_current < 2) {
 301,306 
-*** void wmmon_routine(int argc, char **argv
-*** 320,341 
-   copyXPMArea(0, 64, 32, 12, 28+64, 4);
-   copyXPMArea(0, 64, 32, 12, 28+64, 18);
-  
-!  j = stat_device[2].rt_idle;
-!  if (j != 0) {
-!  j = (stat_device[2].rt_stat * 100) / j;
-!  }
-!  j = j * 0.32;
-!  if (j > 32) j = 32;
-!  copyXPMArea(32, 64, j, 12, 28+64, 4);
-!  /*-   --*/
-!  j = stat_device[3].rt_idle;
-!  if (j != 0) {
-!  j = (stat_device[3].rt_stat * 100) / j;
-   }
--  j = j * 0.32;
--  if (j > 32) j = 32;
--  copyXPMArea(32, 64, j, 12, 28+64, 18);
-- 
-   /*--- online tijd neerzetten! --*/
-   
-   cnt_time = time(0) - ref_time + online_time;
 322,335 
-   copyXPMArea(0, 64, 32, 12, 28+64, 4);
-   copyXPMArea(0, 64, 32, 12, 28+64, 18);
-  
-!  for (i = 2; i <= 3; i++) {
-!  j = stat_device[i].rt_stat != 0
-!  ? 100 * ( stat_device[i].rt_stat - 
stat_device[i].rt_idle ) / stat_device[i].rt_stat
-!   

[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmmon/

2017-09-01 Thread Bernard Cafarelli
commit: 369a1b04d0e80ab95f8a43a146854c3e731e681f
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Fri Sep  1 09:02:44 2017 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Fri Sep  1 11:06:04 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=369a1b04

x11-plugins/wmmon: 1.3 bump

Update homepage, ebuild cleanup

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 x11-plugins/wmmon/Manifest |  1 +
 x11-plugins/wmmon/wmmon-1.3.ebuild | 19 +++
 2 files changed, 20 insertions(+)

diff --git a/x11-plugins/wmmon/Manifest b/x11-plugins/wmmon/Manifest
index 0b275b9e8b8..5d9bbb20fe0 100644
--- a/x11-plugins/wmmon/Manifest
+++ b/x11-plugins/wmmon/Manifest
@@ -1 +1,2 @@
 DIST wmmon-1.2b1.tar.bz2 25610 SHA256 
5b203ec46fe13d5fdee51ec878cf1856704bf650a8f5458416b9cf4585e7cac2 SHA512 
359ff4024cdc606d3520445d31b9e59c79a957b081bf46dfabde7c970aecab8d640f789f34c1599e18e15e50a077248e06600151d7c1e66ef028215d6d88ff1f
 WHIRLPOOL 
88ce15d0ca14b0f47cb23faa01372530ec3194678b04cb3e18516da0d50c014704003284cd21e1e4afa466aa806bf766eefa9cee296d60df478402240ea67999
+DIST wmmon-1.3.tar.gz 107622 SHA256 
67f8fe8c52aa317249f90258571201c2a38711b178a960713d8c32479ae2ac3a SHA512 
2308bf5ef9aa9f93979e63ea7d405e304a1a7ea55b966affc200239829f3cd2b7039fe96e42fcf59b525a72b3f8f64d8397853c3847356733644045e5529
 WHIRLPOOL 
18d9b572f04a676cc8b4e2ec5ae6bd035821a76a7d99569062f00b359b06cba2a182011b4094a9f53dcdf71e0dfd49c82ea4f499ad51bbd018ec4d3b7b882535

diff --git a/x11-plugins/wmmon/wmmon-1.3.ebuild 
b/x11-plugins/wmmon/wmmon-1.3.ebuild
new file mode 100644
index 000..7705ab2e705
--- /dev/null
+++ b/x11-plugins/wmmon/wmmon-1.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Dockable system resources monitor applet for WindowMaker"
+HOMEPAGE="http://www.dockapps.net/wmmon;
+SRC_URI="http://www.dockapps.net/download/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/libdockapp-0.7:=
+   x11-libs/libX11
+   x11-libs/libXpm"
+DEPEND="${RDEPEND}
+   x11-proto/xproto"



[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmmon/

2017-01-22 Thread Agostino Sarubbo
commit: 46b38443dccbf11d5d914d6a99206dc03764
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jan 22 16:24:41 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jan 22 16:27:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46b38443

x11-plugins/wmmon: sparc stable wrt bug #605862

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 x11-plugins/wmmon/wmmon-1.2_beta1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-plugins/wmmon/wmmon-1.2_beta1.ebuild 
b/x11-plugins/wmmon/wmmon-1.2_beta1.ebuild
index 0fe5309..549be12 100644
--- a/x11-plugins/wmmon/wmmon-1.2_beta1.ebuild
+++ b/x11-plugins/wmmon/wmmon-1.2_beta1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P/_beta/b}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11



[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmmon/

2017-01-18 Thread Agostino Sarubbo
commit: 544858bc70ade6c5b21f37101ca37f9382fe2664
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jan 18 11:54:58 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jan 18 11:56:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=544858bc

x11-plugins/wmmon: x86 stable wrt bug #605862

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 x11-plugins/wmmon/wmmon-1.2_beta1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-plugins/wmmon/wmmon-1.2_beta1.ebuild 
b/x11-plugins/wmmon/wmmon-1.2_beta1.ebuild
index 56e9237..0fe5309 100644
--- a/x11-plugins/wmmon/wmmon-1.2_beta1.ebuild
+++ b/x11-plugins/wmmon/wmmon-1.2_beta1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P/_beta/b}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11



[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmmon/

2017-01-17 Thread Agostino Sarubbo
commit: 80adbfde8b5c967f81991a2a138dc5015778b667
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Jan 17 11:24:20 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Jan 17 11:24:20 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80adbfde

x11-plugins/wmmon: amd64 stable wrt bug #605862

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 x11-plugins/wmmon/wmmon-1.2_beta1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-plugins/wmmon/wmmon-1.2_beta1.ebuild 
b/x11-plugins/wmmon/wmmon-1.2_beta1.ebuild
index f099c9d..56e9237 100644
--- a/x11-plugins/wmmon/wmmon-1.2_beta1.ebuild
+++ b/x11-plugins/wmmon/wmmon-1.2_beta1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ 
SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P/_beta/b}.tar.bz2;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11



[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmmon/files/, x11-plugins/wmmon/

2016-01-04 Thread Bernard Cafarelli
commit: fb9770ae922e6d105a7643102b3b805a93b5a39a
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Mon Jan  4 12:38:55 2016 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Mon Jan  4 12:56:48 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb9770ae

x11-plugins/wmmon: fix compilation with gcc 5, bug #570212

Package-Manager: portage-2.2.26

 x11-plugins/wmmon/files/wmmon-1.2_beta1-list.patch | 127 +
 x11-plugins/wmmon/wmmon-1.2_beta1.ebuild   |   3 +-
 2 files changed, 129 insertions(+), 1 deletion(-)

diff --git a/x11-plugins/wmmon/files/wmmon-1.2_beta1-list.patch 
b/x11-plugins/wmmon/files/wmmon-1.2_beta1-list.patch
new file mode 100644
index 000..1b1ac31
--- /dev/null
+++ b/x11-plugins/wmmon/files/wmmon-1.2_beta1-list.patch
@@ -0,0 +1,127 @@
+diff -Naur wmgeneral.orig/list.c wmgeneral/list.c
+--- wmgeneral.orig/list.c  2016-01-04 13:28:36.583339716 +0100
 wmgeneral/list.c   2016-01-04 13:28:48.694343645 +0100
+@@ -38,7 +38,7 @@
+ 
+ /* Return a cons cell produced from (head . tail)
+ 
+-INLINE LinkedList* 
++LinkedList* 
+ list_cons(void* head, LinkedList* tail)
+ {
+   LinkedList* cell;
+@@ -51,7 +51,7 @@
+ 
+ /* Return the length of a list, list_length(NULL) returns zero
+ 
+-INLINE int
++int
+ list_length(LinkedList* list)
+ {
+   int i = 0;
+@@ -66,7 +66,7 @@
+ /* Return the Nth element of LIST, where N count from zero.  If N 
+larger than the list length, NULL is returned 
+ 
+-INLINE void*
++void*
+ list_nth(int index, LinkedList* list)
+ {
+   while(index-- != 0)
+@@ -81,7 +81,7 @@
+ 
+ /* Remove the element at the head by replacing it by its successor
+ 
+-INLINE void
++void
+ list_remove_head(LinkedList** list)
+ {
+   if (!*list) return;  
+@@ -101,7 +101,7 @@
+ 
+ /* Remove the element with `car' set to ELEMENT
+ /*
+-INLINE void
++void
+ list_remove_elem(LinkedList** list, void* elem)
+ {
+   while (*list)
+@@ -112,7 +112,7 @@
+ }
+ 
+ 
+-INLINE LinkedList *
++LinkedList *
+ list_remove_elem(LinkedList* list, void* elem)
+ {
+ LinkedList *tmp;
+@@ -132,7 +132,7 @@
+ 
+ /* Return element that has ELEM as car
+ 
+-INLINE LinkedList*
++LinkedList*
+ list_find(LinkedList* list, void* elem)
+ {
+   while(list)
+@@ -146,7 +146,7 @@
+ 
+ /* Free list (backwards recursive)
+ 
+-INLINE void
++void
+ list_free(LinkedList* list)
+ {
+   if(list)
+@@ -158,7 +158,7 @@
+ 
+ /* Map FUNCTION over all elements in LIST
+ 
+-INLINE void
++void
+ list_mapcar(LinkedList* list, void(*function)(void*))
+ {
+   while(list)
+diff -Naur wmgeneral.orig/list.h wmgeneral/list.h
+--- wmgeneral.orig/list.h  2016-01-04 13:28:36.583339716 +0100
 wmgeneral/list.h   2016-01-04 13:28:39.471340654 +0100
+@@ -29,31 +29,25 @@
+ #ifndef __LIST_H_
+ #define __LIST_H_
+ 
+-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+-# define INLINE inline
+-#else
+-# define INLINE
+-#endif
+-
+ typedef struct LinkedList {
+   void *head;
+   struct LinkedList *tail;
+ } LinkedList;
+ 
+-INLINE LinkedList* list_cons(void* head, LinkedList* tail);
++LinkedList* list_cons(void* head, LinkedList* tail);
+ 
+-INLINE int list_length(LinkedList* list);
++int list_length(LinkedList* list);
+ 
+-INLINE void* list_nth(int index, LinkedList* list);
++void* list_nth(int index, LinkedList* list);
+ 
+-INLINE void list_remove_head(LinkedList** list);
++void list_remove_head(LinkedList** list);
+ 
+-INLINE LinkedList *list_remove_elem(LinkedList* list, void* elem);
++LinkedList *list_remove_elem(LinkedList* list, void* elem);
+ 
+-INLINE void list_mapcar(LinkedList* list, void(*function)(void*));
++void list_mapcar(LinkedList* list, void(*function)(void*));
+ 
+-INLINE LinkedList*list_find(LinkedList* list, void* elem);
++LinkedList*list_find(LinkedList* list, void* elem);
+ 
+-INLINE void list_free(LinkedList* list);
++void list_free(LinkedList* list);
+ 
+ #endif

diff --git a/x11-plugins/wmmon/wmmon-1.2_beta1.ebuild 
b/x11-plugins/wmmon/wmmon-1.2_beta1.ebuild
index c3ba34c..f099c9d 100644
--- a/x11-plugins/wmmon/wmmon-1.2_beta1.ebuild
+++ b/x11-plugins/wmmon/wmmon-1.2_beta1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -24,6 +24,7 @@ S=${WORKDIR}/${P/_beta/b}
 
 src_prepare() {
epatch "${FILESDIR}"/${P}-Makefile.patch
+   epatch "${FILESDIR}"/${P}-list.patch
 }
 
 src_compile() {



[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmmon+smp/, x11-plugins/wmmon+smp/files/

2016-01-04 Thread Bernard Cafarelli
commit: a611d0fe6871a320287aadbab9e0517bcd0c2660
Author: Bernard Cafarelli  gentoo  org>
AuthorDate: Mon Jan  4 12:35:13 2016 +
Commit: Bernard Cafarelli  gentoo  org>
CommitDate: Mon Jan  4 12:56:48 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a611d0fe

x11-plugins/wmmon+smp: fix compilation with gcc 5, bug #569598

Package-Manager: portage-2.2.26

 .../wmmon+smp/files/wmmon+smp-1.0-list.patch   | 127 +
 x11-plugins/wmmon+smp/wmmon+smp-1.0-r2.ebuild  |   8 +-
 2 files changed, 133 insertions(+), 2 deletions(-)

diff --git a/x11-plugins/wmmon+smp/files/wmmon+smp-1.0-list.patch 
b/x11-plugins/wmmon+smp/files/wmmon+smp-1.0-list.patch
new file mode 100644
index 000..1b1ac31
--- /dev/null
+++ b/x11-plugins/wmmon+smp/files/wmmon+smp-1.0-list.patch
@@ -0,0 +1,127 @@
+diff -Naur wmgeneral.orig/list.c wmgeneral/list.c
+--- wmgeneral.orig/list.c  2016-01-04 13:28:36.583339716 +0100
 wmgeneral/list.c   2016-01-04 13:28:48.694343645 +0100
+@@ -38,7 +38,7 @@
+ 
+ /* Return a cons cell produced from (head . tail)
+ 
+-INLINE LinkedList* 
++LinkedList* 
+ list_cons(void* head, LinkedList* tail)
+ {
+   LinkedList* cell;
+@@ -51,7 +51,7 @@
+ 
+ /* Return the length of a list, list_length(NULL) returns zero
+ 
+-INLINE int
++int
+ list_length(LinkedList* list)
+ {
+   int i = 0;
+@@ -66,7 +66,7 @@
+ /* Return the Nth element of LIST, where N count from zero.  If N 
+larger than the list length, NULL is returned 
+ 
+-INLINE void*
++void*
+ list_nth(int index, LinkedList* list)
+ {
+   while(index-- != 0)
+@@ -81,7 +81,7 @@
+ 
+ /* Remove the element at the head by replacing it by its successor
+ 
+-INLINE void
++void
+ list_remove_head(LinkedList** list)
+ {
+   if (!*list) return;  
+@@ -101,7 +101,7 @@
+ 
+ /* Remove the element with `car' set to ELEMENT
+ /*
+-INLINE void
++void
+ list_remove_elem(LinkedList** list, void* elem)
+ {
+   while (*list)
+@@ -112,7 +112,7 @@
+ }
+ 
+ 
+-INLINE LinkedList *
++LinkedList *
+ list_remove_elem(LinkedList* list, void* elem)
+ {
+ LinkedList *tmp;
+@@ -132,7 +132,7 @@
+ 
+ /* Return element that has ELEM as car
+ 
+-INLINE LinkedList*
++LinkedList*
+ list_find(LinkedList* list, void* elem)
+ {
+   while(list)
+@@ -146,7 +146,7 @@
+ 
+ /* Free list (backwards recursive)
+ 
+-INLINE void
++void
+ list_free(LinkedList* list)
+ {
+   if(list)
+@@ -158,7 +158,7 @@
+ 
+ /* Map FUNCTION over all elements in LIST
+ 
+-INLINE void
++void
+ list_mapcar(LinkedList* list, void(*function)(void*))
+ {
+   while(list)
+diff -Naur wmgeneral.orig/list.h wmgeneral/list.h
+--- wmgeneral.orig/list.h  2016-01-04 13:28:36.583339716 +0100
 wmgeneral/list.h   2016-01-04 13:28:39.471340654 +0100
+@@ -29,31 +29,25 @@
+ #ifndef __LIST_H_
+ #define __LIST_H_
+ 
+-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+-# define INLINE inline
+-#else
+-# define INLINE
+-#endif
+-
+ typedef struct LinkedList {
+   void *head;
+   struct LinkedList *tail;
+ } LinkedList;
+ 
+-INLINE LinkedList* list_cons(void* head, LinkedList* tail);
++LinkedList* list_cons(void* head, LinkedList* tail);
+ 
+-INLINE int list_length(LinkedList* list);
++int list_length(LinkedList* list);
+ 
+-INLINE void* list_nth(int index, LinkedList* list);
++void* list_nth(int index, LinkedList* list);
+ 
+-INLINE void list_remove_head(LinkedList** list);
++void list_remove_head(LinkedList** list);
+ 
+-INLINE LinkedList *list_remove_elem(LinkedList* list, void* elem);
++LinkedList *list_remove_elem(LinkedList* list, void* elem);
+ 
+-INLINE void list_mapcar(LinkedList* list, void(*function)(void*));
++void list_mapcar(LinkedList* list, void(*function)(void*));
+ 
+-INLINE LinkedList*list_find(LinkedList* list, void* elem);
++LinkedList*list_find(LinkedList* list, void* elem);
+ 
+-INLINE void list_free(LinkedList* list);
++void list_free(LinkedList* list);
+ 
+ #endif

diff --git a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r2.ebuild 
b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r2.ebuild
index 8a3c949..b630a91 100644
--- a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r2.ebuild
+++ b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Dockapp CPU monitor resembling Xosview, support for smp"
 SRC_URI="http://www.ne.jp/asahi/linux/timecop/wmmon+smp.tar.gz;
@@ -31,6 +31,10 @@ src_prepare() {
-e 's/cc -c/${CC} ${CFLAGS} -c/' \
-i Makefile || die
tc-export CC
+
+   cd "${WORKDIR}"/wmmon.app || die
+   ls
+   epatch "${FILESDIR}"/${P}-list.patch
 }
 
 src_install () {