gentoo resync : 29.06.2020

3 files changed, 28 insertions, 22 deletions

diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 9e9aff296d4f..a4a5de87e51c 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -16,5 +16,5 @@ DIST xscreensaver-5.43-r1.tar.gz 26973508 BLAKE2B 67b57214e8a41ba895df6e9efcac3e
 DIST xscreensaver-5.44.tar.gz 27001826 BLAKE2B 102025aa2f57672ed3547f0e9bab989566fb8e50ecae8b9e4078ec5ee5de3cad09fec107695335ef236ad9fe19b2638978366a180a998d77b0ce8a2a5d1ebde3 SHA512 9d9144dec6f075c2d6a1c3cd45123a98d6d0cd732d6c3e3389e97b3f802b8f8765a188d1e35f97f123ca0a64661ea616b7b710577063c311da3d99d8439f1dae
 EBUILD xscreensaver-5.38-r1.ebuild 3437 BLAKE2B f8fbcb02b9f5927e395a13b438235cc4b4d5b8f0660253085d890326151dbebdc826ba89b401c855a86a7f037828527408cf44484478d72e2722fdd0048d7dfa SHA512 2237ff0d15867e50b564c8889d251afc7e2a08431701f9a8a36e9120ca47c6665b03be86eec4ec2f6fc1a38352dca5297fcd60d813d1b73856707447a2e14f87
 EBUILD xscreensaver-5.43-r3.ebuild 3476 BLAKE2B 573c05f1255f99c769b96c605952a525ace1ee8782e6c5408fd4a02501e584654478fededc8396d3eb0fa69b1096ebf2b9d87390a2f5b79264e61f2ad67b7c54 SHA512 525acd033e5cabd0cc7d0a03f72f7e86bcbe229c11aaa2de78a2639dc20657258416782003adbc528ae610af694429236c6f5381aec7e135b6f8a16b17726bb8
-EBUILD xscreensaver-5.44-r2.ebuild 3620 BLAKE2B 8b31476686597311466918725f85c0be7bcc566e9bf872a36cc7e9d6c5ade6eaf0a532a67dafae89a220913e22d58bfb78f0803dc8a1b60b378e096cc87686e8 SHA512 30d6c2f02e7ef813ffd5f35b8446e2ee638a6dc523dcff664e8b77751e1b253e8d0e35ea4842ba102363e74dc2c070f0ecc95c9c426119729c6483f664522f20
-MISC metadata.xml 660 BLAKE2B f720a7df804148568927cc909ec46013c8de0087f2ab5751bd3852cf310161c328d43f29db22105e46b4c142db3e84fa5a2c943bae63779156bfe569726bf12b SHA512 ecc2b0423bd77d7713db654875f5d112c90c278653248298c877a84104db40430fcdaffaac2cbb972bb6ae6ce970b498d4d086278ba85c519dedeb3586bcd41b
+EBUILD xscreensaver-5.44-r2.ebuild 3755 BLAKE2B 5de38bbcf33fd443e012f136b7e437d96a56f688853664bc1ea64467c88b2892c4e90a91646884094cbc9abdbc51dd1524ade3b210719b029ac5d06284c8ff3d SHA512 3f9b8926051b8363e5b6d7062dec240f9502a395d9521fbde525c0a6aa37f6073858f6d67b5b0e81e51c1ef7d22c4912500c920f613a44bfdb29ad133841d487
+MISC metadata.xml 870 BLAKE2B 222f0b24d94c2d9884848813bc9927312e23c670cb03d6427af4018c469b7ca81ab5d0887fa469ad60d05aff97f3b8b2df88158638213fbce24ea6d90c7d9f1a SHA512 0743dbc932e97530aede3f34519e1785bd186662619f46d212f4b4ae0b53bfa01875a3a58d2a30e7f7e6d93f1723211e5cf95018b86dd8e5ede5a37e4c238592
diff --git a/x11-misc/xscreensaver/metadata.xml b/x11-misc/xscreensaver/metadata.xml
index cc68eed36040..fb3aa2fc1da8 100644
--- a/x11-misc/xscreensaver/metadata.xml
+++ b/x11-misc/xscreensaver/metadata.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>desktop-misc@gentoo.org</email>
-    <name>Gentoo Desktop Miscellaneous Project</name>
-  </maintainer>
-  <upstream>
-    <maintainer>
-      <email>jwz@jwz.org</email>
-      <name>Jamie Zawinski</name>
-    </maintainer>
-  </upstream>
-  <use>
-    <flag name="gdm">Use gdmflexiserver from <pkg>gnome-base/gdm</pkg> instead of <pkg>x11-misc/lightdm</pkg></flag>
-    <flag name="new-login">Enable user switching support using gdmflexiserver (<pkg>x11-misc/lightdm</pkg>)</flag>
-  </use>
+<maintainer type="project">
+<email>desktop-misc@gentoo.org</email>
+<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
+<upstream>
+<maintainer>
+<email>jwz@jwz.org</email>
+<name>Jamie Zawinski</name>
+</maintainer>
+</upstream>
+<use>
+<flag name="gdk-pixbuf">Include support for the <pkg>x11-libs/gdk-pixbuf</pkg> library in some demos, which will make it possible for them to read GIF, JPEG, and PNG files as well</flag>
+<flag name="gdm">Use gdmflexiserver from <pkg>gnome-base/gdm</pkg> instead of <pkg>x11-misc/lightdm</pkg></flag>
+<flag name="locking">Compile in support for locking the display</flag>
+<flag name="new-login">Enable user switching support using gdmflexiserver (<pkg>x11-misc/lightdm</pkg>)</flag>
+</use>
 </pkgmetadata>
