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

[Bernard Cafarelli]

commit:     7f682ba5796bccf17a149e540fb35d94f1e35e67
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 23 19:56:12 2015 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Sun Aug 23 19:56:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f682ba5

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

Fixes bug #558488 by Toralf Förster <toralf.foerster <AT> gmx.de>

Package-Manager: portage-2.2.20.1

 x11-plugins/wmDownload/Manifest                         |  2 +-
 x11-plugins/wmDownload/wmDownload-0.1.2a-r1.ebuild      |  4 ++--
 ...oad-0.1.2a-r1.ebuild => wmDownload-0.1.2a-r2.ebuild} | 17 +++++++++--------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/x11-plugins/wmDownload/Manifest b/x11-plugins/wmDownload/Manifest
index 92ffc8c..97730d6 100644
--- a/x11-plugins/wmDownload/Manifest
+++ b/x11-plugins/wmDownload/Manifest
@@ -1 +1 @@
-DIST wmDownload-0.1.2a.tar.gz 11449 SHA256 
77178290b9ac6e6b590280c8a9c6494fbe7853fff453e37651dd2ef9915c7213
+DIST wmDownload-0.1.2a.tar.gz 11449 SHA256 
77178290b9ac6e6b590280c8a9c6494fbe7853fff453e37651dd2ef9915c7213 SHA512 
95bc3f7c9be344d88146fd0b2407afe43f5975bbf2158fc54c9d9200a7f09b53af3a8cae790b2e26f8e34792317a28524422e0d4f96e0e603e05af92d6354752
 WHIRLPOOL 
765c7332623951fda1bd8e299c2e62a718df0b4b40b5f6a1a1575ad4adfca9213d5b15b5bbc7a9cc4478257cf0c7074634c0b949b7bca2bffc1995acc80f5211

diff --git a/x11-plugins/wmDownload/wmDownload-0.1.2a-r1.ebuild 
b/x11-plugins/wmDownload/wmDownload-0.1.2a-r1.ebuild
index 0b04d0a..71f3353 100644
--- a/x11-plugins/wmDownload/wmDownload-0.1.2a-r1.ebuild
+++ b/x11-plugins/wmDownload/wmDownload-0.1.2a-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 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 sparc x86"
 IUSE=""
 
-DEPEND="x11-libs/libdockapp
+DEPEND="<x11-libs/libdockapp-0.7
        x11-libs/libX11
        x11-libs/libXext
        x11-libs/libXpm"

diff --git a/x11-plugins/wmDownload/wmDownload-0.1.2a-r1.ebuild 
b/x11-plugins/wmDownload/wmDownload-0.1.2a-r2.ebuild
similarity index 64%
copy from x11-plugins/wmDownload/wmDownload-0.1.2a-r1.ebuild
copy to x11-plugins/wmDownload/wmDownload-0.1.2a-r2.ebuild
index 0b04d0a..3050af3 100644
--- a/x11-plugins/wmDownload/wmDownload-0.1.2a-r1.ebuild
+++ b/x11-plugins/wmDownload/wmDownload-0.1.2a-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+EAPI=5
 inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="dockapp that displays how much data you've received on each eth 
and ppp device"
@@ -10,27 +11,27 @@ HOMEPAGE="http://wmdownload.sourceforge.net/";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
-DEPEND="x11-libs/libdockapp
+RDEPEND=">=x11-libs/libdockapp-0.7:=
        x11-libs/libX11
        x11-libs/libXext
        x11-libs/libXpm"
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${PN}"
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
+src_prepare() {
        epatch "${FILESDIR}"/${P}-makefile.patch
+       sed -e 's#<dockapp.h>#<libdockapp/dockapp.h>#' -i *.c || die
 }
 
 src_compile() {
-       emake CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)" || die "compile 
failed"
+       emake CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)"
 }
 
 src_install () {
-       emake DESTDIR="${D}" install || die "install failed"
+       emake DESTDIR="${D}" install
        dodoc CHANGELOG CREDITS HINTS README TODO
 }