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

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

[Bernard Cafarelli]

commit:     3e9b8ec7fef90f49a49ceca8df11918f68e1d535
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 23 20:07:19 2015 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Sun Aug 23 20:35:01 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e9b8ec7

x11-plugins/wmmenu: fix compilation with new libdockapp

Package-Manager: portage-2.2.20.1

 x11-plugins/wmmenu/wmmenu-1.2-r1.ebuild | 5 +++--
 x11-plugins/wmmenu/wmmenu-1.3.ebuild    | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/x11-plugins/wmmenu/wmmenu-1.2-r1.ebuild b/x11-plugins/wmmenu/wmmenu-1.2-r1.ebuild
index b16e15c..36a2cbf 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 f790f9d..3ba0864 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() {

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

[Bernard Cafarelli]

commit:     128b70ff7a474c50a07eaef9956da50c9854af04
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 16 10:44:04 2015 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Thu Dec 17 20:45:32 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=128b70ff

x11-plugins/wmmenu: gdk-pixbuf dependency requires USE=X

Bug #567400 by Toralf Förster <toralf.foerster <AT> gmx.de>

Package-Manager: portage-2.2.26

 x11-plugins/wmmenu/{wmmenu-1.3.ebuild => wmmenu-1.3-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-plugins/wmmenu/wmmenu-1.3.ebuild b/x11-plugins/wmmenu/wmmenu-1.3-r1.ebuild
similarity index 96%
rename from x11-plugins/wmmenu/wmmenu-1.3.ebuild
rename to x11-plugins/wmmenu/wmmenu-1.3-r1.ebuild
index 7e21166..3ac2d7f 100644
--- a/x11-plugins/wmmenu/wmmenu-1.3.ebuild
+++ b/x11-plugins/wmmenu/wmmenu-1.3-r1.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="x11-libs/gdk-pixbuf
+RDEPEND="x11-libs/gdk-pixbuf[X]
 	>=x11-libs/libdockapp-0.7:="
 DEPEND="${RDEPEND}"
 

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

[Agostino Sarubbo]

commit:     4aa397c2a4d3316d012fc0f38206c5f2905dcd67
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  9 14:14:09 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Apr  9 14:14:09 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aa397c2

x11-plugins/wmmenu: amd64 stable wrt bug #579234

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 x11-plugins/wmmenu/wmmenu-1.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-plugins/wmmenu/wmmenu-1.3-r1.ebuild b/x11-plugins/wmmenu/wmmenu-1.3-r1.ebuild
index 3ac2d7f..4e3153f 100644
--- a/x11-plugins/wmmenu/wmmenu-1.3-r1.ebuild
+++ b/x11-plugins/wmmenu/wmmenu-1.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="x11-libs/gdk-pixbuf[X]

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

[Agostino Sarubbo]

commit:     1c16a07eaaf01ef03f14672610dc85e70400d1e0
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  9 14:17:05 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Apr  9 14:17:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c16a07e

x11-plugins/wmmenu: x86 stable wrt bug #579234

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 x11-plugins/wmmenu/wmmenu-1.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-plugins/wmmenu/wmmenu-1.3-r1.ebuild b/x11-plugins/wmmenu/wmmenu-1.3-r1.ebuild
index 4e3153f..d081120 100644
--- a/x11-plugins/wmmenu/wmmenu-1.3-r1.ebuild
+++ b/x11-plugins/wmmenu/wmmenu-1.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="x11-libs/gdk-pixbuf[X]

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

[Bernard Cafarelli]

commit:     df6ddc33a1679a0ecc1251b1ca8062b83c33cbf3
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  2 10:16:38 2016 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Fri Dec  2 11:04:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df6ddc33

x11-plugins/wmmenu: shorten description, drop old

Package-Manager: portage-2.3.2

 x11-plugins/wmmenu/Manifest             |  1 -
 x11-plugins/wmmenu/wmmenu-1.2-r1.ebuild | 33 ---------------------------------
 x11-plugins/wmmenu/wmmenu-1.3-r1.ebuild |  2 +-
 3 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/x11-plugins/wmmenu/Manifest b/x11-plugins/wmmenu/Manifest
index 685f7d8..7707358 100644
--- a/x11-plugins/wmmenu/Manifest
+++ b/x11-plugins/wmmenu/Manifest
@@ -1,2 +1 @@
-DIST wmmenu-1.2.tar.gz 32845 SHA256 c2270fdd636e82bcddbd3a43c4ae7b8dc2f5f0f8890cf8f404ce024d5f7dab87 SHA512 c68c43b41a130d5366d683c3dfccb969e9eb62612902fb5a8211131cc456383566a08a4eb12049cb4831c488e04cf660b02f97eefbe572abecaaa5460b47dfd1 WHIRLPOOL 2d8ec0bc3b60d319a1d2d2ca6c398ae47e4cdfc360b6f7bb5818ebf414a2ef83fbe65834eb5c2c863587581d872e2e2589858d9150c2b109c94b70092fadbd82
 DIST wmmenu-1.3.tar.gz 33766 SHA256 c6fc09e812b012fac83c948bbfc37fbbd3ea702e46e942ebb29ec6a2f541fa3a SHA512 4c8738c9a81d56e084754f4db28da6d3171475b5967ceddaa5646b3d87679112e4f272e1bee2c2a81dd072cc948b3652d843a3ddff9bc31cfac4f787b337e767 WHIRLPOOL 15e1cc6de49ea51382ae7673375a176836bf49dd2b7cf311618ca5e6afa9c67a558c2b8a76a675b69d516669432c978cc39f339bf27de574c4952afc75de6881

diff --git a/x11-plugins/wmmenu/wmmenu-1.2-r1.ebuild b/x11-plugins/wmmenu/wmmenu-1.2-r1.ebuild
deleted file mode 100644
index 36a2cbf..00000000
--- a/x11-plugins/wmmenu/wmmenu-1.2-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils
-
-IUSE=""
-S=${WORKDIR}/${PN}
-DESCRIPTION="WindowMaker DockApp: Provides a popup menu of icons like in AfterStep, as a dockable application"
-SRC_URI="http://www.fcoutant.freesurf.fr/download/${P}.tar.gz"
-HOMEPAGE="http://www.fcoutant.freesurf.fr/wmmenu.html"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-DEPEND="<x11-libs/libdockapp-0.7"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-support-libdockapp-0.5.0.patch
-	epatch "${FILESDIR}"/${P}-Makefile.patch
-}
-
-src_compile() {
-	emake EXTRACFLAGS="${CFLAGS}" || die "Compilation failed"
-}
-
-src_install() {
-	dobin wmmenu
-	doman wmmenu.1
-	dodoc README TODO example/apps example/defaults example/extract_icon_back
-}

diff --git a/x11-plugins/wmmenu/wmmenu-1.3-r1.ebuild b/x11-plugins/wmmenu/wmmenu-1.3-r1.ebuild
index 7818b28..99061c4 100644
--- a/x11-plugins/wmmenu/wmmenu-1.3-r1.ebuild
+++ b/x11-plugins/wmmenu/wmmenu-1.3-r1.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 inherit eutils toolchain-funcs
 
-DESCRIPTION="a popup menu of icons like in AfterStep, as a dockable application"
+DESCRIPTION="a popup menu of icons like in AfterStep, as a dockapp"
 HOMEPAGE="http://www.dockapps.net/wmmenu"
 SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
 

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

[Aaron Bauman]

commit:     f444bfb546293a79ed1592ce879ee31dab056321
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Apr 30 09:03:13 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat May  5 19:26:59 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f444bfb5

x11-plugins/wmmenu: use HTTPS

 x11-plugins/wmmenu/wmmenu-1.3-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-plugins/wmmenu/wmmenu-1.3-r1.ebuild b/x11-plugins/wmmenu/wmmenu-1.3-r1.ebuild
index f30b1665da0..f2061220cee 100644
--- a/x11-plugins/wmmenu/wmmenu-1.3-r1.ebuild
+++ b/x11-plugins/wmmenu/wmmenu-1.3-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="a popup menu of icons like in AfterStep, as a dockapp"
-HOMEPAGE="http://www.dockapps.net/wmmenu"
+HOMEPAGE="https://www.dockapps.net/wmmenu"
 SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"

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

[Thomas Deutschmann]

commit:     c305ef504e3d1a177247f01251b8ac9080cfc6f2
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 19 18:15:27 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Sep 19 18:27:47 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c305ef50

x11-plugins/wmmenu: x86 stable (bug #666088)

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild b/x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild
index ab02ed5b392..b04b9741952 100644
--- a/x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild
+++ b/x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND="x11-libs/gdk-pixbuf[X]
 	>=x11-libs/libdockapp-0.7:="

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

[Mikle Kolyada]

commit:     4347291b40cf3280fe3b5323f0eb1edbb749b1b2
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 22 11:49:19 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Sep 22 11:49:19 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4347291b

x11-plugins/wmmenu: Drop old

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 x11-plugins/wmmenu/wmmenu-1.3-r1.ebuild | 36 ---------------------------------
 1 file changed, 36 deletions(-)

diff --git a/x11-plugins/wmmenu/wmmenu-1.3-r1.ebuild b/x11-plugins/wmmenu/wmmenu-1.3-r1.ebuild
deleted file mode 100644
index f2061220cee..00000000000
--- a/x11-plugins/wmmenu/wmmenu-1.3-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="a popup menu of icons like in AfterStep, as a dockapp"
-HOMEPAGE="https://www.dockapps.net/wmmenu"
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="x11-libs/gdk-pixbuf[X]
-	>=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() {
-	emake  CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin wmmenu
-	doman wmmenu.1
-	dodoc README TODO example/apps example/defaults example/extract_icon_back
-}

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

[Mikle Kolyada]

commit:     88036c18552e4335037c189f0e63985a558db696
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 22 11:48:46 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Sep 22 11:48:46 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88036c18

x11-plugins/wmmenu: amd64 stable wrt bug #666088

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild b/x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild
index b04b9741952..9022ddb6b31 100644
--- a/x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild
+++ b/x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="x11-libs/gdk-pixbuf[X]
 	>=x11-libs/libdockapp-0.7:="

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

[Bernard Cafarelli]

commit:     33c6843de268b426e8332c9823766ae4d8686d07
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 21 18:01:52 2020 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Sat Nov 21 18:02:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33c6843d

x11-plugins/wmmenu: update gdk-pixbuf dependency

Closes: https://bugs.gentoo.org/753899
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>

 x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild b/x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild
index 9022ddb6b31..3cce437b980 100644
--- a/x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild
+++ b/x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-RDEPEND="x11-libs/gdk-pixbuf[X]
+RDEPEND="|| (
+				(
+					x11-libs/gdk-pixbuf:2[X]
+					>=x11-libs/gdk-pixbuf-2.42.0:2
+				)
+				<x11-libs/gdk-pixbuf-2.42.0:2[X]
+			)
 	>=x11-libs/libdockapp-0.7:="
 DEPEND="${RDEPEND}"
 

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

[Mart Raudsepp]

commit:     4fcb12ca4854a3ca3450d268c1fb9668bf9eb24c
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 17 13:56:50 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Dec 17 13:59:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fcb12ca

x11-plugins/wmmenu: simplify gdk-pixbuf-xlib dep

Old versions of gdk-pixbuf carrying USE=X are gone, simplify dep.
The previous dep was broken, as completely unsatisfyable now with
<gdk-pixbuf-2.42 gone due to the multiple dep case still depending
on gdk-pixbuf[X] instead of gdk-pixbuf-xlib.
Before it was also holding back gdk-pixbuf upgrade.

Bug: https://bugs.gentoo.org/753899
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild b/x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild
index 3cce437b980..541f47f08c3 100644
--- a/x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild
+++ b/x11-plugins/wmmenu/wmmenu-1.3-r2.ebuild
@@ -12,13 +12,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-RDEPEND="|| (
-				(
-					x11-libs/gdk-pixbuf:2[X]
-					>=x11-libs/gdk-pixbuf-2.42.0:2
-				)
-				<x11-libs/gdk-pixbuf-2.42.0:2[X]
-			)
+RDEPEND="x11-libs/gdk-pixbuf-xlib
+	>=x11-libs/gdk-pixbuf-2.42.0:2
 	>=x11-libs/libdockapp-0.7:="
 DEPEND="${RDEPEND}"