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/gkrellm-bgchanger/files/, x11-plugins/gkrellm-bgchanger/
Date: Thu, 04 Jan 2018 09:17:25
Message-Id: 1515057335.502bb8f2777b7ecabe478443cfd50bd4d003f01e.soap@gentoo
1 commit: 502bb8f2777b7ecabe478443cfd50bd4d003f01e
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:35 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=502bb8f2
7
8 x11-plugins/gkrellm-bgchanger: Eclass update
9
10 Package-Manager: Portage-2.3.19, Repoman-2.3.6
11
12 .../gkrellm-bgchanger-0.1.11-fix-build-system.patch | 11 +++++++++++
13 .../gkrellm-bgchanger-0.1.11-r2.ebuild | 17 +++++++++--------
14 2 files changed, 20 insertions(+), 8 deletions(-)
15
16 diff --git a/x11-plugins/gkrellm-bgchanger/files/gkrellm-bgchanger-0.1.11-fix-build-system.patch b/x11-plugins/gkrellm-bgchanger/files/gkrellm-bgchanger-0.1.11-fix-build-system.patch
17 new file mode 100644
18 index 00000000000..30eb43d3b83
19 --- /dev/null
20 +++ b/x11-plugins/gkrellm-bgchanger/files/gkrellm-bgchanger-0.1.11-fix-build-system.patch
21 @@ -0,0 +1,11 @@
22 +--- a/Makefile
23 ++++ b/Makefile
24 +@@ -13,7 +13,7 @@
25 + GTK_INCLUDE = `$(GTK_CONFIG) gtk+-2.0 --cflags`
26 + GTK_LIB = `$(GTK_CONFIG) gtk+-2.0 --libs`
27 +
28 +-GKRELLM_INCLUDE= -I/usr/local/include
29 ++GKRELLM_INCLUDE= -I/usr/include
30 +
31 + INSTALL=install -c -m 755
32 +
33
34 diff --git a/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.11-r2.ebuild b/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.11-r2.ebuild
35 index 47a89c183f0..e1853d3a37f 100644
36 --- a/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.11-r2.ebuild
37 +++ b/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.11-r2.ebuild
38 @@ -1,7 +1,8 @@
39 -# Copyright 1999-2017 Gentoo Foundation
40 +# Copyright 1999-2018 Gentoo Foundation
41 # Distributed under the terms of the GNU General Public License v2
42
43 EAPI=6
44 +
45 inherit gkrellm-plugin toolchain-funcs
46
47 MY_PN="gkrellmbgchg2"
48 @@ -12,19 +13,19 @@ DESCRIPTION="Plugin for GKrellM2 to change your desktop background"
49 HOMEPAGE="http://www.bender-suhl.de/stefan/english/comp/gkrellmbgchg.html"
50 SRC_URI="http://www.bender-suhl.de/stefan/comp/sources/${MY_P}.tar.gz"
51
52 -SLOT="2"
53 LICENSE="GPL-2"
54 +SLOT="2"
55 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
56 IUSE=""
57
58 -RDEPEND="app-admin/gkrellm[X]"
59 +RDEPEND="app-admin/gkrellm:2[X]"
60 DEPEND="${RDEPEND}"
61
62 -PLUGIN_SO="gkrellmbgchg.so"
63 -PLUGIN_DOCS="bgchg_info.sh kdewallpaper.sh"
64 +PATCHES=( "${FILESDIR}"/${PN}-0.1.11-fix-build-system.patch )
65 +
66 +PLUGIN_SO=( gkrellmbgchg$(get_modname) )
67 +PLUGIN_DOCS=( bgchg_info.sh kdewallpaper.sh )
68
69 -src_prepare() {
70 - default
71 - sed -i "s:local/::" Makefile || die
72 +src_configure() {
73 tc-export CC
74 }