| 1 |
commit: 822e267a6a4c3554502fdf50c82961aee574ea27 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 3 22:34:32 2018 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 4 09:15:41 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=822e267a |
| 7 |
|
| 8 |
x11-plugins/gkrelltop: Eclass update |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 11 |
|
| 12 |
.../files/gkrelltop-2.2.13-fix-build-system.patch | 41 ++++++++++++++++++++++ |
| 13 |
x11-plugins/gkrelltop/gkrelltop-2.2.13-r2.ebuild | 33 ++++++++--------- |
| 14 |
2 files changed, 56 insertions(+), 18 deletions(-) |
| 15 |
|
| 16 |
diff --git a/x11-plugins/gkrelltop/files/gkrelltop-2.2.13-fix-build-system.patch b/x11-plugins/gkrelltop/files/gkrelltop-2.2.13-fix-build-system.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..9eaa9cc3d4e |
| 19 |
--- /dev/null |
| 20 |
+++ b/x11-plugins/gkrelltop/files/gkrelltop-2.2.13-fix-build-system.patch |
| 21 |
@@ -0,0 +1,41 @@ |
| 22 |
+--- a/Makefile |
| 23 |
++++ b/Makefile |
| 24 |
+@@ -45,11 +45,10 @@ |
| 25 |
+ # Parameters for gkrellm version 2.* |
| 26 |
+ CFLAGS2 = -g -D$(OSFLAG) -DGKRELLM2 -fPIC -Wall `pkg-config gtk+-2.0 --cflags` |
| 27 |
+ LIBS = |
| 28 |
+-CC=/usr/bin/gcc $(CFLAGS2) |
| 29 |
++CC += $(CFLAGS) $(CFLAGS2) |
| 30 |
+ |
| 31 |
+ else |
| 32 |
+ # Parameters for gkrellm version 1.* |
| 33 |
+-CC=/usr/bin/cc |
| 34 |
+ CFLAGS = -D$(OSFLAG) -Wall -fPIC `gtk-config --cflags` `imlib-config --cflags-gdk` |
| 35 |
+ LIBS= |
| 36 |
+ |
| 37 |
+@@ -78,7 +77,7 @@ |
| 38 |
+ ifeq ($(INSTALLDIRD),) |
| 39 |
+ INSTALLDIRD=$(HOME)/.gkrellm2/plugins-gkrellmd |
| 40 |
+ endif |
| 41 |
+-CCD=/usr/bin/gcc $(CFLAGSD) |
| 42 |
++CCD = $(CC) $(CFLAGS) $(CFLAGSD) |
| 43 |
+ OBJD = gkrelltopd.o top_three.o |
| 44 |
+ |
| 45 |
+ DUMMY_VAR := $(shell ./configure $(CONFIGURE_ARGS)) |
| 46 |
+@@ -100,14 +99,14 @@ |
| 47 |
+ warn: ; $(WARN) |
| 48 |
+ |
| 49 |
+ $(GKRELLTOP): $(OBJ) warn |
| 50 |
+- $(CC) -shared $(OBJ) -o $(GKRELLTOP) |
| 51 |
++ $(CC) $(LDFLAGS) -shared $(OBJ) -o $(GKRELLTOP) |
| 52 |
+ |
| 53 |
+ # Compile gkrelltopd.so server plugin |
| 54 |
+ server: $(GKRELLTOPD) warn |
| 55 |
+ @echo "" |
| 56 |
+ |
| 57 |
+ $(GKRELLTOPD): $(OBJD) |
| 58 |
+- $(CCD) $(LIBSD) -shared $(OBJD) -o $(GKRELLTOPD) |
| 59 |
++ $(CCD) $(LIBSD) $(LDFLAGS) -shared $(OBJD) -o $(GKRELLTOPD) |
| 60 |
+ |
| 61 |
+ gkrelltop.o: gkrelltop.c |
| 62 |
+ $(CC) -c gkrelltop.c -o gkrelltop.o |
| 63 |
|
| 64 |
diff --git a/x11-plugins/gkrelltop/gkrelltop-2.2.13-r2.ebuild b/x11-plugins/gkrelltop/gkrelltop-2.2.13-r2.ebuild |
| 65 |
index 4e6349415d0..059b7d824e5 100644 |
| 66 |
--- a/x11-plugins/gkrelltop/gkrelltop-2.2.13-r2.ebuild |
| 67 |
+++ b/x11-plugins/gkrelltop/gkrelltop-2.2.13-r2.ebuild |
| 68 |
@@ -1,41 +1,38 @@ |
| 69 |
-# Copyright 1999-2017 Gentoo Foundation |
| 70 |
+# Copyright 1999-2018 Gentoo Foundation |
| 71 |
# Distributed under the terms of the GNU General Public License v2 |
| 72 |
|
| 73 |
EAPI=6 |
| 74 |
+ |
| 75 |
inherit gkrellm-plugin toolchain-funcs |
| 76 |
|
| 77 |
DESCRIPTION="a GKrellM2 plugin which displays the top three processes" |
| 78 |
SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.orig.tar.gz" |
| 79 |
HOMEPAGE="https://sourceforge.net/projects/gkrelltop" |
| 80 |
|
| 81 |
-SLOT="0" |
| 82 |
LICENSE="GPL-2" |
| 83 |
+SLOT="0" |
| 84 |
KEYWORDS="amd64 ppc x86" |
| 85 |
IUSE="X" |
| 86 |
|
| 87 |
-PLUGIN_SERVER_SO=gkrelltopd.so |
| 88 |
-PLUGIN_SO=gkrelltop.so |
| 89 |
- |
| 90 |
-S="${WORKDIR}/${P}.orig" |
| 91 |
- |
| 92 |
RDEPEND=" |
| 93 |
- app-admin/gkrellm[X] |
| 94 |
+ app-admin/gkrellm:2[X] |
| 95 |
dev-libs/glib:2 |
| 96 |
- x11-libs/gtk+:2 |
| 97 |
-" |
| 98 |
+ x11-libs/gtk+:2" |
| 99 |
DEPEND="${RDEPEND}" |
| 100 |
|
| 101 |
-src_prepare() { |
| 102 |
- sed -i \ |
| 103 |
- -e "s:/usr/bin/gcc:$(tc-getCC) \$(CFLAGS):" \ |
| 104 |
- -e 's/-shared/$(LDFLAGS) &/' \ |
| 105 |
- Makefile || die |
| 106 |
- default |
| 107 |
+S=${WORKDIR}/${P}.orig |
| 108 |
+PATCHES=( "${FILESDIR}"/${PN}-2.2.13-fix-build-system.patch ) |
| 109 |
+ |
| 110 |
+PLUGIN_SERVER_SO=( gkrelltopd$(get_modname) ) |
| 111 |
+PLUGIN_SO=( gkrelltop$(get_modname) ) |
| 112 |
+ |
| 113 |
+src_configure() { |
| 114 |
+ tc-export CC |
| 115 |
} |
| 116 |
|
| 117 |
src_compile() { |
| 118 |
- use X || TARGET="server" |
| 119 |
- emake ${TARGET} |
| 120 |
+ use X || local target="server" |
| 121 |
+ emake ${target} |
| 122 |
} |
| 123 |
|
| 124 |
pkg_postinst() { |
Archives