From: Bernard Cafarelli <voyageur@gentoo.org>
Date: Sun, 23 Aug 2015 20:07:19 +0000 (+0200)
Subject: x11-plugins/wmmenu: fix compilation with new libdockapp
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3e9b8ec7fef90f49a49ceca8df11918f68e1d535;p=gentoo.git

x11-plugins/wmmenu: fix compilation with new libdockapp

Package-Manager: portage-2.2.20.1
---

diff --git a/x11-plugins/wmmenu/wmmenu-1.2-r1.ebuild b/x11-plugins/wmmenu/wmmenu-1.2-r1.ebuild
index b16e15c99748..36a2cbfbf42c 100644
--- a/x11-plugins/wmmenu/wmmenu-1.2-r1.ebuild
+++ b/x11-plugins/wmmenu/wmmenu-1.2-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$
 
@@ -12,7 +12,8 @@ HOMEPAGE="http://www.fcoutant.freesurf.fr/wmmenu.html"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="amd64 x86"
-DEPEND="x11-libs/libdockapp"
+DEPEND="<x11-libs/libdockapp-0.7"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-plugins/wmmenu/wmmenu-1.3.ebuild b/x11-plugins/wmmenu/wmmenu-1.3.ebuild
index f790f9d56ddf..3ba08646ef1f 100644
--- a/x11-plugins/wmmenu/wmmenu-1.3.ebuild
+++ b/x11-plugins/wmmenu/wmmenu-1.3.ebuild
@@ -16,13 +16,15 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/gdk-pixbuf
-	x11-libs/libdockapp"
+	>=x11-libs/libdockapp-0.7:="
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/dockapps
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-Makefile.patch
+
+	sed -e 's#<dockapp.h>#<libdockapp/dockapp.h>#' -i *.c || die
 }
 
 src_compile() {