| 1 |
commit: 5943364a32b99764a4b2527ab32b14d7e1476d57 |
| 2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 27 18:49:30 2017 +0000 |
| 4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 27 18:49:46 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5943364a |
| 7 |
|
| 8 |
x11-plugins/allin1: new EAPI=6 revision. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
...lin1-0.5.0-r1.ebuild => allin1-0.5.0-r2.ebuild} | 10 ++++------ |
| 13 |
x11-plugins/allin1/files/makefile-r2.patch | 23 ++++++++++++++++++++++ |
| 14 |
2 files changed, 27 insertions(+), 6 deletions(-) |
| 15 |
|
| 16 |
diff --git a/x11-plugins/allin1/allin1-0.5.0-r1.ebuild b/x11-plugins/allin1/allin1-0.5.0-r2.ebuild |
| 17 |
similarity index 82% |
| 18 |
rename from x11-plugins/allin1/allin1-0.5.0-r1.ebuild |
| 19 |
rename to x11-plugins/allin1/allin1-0.5.0-r2.ebuild |
| 20 |
index 2afa15eba16..0721c811d6b 100644 |
| 21 |
--- a/x11-plugins/allin1/allin1-0.5.0-r1.ebuild |
| 22 |
+++ b/x11-plugins/allin1/allin1-0.5.0-r2.ebuild |
| 23 |
@@ -1,9 +1,9 @@ |
| 24 |
-# Copyright 1999-2012 Gentoo Foundation |
| 25 |
+# Copyright 1999-2017 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
-EAPI=4 |
| 29 |
+EAPI=6 |
| 30 |
|
| 31 |
-inherit eutils toolchain-funcs |
| 32 |
+inherit toolchain-funcs |
| 33 |
|
| 34 |
DESCRIPTION="All in one monitoring dockapp: RAM, CPU, Net, Power, df, seti" |
| 35 |
HOMEPAGE="http://ilpettegolo.altervista.org/linux_allin1.en.shtml" |
| 36 |
@@ -20,9 +20,7 @@ RDEPEND="x11-libs/libX11 |
| 37 |
DEPEND="${RDEPEND} |
| 38 |
x11-proto/xproto" |
| 39 |
|
| 40 |
-src_prepare() { |
| 41 |
- epatch "${FILESDIR}/makefile.patch" |
| 42 |
-} |
| 43 |
+PATCHES=( "${FILESDIR}/makefile-r2.patch" ) |
| 44 |
|
| 45 |
src_compile() { |
| 46 |
emake \ |
| 47 |
|
| 48 |
diff --git a/x11-plugins/allin1/files/makefile-r2.patch b/x11-plugins/allin1/files/makefile-r2.patch |
| 49 |
new file mode 100644 |
| 50 |
index 00000000000..9d0b2ab028f |
| 51 |
--- /dev/null |
| 52 |
+++ b/x11-plugins/allin1/files/makefile-r2.patch |
| 53 |
@@ -0,0 +1,23 @@ |
| 54 |
+--- a/src/Makefile.old 2012-10-24 13:12:48.128285694 +0200 |
| 55 |
++++ b/src/Makefile 2012-10-24 13:19:56.135247071 +0200 |
| 56 |
+@@ -11,8 +11,9 @@ |
| 57 |
+ |
| 58 |
+ CC = gcc |
| 59 |
+ FLEX = flex |
| 60 |
+-LIBFLAGS = -ggdb -Wall -O2 -fPIC |
| 61 |
+-CFLAGS = -ggdb -Wall -O2 |
| 62 |
++LIBFLAGS = -fPIC |
| 63 |
++CFLAGS = |
| 64 |
++LDFLAGS = |
| 65 |
+ GENERATED = allin1 confparse.c |
| 66 |
+ LIBRARIES = -L/usr/X11R6/lib -lXext -lX11 -lXpm -lm |
| 67 |
+ MODULES = allin1.o dockhelper.o memory.o battery.o cpu.o \ |
| 68 |
+@@ -58,7 +59,7 @@ |
| 69 |
+ |
| 70 |
+ |
| 71 |
+ allin1: $(MODULES) |
| 72 |
+- $(CC) $(CFLAGS) -o $@ $(MODULES) -DDEBUG $(LIBRARIES) |
| 73 |
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(MODULES) -DDEBUG $(LIBRARIES) |
| 74 |
+ |
| 75 |
+ |
| 76 |
+ install: allin1 |
Archives