commit: 459cd87d74d65ce6e1a71406da85abd4a8bb0e09 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Wed Jan 3 22:34:34 2018 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Thu Jan 4 09:16:37 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=459cd87d
media-plugins/gkrellmpc: Eclass update Package-Manager: Portage-2.3.19, Repoman-2.3.6 media-plugins/gkrellmpc/Manifest | 1 - .../gkrellmpc/gkrellmpc-0.1_beta10.ebuild | 17 ++++++---- .../gkrellmpc/gkrellmpc-0.1_beta9-r1.ebuild | 38 ---------------------- 3 files changed, 10 insertions(+), 46 deletions(-) diff --git a/media-plugins/gkrellmpc/Manifest b/media-plugins/gkrellmpc/Manifest index fbb4c80df54..6d9b079d427 100644 --- a/media-plugins/gkrellmpc/Manifest +++ b/media-plugins/gkrellmpc/Manifest @@ -1,2 +1 @@ DIST gkrellmpc-0.1_beta10.tar.gz 25388 BLAKE2B 2e3c97e7d5887e1c3ea6a693cde19470e476943658de607266aac9a3ecbc2a5215fcc266638909d2ad024f303adb19475504ea4f7b79b3e97f566d90899721d3 SHA512 f5d687264f08146bf1eb54aee6d42a200fb97008a355d26a68be91b04e4bd622fc222725bf498c0837eacb8b94d6aede5aa1a05ed504fe5f9b790a9cd08d3973 -DIST gkrellmpc-0.1_beta9.tar.gz 22029 BLAKE2B 2c69e1cfc8ac8a1966263caaeb8234d0607d1e8bac8df3df2ef0f0141a6523396aa376ce4b1d00a0bf269eecfbb9d88efe3f28610271c7bc1286a549480070bc SHA512 8ea5b2964e8f430ec391d1dc475f00c6b3b7843952884c62c0fa76131f05a4e61f0dcbf4d1da38c3686e261027c409af28c1d36b87d383468abd4329313fb2db diff --git a/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10.ebuild b/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10.ebuild index 42c2ab21767..a309150dbc9 100644 --- a/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10.ebuild +++ b/media-plugins/gkrellmpc/gkrellmpc-0.1_beta10.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=2 -inherit eutils gkrellm-plugin toolchain-funcs +EAPI=6 + +inherit gkrellm-plugin toolchain-funcs DESCRIPTION="A gkrellm plugin to control the MPD (Music Player Daemon)" HOMEPAGE="http://mpd.wikia.com/wiki/Client:GKrellMPC"; @@ -13,7 +14,8 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="threads" -RDEPEND=">=app-admin/gkrellm-2[X] +RDEPEND=" + app-admin/gkrellm:2[X] net-misc/curl" DEPEND="${RDEPEND}" @@ -21,13 +23,14 @@ DEPEND="${RDEPEND}" RESTRICT="test" src_prepare() { + use threads && eapply "${FILESDIR}"/${P}-mt.patch + eapply_user + sed -i -e 's:gkrellm2 -p:gkrellm -p:' Makefile || die - use threads && epatch "${FILESDIR}"/${P}-mt.patch } -src_compile() { +src_configure() { tc-export CC - emake || die } pkg_postinst() { diff --git a/media-plugins/gkrellmpc/gkrellmpc-0.1_beta9-r1.ebuild b/media-plugins/gkrellmpc/gkrellmpc-0.1_beta9-r1.ebuild deleted file mode 100644 index 54940aa5bf0..00000000000 --- a/media-plugins/gkrellmpc/gkrellmpc-0.1_beta9-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=2 -inherit eutils gkrellm-plugin toolchain-funcs - -DESCRIPTION="A gkrellm plugin to control the MPD (Music Player Daemon)" -HOMEPAGE="http://mpd.wikicities.com/wiki/Client:GKrellMPC"; -SRC_URI="http://www.topfx.com/dist/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="threads" - -RDEPEND=">=app-admin/gkrellm-2[X] - net-misc/curl" -DEPEND="${RDEPEND}" - -# Will open gkrellm in X11 display -RESTRICT="test" - -src_prepare() { - sed -i -e 's:gkrellm2 -p:gkrellm -p:' Makefile || die - use threads && epatch "${FILESDIR}"/${P}-mt.patch -} - -src_compile() { - tc-export CC - emake || die -} - -pkg_postinst() { - if use threads; then - elog "If you can't connect MPD, please unset USE threads." - elog "See, https://bugs.gentoo.org/276970 for information." - fi -}
