commit: b0e79863e94dc8a9c5127a7e213b873538cbfdf8 Author: Harri Nieminen <moikkis <AT> gmail <DOT> com> AuthorDate: Sun Feb 19 08:02:34 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Feb 19 23:43:32 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0e79863
x11-misc/dclock: EAPI bump 4 -> 6 Package-Manager: Portage-2.3.3, Repoman-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/4029 ...-2.2.2_p4-r1.ebuild => dclock-2.2.2_p4-r2.ebuild} | 20 ++++++++++---------- x11-misc/dclock/files/dclock-2.2.2_p4-include.patch | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/x11-misc/dclock/dclock-2.2.2_p4-r1.ebuild b/x11-misc/dclock/dclock-2.2.2_p4-r2.ebuild similarity index 79% rename from x11-misc/dclock/dclock-2.2.2_p4-r1.ebuild rename to x11-misc/dclock/dclock-2.2.2_p4-r2.ebuild index 7560bec1bf..d3a9fab9c0 100644 --- a/x11-misc/dclock/dclock-2.2.2_p4-r1.ebuild +++ b/x11-misc/dclock/dclock-2.2.2_p4-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=4 -inherit eutils flag-o-matic toolchain-funcs +EAPI=6 +inherit flag-o-matic toolchain-funcs DESCRIPTION="Digital clock for the X window system" HOMEPAGE="http://packages.qa.debian.org/d/dclock.html"; @@ -33,10 +33,10 @@ DEPEND=" S=${WORKDIR}/${P/_p*/} -src_prepare() { - EPATCH_FORCE=yes EPATCH_SUFFIX=diff epatch "${WORKDIR}"/debian/patches - epatch "${FILESDIR}"/${P}-include.patch -} +PATCHES=( + "${WORKDIR}"/debian/patches + "${FILESDIR}"/${P}-include.patch +) src_configure() { if use xft; then @@ -55,17 +55,17 @@ src_compile() { emake \ CC="$(tc-getCC)" \ CFLAGS="${CFLAGS}" \ + CPPFLAGS="${CPPFLAGS}" \ EXTRA_LDOPTIONS="${LDFLAGS}" } src_install() { - emake DESTDIR="${D}" install{,.man} + default + emake DESTDIR="${D}" install.man insinto /usr/share/sounds doins sounds/* insinto /usr/share/X11/app-defaults newins Dclock.ad DClock - - dodoc README TODO } diff --git a/x11-misc/dclock/files/dclock-2.2.2_p4-include.patch b/x11-misc/dclock/files/dclock-2.2.2_p4-include.patch index 2fbdd884fa..223cd9f552 100644 --- a/x11-misc/dclock/files/dclock-2.2.2_p4-include.patch +++ b/x11-misc/dclock/files/dclock-2.2.2_p4-include.patch @@ -1,5 +1,5 @@ ---- dclock.c -+++ dclock.c +--- a/dclock.c ++++ b/dclock.c @@ -7,6 +7,7 @@ * manager: *Dclock.seconds: on */
