1 |
commit: b567e9b46c456afb8236de4c07982bce71d892a6 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Jul 22 17:42:31 2018 +0000 |
4 |
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Aug 2 20:15:41 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b567e9b4 |
7 |
|
8 |
x11-plugins/wmmon+smp: EAPI7, improve ebuild |
9 |
|
10 |
.../wmmon+smp/files/wmmon+smp-1.0-list.patch | 8 ++--- |
11 |
x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild | 42 ++++++++++++++++++++++ |
12 |
2 files changed, 46 insertions(+), 4 deletions(-) |
13 |
|
14 |
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 |
15 |
index 1b1ac317669..19756d5edf2 100644 |
16 |
--- a/x11-plugins/wmmon+smp/files/wmmon+smp-1.0-list.patch |
17 |
+++ b/x11-plugins/wmmon+smp/files/wmmon+smp-1.0-list.patch |
18 |
@@ -1,6 +1,6 @@ |
19 |
diff -Naur wmgeneral.orig/list.c wmgeneral/list.c |
20 |
---- wmgeneral.orig/list.c 2016-01-04 13:28:36.583339716 +0100 |
21 |
-+++ wmgeneral/list.c 2016-01-04 13:28:48.694343645 +0100 |
22 |
+--- a/wmgeneral/list.c 2016-01-04 13:28:36.583339716 +0100 |
23 |
++++ b/wmgeneral/list.c 2016-01-04 13:28:48.694343645 +0100 |
24 |
@@ -38,7 +38,7 @@ |
25 |
|
26 |
/* Return a cons cell produced from (head . tail) |
27 |
@@ -83,8 +83,8 @@ diff -Naur wmgeneral.orig/list.c wmgeneral/list.c |
28 |
{ |
29 |
while(list) |
30 |
diff -Naur wmgeneral.orig/list.h wmgeneral/list.h |
31 |
---- wmgeneral.orig/list.h 2016-01-04 13:28:36.583339716 +0100 |
32 |
-+++ wmgeneral/list.h 2016-01-04 13:28:39.471340654 +0100 |
33 |
+--- a/wmgeneral/list.h 2016-01-04 13:28:36.583339716 +0100 |
34 |
++++ b/wmgeneral/list.h 2016-01-04 13:28:39.471340654 +0100 |
35 |
@@ -29,31 +29,25 @@ |
36 |
#ifndef __LIST_H_ |
37 |
#define __LIST_H_ |
38 |
|
39 |
diff --git a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild |
40 |
new file mode 100644 |
41 |
index 00000000000..34299e08f1d |
42 |
--- /dev/null |
43 |
+++ b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild |
44 |
@@ -0,0 +1,42 @@ |
45 |
+# Copyright 1999-2018 Gentoo Foundation |
46 |
+# Distributed under the terms of the GNU General Public License v2 |
47 |
+ |
48 |
+EAPI=7 |
49 |
+ |
50 |
+inherit toolchain-funcs |
51 |
+ |
52 |
+DESCRIPTION="Dockapp CPU monitor resembling Xosview, support for smp" |
53 |
+HOMEPAGE="http://www.ne.jp/asahi/linux/timecop/" |
54 |
+SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/wmmon+smp.tar.gz" |
55 |
+ |
56 |
+SLOT="0" |
57 |
+LICENSE="GPL-2" |
58 |
+KEYWORDS="~amd64 ~ppc64 ~x86" |
59 |
+ |
60 |
+RDEPEND=" |
61 |
+ x11-libs/libX11 |
62 |
+ x11-libs/libXext |
63 |
+ x11-libs/libXpm" |
64 |
+DEPEND="${RDEPEND} |
65 |
+ x11-base/xorg-proto" |
66 |
+ |
67 |
+S="${WORKDIR}/wmmon.app/wmmon" |
68 |
+ |
69 |
+PATCHES=( "${FILESDIR}"/${P}-list.patch ) |
70 |
+ |
71 |
+src_prepare() { |
72 |
+ tc-export CC |
73 |
+ # Respect LDFLAGS, see bug #335047 |
74 |
+ sed \ |
75 |
+ -e 's/cc -o/${CC} ${LDFLAGS} -o/' \ |
76 |
+ -e 's/cc -c/${CC} ${CFLAGS} -c/' \ |
77 |
+ -i Makefile || die |
78 |
+ |
79 |
+ cd "${WORKDIR}"/wmmon.app || die |
80 |
+ default |
81 |
+} |
82 |
+ |
83 |
+src_install () { |
84 |
+ newbin wmmon wmmon+smp |
85 |
+ dodoc ../README |
86 |
+} |