[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmdate/

[Bernard Cafarelli]

commit:     d66ef6a88c584bff501c8b49079ac6884c6d7edd
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 23 20:05:52 2015 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Sun Aug 23 20:35:00 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d66ef6a8

x11-plugins/wmdate: EAPI bump, fix compilation with new libdockapp

Package-Manager: portage-2.2.20.1

 x11-plugins/wmdate/Manifest                          |  2 +-
 .../{wmdate-0.7.ebuild => wmdate-0.7-r1.ebuild}      | 20 ++++++++++++--------
 x11-plugins/wmdate/wmdate-0.7.ebuild                 |  4 ++--
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/x11-plugins/wmdate/Manifest b/x11-plugins/wmdate/Manifest
index 22bb856..16415f4 100644
--- a/x11-plugins/wmdate/Manifest
+++ b/x11-plugins/wmdate/Manifest
@@ -1 +1 @@
-DIST wmdate-0.7.tar.gz 10645 SHA256 
e246e38a7488470d271dc5262f526462821fa4337c3e07bda8b9b3f9e7b8d975
+DIST wmdate-0.7.tar.gz 10645 SHA256 
e246e38a7488470d271dc5262f526462821fa4337c3e07bda8b9b3f9e7b8d975 SHA512 
30cdcd92b1ff0aaf89f87e1e396c416b0dc295c0261eb5a3f260f80aaf84b73c860d5d27b796dda2b047e6fcce1d0362005f51585a415d48f4e8b54807b228fb
 WHIRLPOOL 
fca2b61495202949628b6548aaecacc3f65837e8e3c4a27286d2653b80218a3ec90d3e7b59580a3f69f6f9e465501db28ec2bef4d41a6a7db10845674bed79f6

diff --git a/x11-plugins/wmdate/wmdate-0.7.ebuild 
b/x11-plugins/wmdate/wmdate-0.7-r1.ebuild
similarity index 72%
copy from x11-plugins/wmdate/wmdate-0.7.ebuild
copy to x11-plugins/wmdate/wmdate-0.7-r1.ebuild
index 06a3285..e73dd87 100644
--- a/x11-plugins/wmdate/wmdate-0.7.ebuild
+++ b/x11-plugins/wmdate/wmdate-0.7-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="yet another date-display dock application"
@@ -10,10 +11,10 @@ 
SRC_URI="http://solfertje.student.utwente.nl/~dalroi/${PN}/files/${P}.tar.gz";
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-RDEPEND="x11-libs/libdockapp
+RDEPEND=">=x11-libs/libdockapp-0.7:=
        x11-libs/libX11
        x11-libs/libXext
        x11-libs/libXpm"
@@ -21,16 +22,19 @@ DEPEND="${RDEPEND}
        x11-misc/gccmakedep
        x11-misc/imake"
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
+src_prepare() {
        epatch "${FILESDIR}"/${PN}-ComplexProgramTargetNoMan.patch
+
+       sed -e 's#<dockapp.h>#<libdockapp/dockapp.h>#' -i *.c || die
 }
 
-src_compile() {
+src_configure() {
        xmkmf || die "xmkmf failed."
+}
+
+src_compile() {
        emake CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \
-               LDOPTIONS="${LDFLAGS}" || die "emake failed."
+               LDOPTIONS="${LDFLAGS}"
 }
 
 src_install() {

diff --git a/x11-plugins/wmdate/wmdate-0.7.ebuild 
b/x11-plugins/wmdate/wmdate-0.7.ebuild
index 06a3285..f3c8d7c 100644
--- a/x11-plugins/wmdate/wmdate-0.7.ebuild
+++ b/x11-plugins/wmdate/wmdate-0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
-RDEPEND="x11-libs/libdockapp
+RDEPEND="<x11-libs/libdockapp-0.7
        x11-libs/libX11
        x11-libs/libXext
        x11-libs/libXpm"