[gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/

[Mart Raudsepp]

commit:     04d304ddefb8874d3641a08634f02cb5217f535f
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 17 13:53:54 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Dec 17 13:59:49 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04d304dd

x11-misc/xscreensaver: simplify gdk-pixbuf-xlib dep

Old versions of gdk-pixbuf carrying USE=X are gone, simplify dep.

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

 x11-misc/xscreensaver/xscreensaver-5.38-r2.ebuild | 9 ++-------
 x11-misc/xscreensaver/xscreensaver-5.43-r4.ebuild | 9 ++-------
 x11-misc/xscreensaver/xscreensaver-5.44-r3.ebuild | 9 ++-------
 3 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/x11-misc/xscreensaver/xscreensaver-5.38-r2.ebuild 
b/x11-misc/xscreensaver/xscreensaver-5.38-r2.ebuild
index c45519def6d..a71b8a78af4 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.38-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.38-r2.ebuild
@@ -21,13 +21,8 @@ COMMON_DEPEND="
        media-libs/netpbm
        x11-apps/appres
        x11-apps/xwininfo
-       || (
-               (
-                       x11-libs/gdk-pixbuf-xlib
-                       >=x11-libs/gdk-pixbuf-2.42.0:2
-               )
-               <x11-libs/gdk-pixbuf-2.42.0:2[X]
-       )
+       x11-libs/gdk-pixbuf-xlib
+       >=x11-libs/gdk-pixbuf-2.42.0:2
        x11-libs/gtk+:2
        x11-libs/libX11
        x11-libs/libXext

diff --git a/x11-misc/xscreensaver/xscreensaver-5.43-r4.ebuild 
b/x11-misc/xscreensaver/xscreensaver-5.43-r4.ebuild
index 4e00075ec57..e80dbdef620 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.43-r4.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.43-r4.ebuild
@@ -21,13 +21,8 @@ COMMON_DEPEND="
        media-libs/netpbm
        x11-apps/appres
        x11-apps/xwininfo
-       || (
-               (
-                       x11-libs/gdk-pixbuf-xlib
-                       >=x11-libs/gdk-pixbuf-2.42.0:2
-               )
-               <x11-libs/gdk-pixbuf-2.42.0:2[X]
-       )
+       x11-libs/gdk-pixbuf-xlib
+       >=x11-libs/gdk-pixbuf-2.42.0:2
        x11-libs/gtk+:2
        x11-libs/libX11
        x11-libs/libXext

diff --git a/x11-misc/xscreensaver/xscreensaver-5.44-r3.ebuild 
b/x11-misc/xscreensaver/xscreensaver-5.44-r3.ebuild
index 90d0de319c5..94304df0805 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.44-r3.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.44-r3.ebuild
@@ -34,13 +34,8 @@ COMMON_DEPEND="
        x11-libs/libXxf86vm
        caps? ( sys-libs/libcap )
        gdk-pixbuf? (
-               || (
-                       (
-                               x11-libs/gdk-pixbuf-xlib
-                               >=x11-libs/gdk-pixbuf-2.42.0:2
-                       )
-                       <x11-libs/gdk-pixbuf-2.42.0:2[X]
-               )
+               x11-libs/gdk-pixbuf-xlib
+               >=x11-libs/gdk-pixbuf-2.42.0:2
        )
        gtk? ( x11-libs/gtk+:2 )
        jpeg? ( virtual/jpeg:0 )