commit:     2129356c6a975d68516ba286206a2f5ec76f007f
Author:     Ionen Wolkens <sudinave <AT> gmail <DOT> com>
AuthorDate: Wed Nov 18 17:31:46 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 20 00:32:19 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2129356c

x11-misc/xscreensaver: update gdk-pixbuf dep

Closes: https://bugs.gentoo.org/753905
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...xscreensaver-5.38-r1.ebuild => xscreensaver-5.38-r2.ebuild} |  8 +++++++-
 ...xscreensaver-5.43-r3.ebuild => xscreensaver-5.43-r4.ebuild} |  8 +++++++-
 ...xscreensaver-5.44-r2.ebuild => xscreensaver-5.44-r3.ebuild} | 10 +++++++++-
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/x11-misc/xscreensaver/xscreensaver-5.38-r1.ebuild 
b/x11-misc/xscreensaver/xscreensaver-5.38-r2.ebuild
similarity index 96%
rename from x11-misc/xscreensaver/xscreensaver-5.38-r1.ebuild
rename to x11-misc/xscreensaver/xscreensaver-5.38-r2.ebuild
index 315cf9b7a9c..c45519def6d 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.38-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.38-r2.ebuild
@@ -21,7 +21,13 @@ COMMON_DEPEND="
        media-libs/netpbm
        x11-apps/appres
        x11-apps/xwininfo
-       x11-libs/gdk-pixbuf:2[X]
+       || (
+               (
+                       x11-libs/gdk-pixbuf-xlib
+                       >=x11-libs/gdk-pixbuf-2.42.0:2
+               )
+               <x11-libs/gdk-pixbuf-2.42.0:2[X]
+       )
        x11-libs/gtk+:2
        x11-libs/libX11
        x11-libs/libXext

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

diff --git a/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild 
b/x11-misc/xscreensaver/xscreensaver-5.44-r3.ebuild
similarity index 96%
rename from x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild
rename to x11-misc/xscreensaver/xscreensaver-5.44-r3.ebuild
index 3d15c7f3a86..90d0de319c5 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.44-r3.ebuild
@@ -33,7 +33,15 @@ COMMON_DEPEND="
        x11-libs/libXt
        x11-libs/libXxf86vm
        caps? ( sys-libs/libcap )
-       gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[X] )
+       gdk-pixbuf? (
+               || (
+                       (
+                               x11-libs/gdk-pixbuf-xlib
+                               >=x11-libs/gdk-pixbuf-2.42.0:2
+                       )
+                       <x11-libs/gdk-pixbuf-2.42.0:2[X]
+               )
+       )
        gtk? ( x11-libs/gtk+:2 )
        jpeg? ( virtual/jpeg:0 )
        new-login? (

Reply via email to