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

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 7560bec1bffbb80b32d2d21263ef70856ff76160..d3a9fab9c092ba11d14d9af0f4d05a8031ed9133 100644 (file)
--- 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 2fbdd884fafb6588d2903dc1c2a7a3e5c42d51e0..223cd9f55279e21a8f4eb9c1623d5982b95f8e13 100644 (file)
--- 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
   */