From: David Seifert Date: Wed, 3 Jan 2018 22:34:33 +0000 (+0100) Subject: x11-plugins/gkrellaclock: Eclass update X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d08ebb92dd569e09834f8b43d31d4934e6f4d70b;p=gentoo.git x11-plugins/gkrellaclock: Eclass update Package-Manager: Portage-2.3.19, Repoman-2.3.6 --- diff --git a/x11-plugins/gkrellaclock/gkrellaclock-0.3.4-r1.ebuild b/x11-plugins/gkrellaclock/gkrellaclock-0.3.4-r1.ebuild index baff467ed08a..ecd130b2b603 100644 --- a/x11-plugins/gkrellaclock/gkrellaclock-0.3.4-r1.ebuild +++ b/x11-plugins/gkrellaclock/gkrellaclock-0.3.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -14,16 +14,20 @@ SLOT="2" KEYWORDS="alpha amd64 ppc sparc x86" IUSE="" -RDEPEND="app-admin/gkrellm[X]" +RDEPEND="app-admin/gkrellm:2[X]" DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}/${PN}-makefile.patch" ) - S="${WORKDIR}/${P/a/A}" +PATCHES=( "${FILESDIR}"/${PN}-makefile.patch ) + +src_prepare() { + default -src_compile() { # The tarball contains a pre-compiled x86 object that needs to be # removed if we're going to build it properly. See bug 166133. rm -f gkrellaclock.o || die 'failed to remove gkrellaclock.o' +} + +src_compile() { emake CC="$(tc-getCC)" }