Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-plugins/gkrellmpc/
Date: Thu, 04 Jan 2018 09:17:21
Message-Id: 1515057397.459cd87d74d65ce6e1a71406da85abd4a8bb0e09.soap@gentoo
1 commit: 459cd87d74d65ce6e1a71406da85abd4a8bb0e09
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 3 22:34:34 2018 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 4 09:16:37 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=459cd87d
7
8 media-plugins/gkrellmpc: Eclass update
9
10 Package-Manager: Portage-2.3.19, Repoman-2.3.6
11
12 media-plugins/gkrellmpc/Manifest | 1 -
13 .../gkrellmpc/gkrellmpc-0.1_beta10.ebuild | 17 ++++++----
14 .../gkrellmpc/gkrellmpc-0.1_beta9-r1.ebuild | 38 ----------------------
15 3 files changed, 10 insertions(+), 46 deletions(-)
16
17 diff --git a/media-plugins/gkrellmpc/Manifest b/media-plugins/gkrellmpc/Manifest
18 index fbb4c80df54..6d9b079d427 100644
19 --- a/media-plugins/gkrellmpc/Manifest
20 +++ b/media-plugins/gkrellmpc/Manifest
21 @@ -1,2 +1 @@
22 DIST gkrellmpc-0.1_beta10.tar.gz 25388 BLAKE2B 2e3c97e7d5887e1c3ea6a693cde19470e476943658de607266aac9a3ecbc2a5215fcc266638909d2ad024f303adb19475504ea4f7b79b3e97f566d90899721d3 SHA512 f5d687264f08146bf1eb54aee6d42a200fb97008a355d26a68be91b04e4bd622fc222725bf498c0837eacb8b94d6aede5aa1a05ed504fe5f9b790a9cd08d3973
23 -DIST gkrellmpc-0.1_beta9.tar.gz 22029 BLAKE2B 2c69e1cfc8ac8a1966263caaeb8234d0607d1e8bac8df3df2ef0f0141a6523396aa376ce4b1d00a0bf269eecfbb9d88efe3f28610271c7bc1286a549480070bc SHA512 8ea5b2964e8f430ec391d1dc475f00c6b3b7843952884c62c0fa76131f05a4e61f0dcbf4d1da38c3686e261027c409af28c1d36b87d383468abd4329313fb2db
24
25 diff --git a/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10.ebuild b/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10.ebuild
26 index 42c2ab21767..a309150dbc9 100644
27 --- a/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10.ebuild
28 +++ b/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10.ebuild
29 @@ -1,8 +1,9 @@
30 -# Copyright 1999-2017 Gentoo Foundation
31 +# Copyright 1999-2018 Gentoo Foundation
32 # Distributed under the terms of the GNU General Public License v2
33
34 -EAPI=2
35 -inherit eutils gkrellm-plugin toolchain-funcs
36 +EAPI=6
37 +
38 +inherit gkrellm-plugin toolchain-funcs
39
40 DESCRIPTION="A gkrellm plugin to control the MPD (Music Player Daemon)"
41 HOMEPAGE="http://mpd.wikia.com/wiki/Client:GKrellMPC"
42 @@ -13,7 +14,8 @@ SLOT="0"
43 KEYWORDS="amd64 x86"
44 IUSE="threads"
45
46 -RDEPEND=">=app-admin/gkrellm-2[X]
47 +RDEPEND="
48 + app-admin/gkrellm:2[X]
49 net-misc/curl"
50 DEPEND="${RDEPEND}"
51
52 @@ -21,13 +23,14 @@ DEPEND="${RDEPEND}"
53 RESTRICT="test"
54
55 src_prepare() {
56 + use threads && eapply "${FILESDIR}"/${P}-mt.patch
57 + eapply_user
58 +
59 sed -i -e 's:gkrellm2 -p:gkrellm -p:' Makefile || die
60 - use threads && epatch "${FILESDIR}"/${P}-mt.patch
61 }
62
63 -src_compile() {
64 +src_configure() {
65 tc-export CC
66 - emake || die
67 }
68
69 pkg_postinst() {
70
71 diff --git a/media-plugins/gkrellmpc/gkrellmpc-0.1_beta9-r1.ebuild b/media-plugins/gkrellmpc/gkrellmpc-0.1_beta9-r1.ebuild
72 deleted file mode 100644
73 index 54940aa5bf0..00000000000
74 --- a/media-plugins/gkrellmpc/gkrellmpc-0.1_beta9-r1.ebuild
75 +++ /dev/null
76 @@ -1,38 +0,0 @@
77 -# Copyright 1999-2012 Gentoo Foundation
78 -# Distributed under the terms of the GNU General Public License v2
79 -
80 -EAPI=2
81 -inherit eutils gkrellm-plugin toolchain-funcs
82 -
83 -DESCRIPTION="A gkrellm plugin to control the MPD (Music Player Daemon)"
84 -HOMEPAGE="http://mpd.wikicities.com/wiki/Client:GKrellMPC"
85 -SRC_URI="http://www.topfx.com/dist/${P}.tar.gz"
86 -
87 -LICENSE="GPL-2"
88 -SLOT="0"
89 -KEYWORDS="amd64 x86"
90 -IUSE="threads"
91 -
92 -RDEPEND=">=app-admin/gkrellm-2[X]
93 - net-misc/curl"
94 -DEPEND="${RDEPEND}"
95 -
96 -# Will open gkrellm in X11 display
97 -RESTRICT="test"
98 -
99 -src_prepare() {
100 - sed -i -e 's:gkrellm2 -p:gkrellm -p:' Makefile || die
101 - use threads && epatch "${FILESDIR}"/${P}-mt.patch
102 -}
103 -
104 -src_compile() {
105 - tc-export CC
106 - emake || die
107 -}
108 -
109 -pkg_postinst() {
110 - if use threads; then
111 - elog "If you can't connect MPD, please unset USE threads."
112 - elog "See, https://bugs.gentoo.org/276970 for information."
113 - fi
114 -}