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 b16e15c99748818106bc191108a60bf1206d8113..36a2cbfbf42ca1bbea9dd08afee566c6f9a72236 100644 (file)
--- 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 f790f9d56ddf3440c830424d4c8c01043995dfba..3ba08646ef1f5c7f45c2173684804578cc2966ef 100644 (file)
--- 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() {