[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmnetload/, x11-plugins/wmnetload/files/

[Bernard Cafarelli]

commit:     2591f483d6f750afb8e57201b98136bbcb43b084
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 23 20:34:49 2015 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Sun Aug 23 20:35:02 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2591f483

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

Package-Manager: portage-2.2.20.1

 .../wmnetload/files/wmnetload-1.3-r4-configure.patch  | Bin 0 -> 18891 bytes
 x11-plugins/wmnetload/wmnetload-1.3-r3.ebuild         |   4 ++--
 ...mnetload-1.3-r3.ebuild => wmnetload-1.3-r4.ebuild} |  18 +++++++++---------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/x11-plugins/wmnetload/files/wmnetload-1.3-r4-configure.patch 
b/x11-plugins/wmnetload/files/wmnetload-1.3-r4-configure.patch
new file mode 100644
index 0000000..3b26aca
Binary files /dev/null and 
b/x11-plugins/wmnetload/files/wmnetload-1.3-r4-configure.patch differ

diff --git a/x11-plugins/wmnetload/wmnetload-1.3-r3.ebuild 
b/x11-plugins/wmnetload/wmnetload-1.3-r3.ebuild
index a188485..325c930 100644
--- a/x11-plugins/wmnetload/wmnetload-1.3-r3.ebuild
+++ b/x11-plugins/wmnetload/wmnetload-1.3-r3.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 ppc64 x86"
 IUSE=""
 
-RDEPEND=">=x11-libs/libdockapp-0.6.1"
+RDEPEND="<x11-libs/libdockapp-0.7"
 
 src_unpack() {
        unpack ${A}

diff --git a/x11-plugins/wmnetload/wmnetload-1.3-r3.ebuild 
b/x11-plugins/wmnetload/wmnetload-1.3-r4.ebuild
similarity index 53%
copy from x11-plugins/wmnetload/wmnetload-1.3-r3.ebuild
copy to x11-plugins/wmnetload/wmnetload-1.3-r4.ebuild
index a188485..c6bdb64 100644
--- a/x11-plugins/wmnetload/wmnetload-1.3-r3.ebuild
+++ b/x11-plugins/wmnetload/wmnetload-1.3-r4.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 autotools eutils
 
 DESCRIPTION="Network interface monitor dockapp"
@@ -10,21 +11,20 @@ SRC_URI="ftp://truffula.com/pub/${P}.tar.gz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
-RDEPEND=">=x11-libs/libdockapp-0.6.1"
+DEPEND=">=x11-libs/libdockapp-0.7:="
+RDEPEND="${DEPEND}"
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
-       epatch "${FILESDIR}/${PN}-${PVR}-norpath.patch"
+src_prepare() {
+       epatch "${FILESDIR}/${PN}-${PVR}-configure.patch"
+       sed -e 's#<dockapp.h>#<libdockapp/dockapp.h>#' -i src/*.c || die
 
        eautoreconf
 }
 
 src_install() {
-       emake DESTDIR="${D}" install || die "einstall failed."
+       emake DESTDIR="${D}" install
        dodoc AUTHORS README NEWS
 }