diff --git a/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild
index 60a494c33632..49a04e5dd618 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild
@@ -13,7 +13,10 @@ SRC_URI="
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="caps gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
+IUSE="caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid xinerama"
+REQUIRED_USE="
+	gdk-pixbuf? ( gtk )
+"
 
 COMMON_DEPEND="
 	>=gnome-base/libglade-2
@@ -21,8 +24,6 @@ COMMON_DEPEND="
 	media-libs/netpbm
 	x11-apps/appres
 	x11-apps/xwininfo
-	x11-libs/gdk-pixbuf:2[X]
-	x11-libs/gtk+:2
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXft
@@ -32,6 +33,8 @@ COMMON_DEPEND="
 	x11-libs/libXt
 	x11-libs/libXxf86vm
 	caps? ( sys-libs/libcap )
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[X] )
+	gtk? ( x11-libs/gtk+:2 )
 	jpeg? ( virtual/jpeg:0 )
 	new-login? (
 		gdm? ( gnome-base/gdm )
@@ -111,19 +114,19 @@ src_configure() {
 	export RPM_PACKAGE_VERSION=no #368025
 
 	econf \
+		$(use_enable locking) \
 		$(use_with caps setcap-hacks) \
+		$(use_with gdk-pixbuf pixbuf) \
+		$(use_with gtk) \
 		$(use_with jpeg) \
 		$(use_with new-login login-manager) \
 		$(use_with opengl gl) \
 		$(use_with pam) \
 		$(use_with suid setuid-hacks) \
 		$(use_with xinerama xinerama-ext) \
-		--enable-locking \
 		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
 		--with-dpms-ext \
-		--with-gtk \
 		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
-		--with-pixbuf \
 		--with-proc-interrupts \
 		--with-randr-ext \
 		--with-text-file="${EPREFIX}"/etc/gentoo-release \
@@ -135,6 +138,7 @@ src_configure() {
 		--with-xshm-ext \
 		--without-gle \
 		--without-kerberos \
+		--without-motif \
 		--x-includes="${EPREFIX}"/usr/include \
 		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
 }