Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellkam/, x11-plugins/gkrellkam/files/
Date: Thu, 04 Jan 2018 09:17:15
Message-Id: 1515057371.a573eb974e9204b58c7d2395e957de76a2f525ba.soap@gentoo
1 commit: a573eb974e9204b58c7d2395e957de76a2f525ba
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 3 22:34:33 2018 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 4 09:16:11 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a573eb97
7
8 x11-plugins/gkrellkam: Eclass update
9
10 Package-Manager: Portage-2.3.19, Repoman-2.3.6
11
12 .../gkrellkam/files/gkrellkam-2.0.0-makefile.patch | 4 ++--
13 x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild | 27 +++++++++++-----------
14 2 files changed, 16 insertions(+), 15 deletions(-)
15
16 diff --git a/x11-plugins/gkrellkam/files/gkrellkam-2.0.0-makefile.patch b/x11-plugins/gkrellkam/files/gkrellkam-2.0.0-makefile.patch
17 index 83178b4b0ff..f897f4102b6 100644
18 --- a/x11-plugins/gkrellkam/files/gkrellkam-2.0.0-makefile.patch
19 +++ b/x11-plugins/gkrellkam/files/gkrellkam-2.0.0-makefile.patch
20 @@ -1,5 +1,5 @@
21 ---- Makefile 2002-10-23 18:36:20.000000000 +0200
22 -+++ Makefile_new 2013-03-16 14:02:42.979029588 +0100
23 +--- a/Makefile
24 ++++ b/Makefile
25 @@ -12,10 +12,10 @@
26 # This should point to the GKrellM headers
27 GKRELLM_HDRS = /usr/include
28
29 diff --git a/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild b/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild
30 index ae3ad974d5d..bbb98a01715 100644
31 --- a/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild
32 +++ b/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild
33 @@ -1,35 +1,36 @@
34 -# Copyright 1999-2014 Gentoo Foundation
35 +# Copyright 1999-2018 Gentoo Foundation
36 # Distributed under the terms of the GNU General Public License v2
37
38 -EAPI="5"
39 -inherit eutils gkrellm-plugin toolchain-funcs
40 +EAPI=6
41 +
42 +inherit gkrellm-plugin toolchain-funcs
43
44 MY_P=${P/-/_}
45
46 DESCRIPTION="an Image-Watcher-Plugin for GKrellM2"
47 SRC_URI="mirror://sourceforge/gkrellkam/${MY_P}.tar.gz"
48 HOMEPAGE="http://gkrellkam.sourceforge.net"
49 +
50 LICENSE="GPL-2"
51 SLOT="0"
52 -IUSE=""
53 KEYWORDS="x86 ppc sparc alpha amd64"
54 +IUSE=""
55
56 -RDEPEND="net-misc/wget
57 - app-admin/gkrellm[X]"
58 +RDEPEND="
59 + app-admin/gkrellm:2[X]
60 + net-misc/wget"
61 DEPEND="${RDEPEND}"
62
63 -PLUGIN_SO=gkrellkam2.so
64 -PLUGIN_DOCS="example.list"
65 -
66 -src_prepare() {
67 - epatch "${FILESDIR}"/${P}-makefile.patch
68 -}
69 +PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
70
71 src_compile() {
72 emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
73 }
74
75 -src_install () {
76 +src_install() {
77 + local PLUGIN_SO=( ${PN}2$(get_modname) )
78 + local PLUGIN_DOCS=( example.list )
79 +
80 gkrellm-plugin_src_install
81 doman gkrellkam-list.5
82 }